The original DDP specification has been changed in terms of
Signature Type ID definition for E825-C.

Signed-off-by: Grzegorz Nitka <grzegorz.ni...@intel.com>
Signed-off-by: Qiming Yang <qiming.y...@intel.com>
---
 drivers/net/ice/base/ice_common.c | 3 ++-
 drivers/net/ice/base/ice_ddp.c    | 4 ++++
 drivers/net/ice/base/ice_ddp.h    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_common.c 
b/drivers/net/ice/base/ice_common.c
index 67203cb932..f253e2f213 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -193,7 +193,8 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw)
 bool ice_is_generic_mac(struct ice_hw *hw)
 {
        return (hw->mac_type == ICE_MAC_GENERIC ||
-               hw->mac_type == ICE_MAC_GENERIC_3K);
+               hw->mac_type == ICE_MAC_GENERIC_3K ||
+               hw->mac_type == ICE_MAC_GENERIC_3K_E825);
 }
 
 /**
diff --git a/drivers/net/ice/base/ice_ddp.c b/drivers/net/ice/base/ice_ddp.c
index d88c417faf..ffcd5a9394 100644
--- a/drivers/net/ice/base/ice_ddp.c
+++ b/drivers/net/ice/base/ice_ddp.c
@@ -441,6 +441,7 @@ static u32 ice_get_pkg_segment_id(enum ice_mac_type 
mac_type)
        switch (mac_type) {
        case ICE_MAC_GENERIC:
        case ICE_MAC_GENERIC_3K:
+       case ICE_MAC_GENERIC_3K_E825:
        default:
                seg_id = SEGMENT_TYPE_ICE_E810;
                break;
@@ -461,6 +462,9 @@ static u32 ice_get_pkg_sign_type(enum ice_mac_type mac_type)
        case ICE_MAC_GENERIC_3K:
                sign_type = SEGMENT_SIGN_TYPE_RSA3K;
                break;
+       case ICE_MAC_GENERIC_3K_E825:
+               sign_type = SEGMENT_SIGN_TYPE_RSA3K_E825;
+               break;
        case ICE_MAC_GENERIC:
        default:
                sign_type = SEGMENT_SIGN_TYPE_RSA2K;
diff --git a/drivers/net/ice/base/ice_ddp.h b/drivers/net/ice/base/ice_ddp.h
index 4896e85b91..1e02adf0db 100644
--- a/drivers/net/ice/base/ice_ddp.h
+++ b/drivers/net/ice/base/ice_ddp.h
@@ -99,6 +99,7 @@ struct ice_pkg_hdr {
 #define SEGMENT_SIGN_TYPE_RSA2K                0x00000001
 #define SEGMENT_SIGN_TYPE_RSA3K                0x00000002
 #define SEGMENT_SIGN_TYPE_RSA3K_SBB    0x00000003 /* Secure Boot Block */
+#define SEGMENT_SIGN_TYPE_RSA3K_E825   0x00000005
 
 /* generic segment */
 struct ice_generic_seg_hdr {
-- 
2.25.1

Reply via email to