Re: [Intel-wired-lan] [iwl-next v3 6/8] ice: use libie_aq_str
> -Original Message- > From: Intel-wired-lan On Behalf Of > Michal Swiatkowski > Sent: 25 April 2025 11:38 > To: [email protected] > Cc: [email protected]; Lobakin, Aleksander > ; Kitszel, Przemyslaw > ; Kwapulinski, Piotr > ; Loktionov, Aleksandr > ; Jagielski, Jedrzej > ; Zaremba, Larysa ; > Nguyen, Anthony L > Subject: [Intel-wired-lan] [iwl-next v3 6/8] ice: use libie_aq_str > > Simple: > s/ice_aq_str/libie_aq_str > > Add libie_aminq module in ice Kconfig. > > Reviewed-by: Przemek Kitszel > Signed-off-by: Michal Swiatkowski > --- > drivers/net/ethernet/intel/Kconfig| 1 + > drivers/net/ethernet/intel/ice/ice.h | 1 - > .../net/ethernet/intel/ice/devlink/devlink.c | 10 +-- > .../net/ethernet/intel/ice/devlink/health.c | 2 +- > drivers/net/ethernet/intel/ice/ice_dpll.c | 20 +++--- > drivers/net/ethernet/intel/ice/ice_ethtool.c | 12 ++-- > .../net/ethernet/intel/ice/ice_fw_update.c| 20 +++--- > drivers/net/ethernet/intel/ice/ice_lib.c | 4 +- > drivers/net/ethernet/intel/ice/ice_main.c | 69 +++ > drivers/net/ethernet/intel/ice/ice_virtchnl.c | 4 +- > .../net/ethernet/intel/ice/ice_vsi_vlan_lib.c | 24 +++ > 11 files changed, 59 insertions(+), 108 deletions(-) > Tested-by: Rinitha S (A Contingent worker at Intel)
Re: [Intel-wired-lan] [iwl-next v3 6/8] ice: use libie_aq_str
> -Original Message- > From: Michal Swiatkowski > Sent: Friday, April 25, 2025 8:08 AM > To: [email protected] > Cc: [email protected]; Lobakin, Aleksander > ; Kitszel, Przemyslaw > ; Kwapulinski, Piotr > ; Loktionov, Aleksandr > ; Jagielski, Jedrzej > ; Zaremba, Larysa ; > Nguyen, Anthony L > Subject: [iwl-next v3 6/8] ice: use libie_aq_str > > Simple: > s/ice_aq_str/libie_aq_str > > Add libie_aminq module in ice Kconfig. > > Reviewed-by: Przemek Kitszel > Signed-off-by: Michal Swiatkowski Reviewed-by: Aleksandr Loktionov > --- > drivers/net/ethernet/intel/Kconfig| 1 + > drivers/net/ethernet/intel/ice/ice.h | 1 - > .../net/ethernet/intel/ice/devlink/devlink.c | 10 +-- > .../net/ethernet/intel/ice/devlink/health.c | 2 +- > drivers/net/ethernet/intel/ice/ice_dpll.c | 20 +++--- > drivers/net/ethernet/intel/ice/ice_ethtool.c | 12 ++-- > .../net/ethernet/intel/ice/ice_fw_update.c| 20 +++--- > drivers/net/ethernet/intel/ice/ice_lib.c | 4 +- > drivers/net/ethernet/intel/ice/ice_main.c | 69 +++ > drivers/net/ethernet/intel/ice/ice_virtchnl.c | 4 +- > .../net/ethernet/intel/ice/ice_vsi_vlan_lib.c | 24 +++ > 11 files changed, 59 insertions(+), 108 deletions(-) > > diff --git a/drivers/net/ethernet/intel/Kconfig > b/drivers/net/ethernet/intel/Kconfig > index 5a331c1c76cb..d5de9bc8b1b6 100644 > --- a/drivers/net/ethernet/intel/Kconfig > +++ b/drivers/net/ethernet/intel/Kconfig > @@ -294,6 +294,7 @@ config ICE > select AUXILIARY_BUS > select DIMLIB > select LIBIE > + select LIBIE_ADMINQ > select NET_DEVLINK > select PACKING > select PLDMFW > diff --git a/drivers/net/ethernet/intel/ice/ice.h > b/drivers/net/ethernet/intel/ice/ice.h > index a1d9cc8ddad5..0693707ceabf 100644 > --- a/drivers/net/ethernet/intel/ice/ice.h > +++ b/drivers/net/ethernet/intel/ice/ice.h > @@ -971,7 +971,6 @@ int ice_plug_aux_dev(struct ice_pf *pf); void > ice_unplug_aux_dev(struct ice_pf *pf); int ice_init_rdma(struct ice_pf *pf); > void ice_deinit_rdma(struct ice_pf *pf); -const char *ice_aq_str(enum > libie_aq_err aq_err); bool ice_is_wol_supported(struct ice_hw *hw); void > ice_fdir_del_all_fltrs(struct ice_vsi *vsi); int diff --git > a/drivers/net/ethernet/intel/ice/devlink/devlink.c > b/drivers/net/ethernet/intel/ice/devlink/devlink.c > index fcb199efbea5..ca24714c8131 100644 > --- a/drivers/net/ethernet/intel/ice/devlink/devlink.c > +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c > @@ -293,7 +293,7 @@ static int ice_devlink_info_get(struct devlink *devlink, > err = ice_discover_dev_caps(hw, &ctx->dev_caps); > if (err) { > dev_dbg(dev, "Failed to discover device capabilities, status %d > aq_err %s\n", > - err, ice_aq_str(hw->adminq.sq_last_status)); > + err, libie_aq_str(hw->adminq.sq_last_status)); > NL_SET_ERR_MSG_MOD(extack, "Unable to discover device > capabilities"); > goto out_free_ctx; > } > @@ -302,7 +302,7 @@ static int ice_devlink_info_get(struct devlink *devlink, > err = ice_get_inactive_orom_ver(hw, &ctx->pending_orom); > if (err) { > dev_dbg(dev, "Unable to read inactive Option ROM > version data, status %d aq_err %s\n", > - err, ice_aq_str(hw->adminq.sq_last_status)); > + err, libie_aq_str(hw->adminq.sq_last_status)); > > /* disable display of pending Option ROM */ > ctx- > >dev_caps.common_cap.nvm_update_pending_orom = false; @@ -313,7 > +313,7 @@ static int ice_devlink_info_get(struct devlink *devlink, > err = ice_get_inactive_nvm_ver(hw, &ctx->pending_nvm); > if (err) { > dev_dbg(dev, "Unable to read inactive NVM version > data, status %d aq_err %s\n", > - err, ice_aq_str(hw->adminq.sq_last_status)); > + err, libie_aq_str(hw->adminq.sq_last_status)); > > /* disable display of pending Option ROM */ > ctx- > >dev_caps.common_cap.nvm_update_pending_nvm = false; @@ -324,7 > +324,7 @@ static int ice_devlink_info_get(struct devlink *devlink, > err = ice_get_inactive_netlist_ver(hw, &ctx->pending_netlist); > if (err) { > dev_dbg(dev, "Unable to read inactive Netlist version > data, status %d aq_err %s\n", > - err, ice_aq_str(hw->adminq.sq_last_status)); > + err, libie_aq_str(hw->adminq.sq_last_status)); > > /* disable display of pending Option ROM */ > ctx- > >dev_caps.common_cap.nvm_update_pending_netlist = false; @@ -440,7 > +440,7 @@ ice_devlink_reload_empr_start(struct ice_pf *pf, > err = ice_aq_nvm_update_empr
[Intel-wired-lan] [iwl-next v3 6/8] ice: use libie_aq_str
Simple:
s/ice_aq_str/libie_aq_str
Add libie_aminq module in ice Kconfig.
Reviewed-by: Przemek Kitszel
Signed-off-by: Michal Swiatkowski
---
drivers/net/ethernet/intel/Kconfig| 1 +
drivers/net/ethernet/intel/ice/ice.h | 1 -
.../net/ethernet/intel/ice/devlink/devlink.c | 10 +--
.../net/ethernet/intel/ice/devlink/health.c | 2 +-
drivers/net/ethernet/intel/ice/ice_dpll.c | 20 +++---
drivers/net/ethernet/intel/ice/ice_ethtool.c | 12 ++--
.../net/ethernet/intel/ice/ice_fw_update.c| 20 +++---
drivers/net/ethernet/intel/ice/ice_lib.c | 4 +-
drivers/net/ethernet/intel/ice/ice_main.c | 69 +++
drivers/net/ethernet/intel/ice/ice_virtchnl.c | 4 +-
.../net/ethernet/intel/ice/ice_vsi_vlan_lib.c | 24 +++
11 files changed, 59 insertions(+), 108 deletions(-)
diff --git a/drivers/net/ethernet/intel/Kconfig
b/drivers/net/ethernet/intel/Kconfig
index 5a331c1c76cb..d5de9bc8b1b6 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -294,6 +294,7 @@ config ICE
select AUXILIARY_BUS
select DIMLIB
select LIBIE
+ select LIBIE_ADMINQ
select NET_DEVLINK
select PACKING
select PLDMFW
diff --git a/drivers/net/ethernet/intel/ice/ice.h
b/drivers/net/ethernet/intel/ice/ice.h
index a1d9cc8ddad5..0693707ceabf 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -971,7 +971,6 @@ int ice_plug_aux_dev(struct ice_pf *pf);
void ice_unplug_aux_dev(struct ice_pf *pf);
int ice_init_rdma(struct ice_pf *pf);
void ice_deinit_rdma(struct ice_pf *pf);
-const char *ice_aq_str(enum libie_aq_err aq_err);
bool ice_is_wol_supported(struct ice_hw *hw);
void ice_fdir_del_all_fltrs(struct ice_vsi *vsi);
int
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c
b/drivers/net/ethernet/intel/ice/devlink/devlink.c
index fcb199efbea5..ca24714c8131 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c
@@ -293,7 +293,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
err = ice_discover_dev_caps(hw, &ctx->dev_caps);
if (err) {
dev_dbg(dev, "Failed to discover device capabilities, status %d
aq_err %s\n",
- err, ice_aq_str(hw->adminq.sq_last_status));
+ err, libie_aq_str(hw->adminq.sq_last_status));
NL_SET_ERR_MSG_MOD(extack, "Unable to discover device
capabilities");
goto out_free_ctx;
}
@@ -302,7 +302,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
err = ice_get_inactive_orom_ver(hw, &ctx->pending_orom);
if (err) {
dev_dbg(dev, "Unable to read inactive Option ROM
version data, status %d aq_err %s\n",
- err, ice_aq_str(hw->adminq.sq_last_status));
+ err, libie_aq_str(hw->adminq.sq_last_status));
/* disable display of pending Option ROM */
ctx->dev_caps.common_cap.nvm_update_pending_orom =
false;
@@ -313,7 +313,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
err = ice_get_inactive_nvm_ver(hw, &ctx->pending_nvm);
if (err) {
dev_dbg(dev, "Unable to read inactive NVM version data,
status %d aq_err %s\n",
- err, ice_aq_str(hw->adminq.sq_last_status));
+ err, libie_aq_str(hw->adminq.sq_last_status));
/* disable display of pending Option ROM */
ctx->dev_caps.common_cap.nvm_update_pending_nvm = false;
@@ -324,7 +324,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
err = ice_get_inactive_netlist_ver(hw, &ctx->pending_netlist);
if (err) {
dev_dbg(dev, "Unable to read inactive Netlist version
data, status %d aq_err %s\n",
- err, ice_aq_str(hw->adminq.sq_last_status));
+ err, libie_aq_str(hw->adminq.sq_last_status));
/* disable display of pending Option ROM */
ctx->dev_caps.common_cap.nvm_update_pending_netlist =
false;
@@ -440,7 +440,7 @@ ice_devlink_reload_empr_start(struct ice_pf *pf,
err = ice_aq_nvm_update_empr(hw);
if (err) {
dev_err(dev, "Failed to trigger EMP device reset to reload
firmware, err %d aq_err %s\n",
- err, ice_aq_str(hw->adminq.sq_last_status));
+ err, libie_aq_str(hw->adminq.sq_last_status));
NL_SET_ERR_MSG_MOD(extack, "Failed to trigger EMP device reset
to reload firmware");
return err;
}
diff --git a/drivers/net/ethernet/intel/ice/devlink/health.c
b/drivers/net/ethernet/intel/ice/devlink/hea
