ice: Add check for lport extraction to LAG init
Subsystems (3)
PATCH 1/1 ice: Add check for lport extraction to LAG init
To fully support initializing the LAG support code, a DDP package that extracts the logical port from the metadata is required. If such a package is not present, there could be difficulties in supporting some bond types.
Add a check into the initialization flow that will bypass the new paths if any of the support pieces are missing.
--- drivers/net/ethernet/intel/ice/ice_lag.c | 25 ++++++++++++++++++++++-- drivers/net/ethernet/intel/ice/ice_lag.h | 3 +++ 2 files changed, 26 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_lag.c +23 -2
@@ -151,6 +151,27 @@ ice_lag_find_hw_by_lport(struct ice_lag *lag, u8 lport)return NULL ; } +/** +* ice_pkg_has_lport_extract - check if lport extraction supported +* @hw: HW struct +*/ +static bool ice_pkg_has_lport_extract (struct ice_hw *hw) +{ +int i; + +for (i =0 ; i < hw->blk[ICE_BLK_SW ].es.count; i++) { +u16 offset; +u8 fv_prot; + +ice_find_prot_off (hw,ICE_BLK_SW ,ICE_SW_DEFAULT_PROFILE , i, + &fv_prot, &offset); +if (fv_prot ==ICE_FV_PROT_MDID && + offset ==ICE_LP_EXT_BUF_OFFSET ) +return true; + } +return false; +} +/** * ice_lag_find_primary - returns pointer to primary interfaces lag struct * @lag: local interfaces lag struct
@@ -1206,7 +1227,7 @@ static void ice_lag_del_prune_list(struct ice_lag *lag, struct ice_pf *event_pf) }/** -* ice_lag_init_feature_support_flag - Check for NVM support for LAG +* ice_lag_init_feature_support_flag - Check for package and NVM support for LAG * @pf: PF struct */ static void ice_lag_init_feature_support_flag (struct ice_pf *pf)
@@ -1219,7 +1240,7 @@ static void ice_lag_init_feature_support_flag(struct ice_pf *pf)else ice_clear_feature_support (pf,ICE_F_ROCE_LAG ); -if (caps->sriov_lag) +if (caps->sriov_lag &&ice_pkg_has_lport_extract (&pf->hw))ice_set_feature_support (pf,ICE_F_SRIOV_LAG );else ice_clear_feature_support (pf,ICE_F_SRIOV_LAG );
drivers/net/ethernet/intel/ice/ice_lag.h +3 -0
@@ -17,6 +17,9 @@ enum ice_lag_role {#define ICE_LAG_INVALID_PORT 0xFF#define ICE_LAG_RESET_RETRIES 5 +#define ICE_SW_DEFAULT_PROFILE 0 +#define ICE_FV_PROT_MDID 255 +#define ICE_LP_EXT_BUF_OFFSET 32struct ice_pf ;struct ice_vf ;
Signature · 1 line
2.43.0
Quoted 9 lines · Dave Ertman
To fully support initializing the LAG support code, a DDP package that extracts the logical port from the metadata is required. If such a package is not present, there could be difficulties in supporting some bond types.
Add a check into the initialization flow that will bypass the new paths if any of the support pieces are missing.
Reviewed-by Przemek Kitszel <[email protected]>
Quoted 71 lines
Fixes df006dd4b1dc ("ice: Add initial support framework for LAG")Signed-off-by Dave Ertman <[email protected]>--- drivers/net/ethernet/intel/ice/ice_lag.c | 25 ++++++++++++++++++++++-- drivers/net/ethernet/intel/ice/ice_lag.h | 3 +++ 2 files changed, 26 insertions(+), 2 deletions(-)drivers/net/ethernet/intel/ice/ice_lag.c +23
-2@@ -151,6 +151,27 @@ ice_lag_find_hw_by_lport(struct ice_lag *lag, u8 lport)return NULL ; } +/** +* ice_pkg_has_lport_extract - check if lport extraction supported +* @hw: HW struct +*/ +static bool ice_pkg_has_lport_extract (struct ice_hw *hw) +{ +int i; + +for (i =0 ; i < hw->blk[ICE_BLK_SW ].es.count; i++) { +u16 offset; +u8 fv_prot; + +ice_find_prot_off (hw,ICE_BLK_SW ,ICE_SW_DEFAULT_PROFILE , i, + &fv_prot, &offset); +if (fv_prot ==ICE_FV_PROT_MDID && + offset ==ICE_LP_EXT_BUF_OFFSET ) +return true; + } +return false; +} +/** * ice_lag_find_primary - returns pointer to primary interfaces lag struct * @lag: local interfaces lag struct @@ -1206,7 +1227,7 @@ static void ice_lag_del_prune_list(struct ice_lag *lag, struct ice_pf *event_pf) }/** -* ice_lag_init_feature_support_flag - Check for NVM support for LAG +* ice_lag_init_feature_support_flag - Check for package and NVM support for LAG * @pf: PF struct */ static void ice_lag_init_feature_support_flag (struct ice_pf *pf)@@ -1219,7 +1240,7 @@ static void ice_lag_init_feature_support_flag(struct ice_pf *pf)else ice_clear_feature_support (pf,ICE_F_ROCE_LAG ); -if (caps->sriov_lag) +if (caps->sriov_lag &&ice_pkg_has_lport_extract (&pf->hw))ice_set_feature_support (pf,ICE_F_SRIOV_LAG );else ice_clear_feature_support (pf,ICE_F_SRIOV_LAG );drivers/net/ethernet/intel/ice/ice_lag.h +3
-0@@ -17,6 +17,9 @@ enum ice_lag_role {#define ICE_LAG_INVALID_PORT 0xFF#define ICE_LAG_RESET_RETRIES 5 +#define ICE_SW_DEFAULT_PROFILE 0 +#define ICE_FV_PROT_MDID 255 +#define ICE_LP_EXT_BUF_OFFSET 32struct ice_pf ;struct ice_vf ;
Quoted 11 lines · Dave Ertman
To fully support initializing the LAG support code, a DDP package that extracts the logical port from the metadata is required. If such a package is not present, there could be difficulties in supporting some bond types.
Add a check into the initialization flow that will bypass the new paths if any of the support pieces are missing.
Reviewed-by Przemek Kitszel <[email protected]>Fixes df006dd4b1dc ("ice: Add initial support framework for LAG")Signed-off-by Dave Ertman <[email protected]>
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Dave Ertman
Sent: Saturday, January 20, 2024 2:45 AM
To: [email protected]
Cc: [email protected]; Kitszel, Przemyslaw <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-net] ice: Add check for lport extraction to LAG initTo fully support initializing the LAG support code, a DDP package that extracts the logical port from the metadata is required. If such a package is not present, there could be difficulties in supporting some bond types.
Add a check into the initialization flow that will bypass the new paths if any of the support pieces are missing.
Quoted 8 lines
Reviewed-by Przemek Kitszel <[email protected]>Fixes df006dd4b1dc ("ice: Add initial support framework for LAG")Signed-off-by Dave Ertman <[email protected]>--- drivers/net/ethernet/intel/ice/ice_lag.c | 25 ++++++++++++++++++++++-- drivers/net/ethernet/intel/ice/ice_lag.h | 3 +++ 2 files changed, 26 insertions(+), 2 deletions(-)
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Dave Ertman
Sent: Saturday, January 20, 2024 2:45 AM
To: [email protected]
Cc: [email protected]; Kitszel, Przemyslaw <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-net] ice: Add check for lport extraction to LAG initTo fully support initializing the LAG support code, a DDP package that extracts the logical port from the metadata is required. If such a package is not present, there could be difficulties in supporting some bond types.
Add a check into the initialization flow that will bypass the new paths if any of the support pieces are missing.
Quoted 8 lines
Reviewed-by Przemek Kitszel <[email protected]>Fixes df006dd4b1dc ("ice: Add initial support framework for LAG")Signed-off-by Dave Ertman <[email protected]>--- drivers/net/ethernet/intel/ice/ice_lag.c | 25 ++++++++++++++++++++++-- drivers/net/ethernet/intel/ice/ice_lag.h | 3 +++ 2 files changed, 26 insertions(+), 2 deletions(-)