Skip to content

Commit e99c161

Browse files
Michal Swiatkowskianguy11
Michal Swiatkowski
authored and
anguy11
committed
ice: use libie_aq_str
Simple: s/ice_aq_str/libie_aq_str Add libie_aminq module in ice Kconfig. Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 5feaa7a commit e99c161

11 files changed

Lines changed: 60 additions & 109 deletions

File tree

‎drivers/net/ethernet/intel/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ config ICE
294294
select AUXILIARY_BUS
295295
select DIMLIB
296296
select LIBIE
297+
select LIBIE_ADMINQ
297298
select NET_DEVLINK
298299
select PACKING
299300
select PLDMFW

‎drivers/net/ethernet/intel/ice/devlink/devlink.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
293293
err = ice_discover_dev_caps(hw, &ctx->dev_caps);
294294
if (err) {
295295
dev_dbg(dev, "Failed to discover device capabilities, status %d aq_err %s\n",
296-
err, ice_aq_str(hw->adminq.sq_last_status));
296+
err, libie_aq_str(hw->adminq.sq_last_status));
297297
NL_SET_ERR_MSG_MOD(extack, "Unable to discover device capabilities");
298298
goto out_free_ctx;
299299
}
@@ -302,7 +302,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
302302
err = ice_get_inactive_orom_ver(hw, &ctx->pending_orom);
303303
if (err) {
304304
dev_dbg(dev, "Unable to read inactive Option ROM version data, status %d aq_err %s\n",
305-
err, ice_aq_str(hw->adminq.sq_last_status));
305+
err, libie_aq_str(hw->adminq.sq_last_status));
306306

307307
/* disable display of pending Option ROM */
308308
ctx->dev_caps.common_cap.nvm_update_pending_orom = false;
@@ -313,7 +313,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
313313
err = ice_get_inactive_nvm_ver(hw, &ctx->pending_nvm);
314314
if (err) {
315315
dev_dbg(dev, "Unable to read inactive NVM version data, status %d aq_err %s\n",
316-
err, ice_aq_str(hw->adminq.sq_last_status));
316+
err, libie_aq_str(hw->adminq.sq_last_status));
317317

318318
/* disable display of pending Option ROM */
319319
ctx->dev_caps.common_cap.nvm_update_pending_nvm = false;
@@ -324,7 +324,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
324324
err = ice_get_inactive_netlist_ver(hw, &ctx->pending_netlist);
325325
if (err) {
326326
dev_dbg(dev, "Unable to read inactive Netlist version data, status %d aq_err %s\n",
327-
err, ice_aq_str(hw->adminq.sq_last_status));
327+
err, libie_aq_str(hw->adminq.sq_last_status));
328328

329329
/* disable display of pending Option ROM */
330330
ctx->dev_caps.common_cap.nvm_update_pending_netlist = false;
@@ -440,7 +440,7 @@ ice_devlink_reload_empr_start(struct ice_pf *pf,
440440
err = ice_aq_nvm_update_empr(hw);
441441
if (err) {
442442
dev_err(dev, "Failed to trigger EMP device reset to reload firmware, err %d aq_err %s\n",
443-
err, ice_aq_str(hw->adminq.sq_last_status));
443+
err, libie_aq_str(hw->adminq.sq_last_status));
444444
NL_SET_ERR_MSG_MOD(extack, "Failed to trigger EMP device reset to reload firmware");
445445
return err;
446446
}

‎drivers/net/ethernet/intel/ice/devlink/health.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static void ice_config_health_events(struct ice_pf *pf, bool enable)
204204
if (ret)
205205
dev_err(ice_pf_to_dev(pf), "Failed to %s firmware health events, err %d aq_err %s\n",
206206
str_enable_disable(enable), ret,
207-
ice_aq_str(pf->hw.adminq.sq_last_status));
207+
libie_aq_str(pf->hw.adminq.sq_last_status));
208208
}
209209

210210
/**

‎drivers/net/ethernet/intel/ice/ice.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,6 @@ int ice_plug_aux_dev(struct ice_pf *pf);
960960
void ice_unplug_aux_dev(struct ice_pf *pf);
961961
int ice_init_rdma(struct ice_pf *pf);
962962
void ice_deinit_rdma(struct ice_pf *pf);
963-
const char *ice_aq_str(enum libie_aq_err aq_err);
964963
bool ice_is_wol_supported(struct ice_hw *hw);
965964
void ice_fdir_del_all_fltrs(struct ice_vsi *vsi);
966965
int

‎drivers/net/ethernet/intel/ice/ice_dpll.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ ice_dpll_pin_freq_set(struct ice_pf *pf, struct ice_dpll_pin *pin,
170170
NL_SET_ERR_MSG_FMT(extack,
171171
"err:%d %s failed to set pin freq:%u on pin:%u",
172172
ret,
173-
ice_aq_str(pf->hw.adminq.sq_last_status),
173+
libie_aq_str(pf->hw.adminq.sq_last_status),
174174
freq, pin->idx);
175175
return ret;
176176
}
@@ -477,7 +477,7 @@ ice_dpll_pin_enable(struct ice_hw *hw, struct ice_dpll_pin *pin,
477477
if (ret)
478478
NL_SET_ERR_MSG_FMT(extack,
479479
"err:%d %s failed to enable %s pin:%u",
480-
ret, ice_aq_str(hw->adminq.sq_last_status),
480+
ret, libie_aq_str(hw->adminq.sq_last_status),
481481
pin_type_name[pin_type], pin->idx);
482482

483483
return ret;
@@ -522,7 +522,7 @@ ice_dpll_pin_disable(struct ice_hw *hw, struct ice_dpll_pin *pin,
522522
if (ret)
523523
NL_SET_ERR_MSG_FMT(extack,
524524
"err:%d %s failed to disable %s pin:%u",
525-
ret, ice_aq_str(hw->adminq.sq_last_status),
525+
ret, libie_aq_str(hw->adminq.sq_last_status),
526526
pin_type_name[pin_type], pin->idx);
527527

528528
return ret;
@@ -701,13 +701,13 @@ ice_dpll_pin_state_update(struct ice_pf *pf, struct ice_dpll_pin *pin,
701701
NL_SET_ERR_MSG_FMT(extack,
702702
"err:%d %s failed to update %s pin:%u",
703703
ret,
704-
ice_aq_str(pf->hw.adminq.sq_last_status),
704+
libie_aq_str(pf->hw.adminq.sq_last_status),
705705
pin_type_name[pin_type], pin->idx);
706706
else
707707
dev_err_ratelimited(ice_pf_to_dev(pf),
708708
"err:%d %s failed to update %s pin:%u\n",
709709
ret,
710-
ice_aq_str(pf->hw.adminq.sq_last_status),
710+
libie_aq_str(pf->hw.adminq.sq_last_status),
711711
pin_type_name[pin_type], pin->idx);
712712
return ret;
713713
}
@@ -740,7 +740,7 @@ ice_dpll_hw_input_prio_set(struct ice_pf *pf, struct ice_dpll *dpll,
740740
NL_SET_ERR_MSG_FMT(extack,
741741
"err:%d %s failed to set pin prio:%u on pin:%u",
742742
ret,
743-
ice_aq_str(pf->hw.adminq.sq_last_status),
743+
libie_aq_str(pf->hw.adminq.sq_last_status),
744744
prio, pin->idx);
745745
else
746746
dpll->input_prio[pin->idx] = prio;
@@ -1662,7 +1662,7 @@ ice_dpll_pin_phase_adjust_set(const struct dpll_pin *pin, void *pin_priv,
16621662
NL_SET_ERR_MSG_FMT(extack,
16631663
"err:%d %s failed to set pin phase_adjust:%d for pin:%u on dpll:%u",
16641664
ret,
1665-
ice_aq_str(pf->hw.adminq.sq_last_status),
1665+
libie_aq_str(pf->hw.adminq.sq_last_status),
16661666
phase_adjust, p->idx, d->dpll_idx);
16671667

16681668
return ret;
@@ -2313,7 +2313,7 @@ ice_dpll_rclk_state_on_pin_set(const struct dpll_pin *pin, void *pin_priv,
23132313
NL_SET_ERR_MSG_FMT(extack,
23142314
"err:%d %s failed to set pin state:%u for pin:%u on parent:%u",
23152315
ret,
2316-
ice_aq_str(pf->hw.adminq.sq_last_status),
2316+
libie_aq_str(pf->hw.adminq.sq_last_status),
23172317
state, p->idx, parent->idx);
23182318
unlock:
23192319
mutex_unlock(&pf->dplls.lock);
@@ -2568,7 +2568,7 @@ static int ice_dpll_pps_update_phase_offsets(struct ice_pf *pf,
25682568
dev_err(ice_pf_to_dev(pf),
25692569
"failed to get input pin measurements dpll=%d, ret=%d %s\n",
25702570
DPLL_TYPE_PPS, ret,
2571-
ice_aq_str(pf->hw.adminq.sq_last_status));
2571+
libie_aq_str(pf->hw.adminq.sq_last_status));
25722572
return ret;
25732573
}
25742574
for (i = 0; i < pf->dplls.num_inputs; i++) {
@@ -2627,7 +2627,7 @@ ice_dpll_update_state(struct ice_pf *pf, struct ice_dpll *d, bool init)
26272627
dev_err(ice_pf_to_dev(pf),
26282628
"update dpll=%d state failed, ret=%d %s\n",
26292629
d->dpll_idx, ret,
2630-
ice_aq_str(pf->hw.adminq.sq_last_status));
2630+
libie_aq_str(pf->hw.adminq.sq_last_status));
26312631
return ret;
26322632
}
26332633
if (init) {
@@ -3678,7 +3678,7 @@ static int ice_dpll_init_info(struct ice_pf *pf, bool cgu)
36783678
if (ret) {
36793679
dev_err(ice_pf_to_dev(pf),
36803680
"err:%d %s failed to read cgu abilities\n",
3681-
ret, ice_aq_str(hw->adminq.sq_last_status));
3681+
ret, libie_aq_str(hw->adminq.sq_last_status));
36823682
return ret;
36833683
}
36843684

‎drivers/net/ethernet/intel/ice/ice_ethtool.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -879,15 +879,15 @@ ice_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
879879
ret = ice_acquire_nvm(hw, ICE_RES_READ);
880880
if (ret) {
881881
dev_err(dev, "ice_acquire_nvm failed, err %d aq_err %s\n",
882-
ret, ice_aq_str(hw->adminq.sq_last_status));
882+
ret, libie_aq_str(hw->adminq.sq_last_status));
883883
goto out;
884884
}
885885

886886
ret = ice_read_flat_nvm(hw, eeprom->offset, &eeprom->len, buf,
887887
false);
888888
if (ret) {
889889
dev_err(dev, "ice_read_flat_nvm failed, err %d aq_err %s\n",
890-
ret, ice_aq_str(hw->adminq.sq_last_status));
890+
ret, libie_aq_str(hw->adminq.sq_last_status));
891891
goto release;
892892
}
893893

@@ -3542,15 +3542,15 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)
35423542

35433543
if (aq_failures & ICE_SET_FC_AQ_FAIL_GET) {
35443544
netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %d aq_err %s\n",
3545-
err, ice_aq_str(hw->adminq.sq_last_status));
3545+
err, libie_aq_str(hw->adminq.sq_last_status));
35463546
err = -EAGAIN;
35473547
} else if (aq_failures & ICE_SET_FC_AQ_FAIL_SET) {
35483548
netdev_info(netdev, "Set fc failed on the set_phy_config call with err %d aq_err %s\n",
3549-
err, ice_aq_str(hw->adminq.sq_last_status));
3549+
err, libie_aq_str(hw->adminq.sq_last_status));
35503550
err = -EAGAIN;
35513551
} else if (aq_failures & ICE_SET_FC_AQ_FAIL_UPDATE) {
35523552
netdev_info(netdev, "Set fc failed on the get_link_info call with err %d aq_err %s\n",
3553-
err, ice_aq_str(hw->adminq.sq_last_status));
3553+
err, libie_aq_str(hw->adminq.sq_last_status));
35543554
err = -EAGAIN;
35553555
}
35563556

@@ -3861,7 +3861,7 @@ static int ice_vsi_set_dflt_rss_lut(struct ice_vsi *vsi, int req_rss_size)
38613861
err = ice_set_rss_lut(vsi, lut, vsi->rss_table_size);
38623862
if (err)
38633863
dev_err(dev, "Cannot set RSS lut, err %d aq_err %s\n", err,
3864-
ice_aq_str(hw->adminq.sq_last_status));
3864+
libie_aq_str(hw->adminq.sq_last_status));
38653865

38663866
kfree(lut);
38673867
return err;

‎drivers/net/ethernet/intel/ice/ice_fw_update.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ice_send_package_data(struct pldmfw *context, const u8 *data, u16 length)
6868

6969
if (status) {
7070
dev_err(dev, "Failed to send record package data to firmware, err %d aq_err %s\n",
71-
status, ice_aq_str(hw->adminq.sq_last_status));
71+
status, libie_aq_str(hw->adminq.sq_last_status));
7272
NL_SET_ERR_MSG_MOD(extack, "Failed to record package data to firmware");
7373
return -EIO;
7474
}
@@ -257,7 +257,7 @@ ice_send_component_table(struct pldmfw *context, struct pldmfw_component *compon
257257

258258
if (status) {
259259
dev_err(dev, "Failed to transfer component table to firmware, err %d aq_err %s\n",
260-
status, ice_aq_str(hw->adminq.sq_last_status));
260+
status, libie_aq_str(hw->adminq.sq_last_status));
261261
NL_SET_ERR_MSG_MOD(extack, "Failed to transfer component table to firmware");
262262
return -EIO;
263263
}
@@ -314,7 +314,7 @@ int ice_write_one_nvm_block(struct ice_pf *pf, u16 module, u32 offset,
314314
if (err) {
315315
dev_err(dev, "Failed to flash module 0x%02x with block of size %u at offset %u, err %d aq_err %s\n",
316316
module, block_size, offset, err,
317-
ice_aq_str(hw->adminq.sq_last_status));
317+
libie_aq_str(hw->adminq.sq_last_status));
318318
NL_SET_ERR_MSG_MOD(extack, "Failed to program flash module");
319319
return -EIO;
320320
}
@@ -358,7 +358,7 @@ int ice_write_one_nvm_block(struct ice_pf *pf, u16 module, u32 offset,
358358
if (completion_retval) {
359359
dev_err(dev, "Firmware failed to flash module 0x%02x with block of size %u at offset %u, err %s\n",
360360
module, block_size, offset,
361-
ice_aq_str((enum libie_aq_err)completion_retval));
361+
libie_aq_str((enum libie_aq_err)completion_retval));
362362
NL_SET_ERR_MSG_MOD(extack, "Firmware failed to program flash module");
363363
return -EIO;
364364
}
@@ -506,7 +506,7 @@ ice_erase_nvm_module(struct ice_pf *pf, u16 module, const char *component,
506506
if (err) {
507507
dev_err(dev, "Failed to erase %s (module 0x%02x), err %d aq_err %s\n",
508508
component, module, err,
509-
ice_aq_str(hw->adminq.sq_last_status));
509+
libie_aq_str(hw->adminq.sq_last_status));
510510
NL_SET_ERR_MSG_MOD(extack, "Failed to erase flash module");
511511
err = -EIO;
512512
goto out_notify_devlink;
@@ -536,7 +536,7 @@ ice_erase_nvm_module(struct ice_pf *pf, u16 module, const char *component,
536536
if (completion_retval) {
537537
dev_err(dev, "Firmware failed to erase %s (module 0x02%x), aq_err %s\n",
538538
component, module,
539-
ice_aq_str((enum libie_aq_err)completion_retval));
539+
libie_aq_str((enum libie_aq_err)completion_retval));
540540
NL_SET_ERR_MSG_MOD(extack, "Firmware failed to erase flash");
541541
err = -EIO;
542542
goto out_notify_devlink;
@@ -583,7 +583,7 @@ ice_switch_flash_banks(struct ice_pf *pf, u8 activate_flags,
583583
err = ice_nvm_write_activate(hw, activate_flags, &response_flags);
584584
if (err) {
585585
dev_err(dev, "Failed to switch active flash banks, err %d aq_err %s\n",
586-
err, ice_aq_str(hw->adminq.sq_last_status));
586+
err, libie_aq_str(hw->adminq.sq_last_status));
587587
NL_SET_ERR_MSG_MOD(extack, "Failed to switch active flash banks");
588588
return -EIO;
589589
}
@@ -615,7 +615,7 @@ ice_switch_flash_banks(struct ice_pf *pf, u8 activate_flags,
615615
completion_retval = le16_to_cpu(task.event.desc.retval);
616616
if (completion_retval) {
617617
dev_err(dev, "Firmware failed to switch active flash banks aq_err %s\n",
618-
ice_aq_str((enum libie_aq_err)completion_retval));
618+
libie_aq_str((enum libie_aq_err)completion_retval));
619619
NL_SET_ERR_MSG_MOD(extack, "Firmware failed to switch active flash banks");
620620
return -EIO;
621621
}
@@ -953,7 +953,7 @@ ice_cancel_pending_update(struct ice_pf *pf, const char *component,
953953
err = ice_acquire_nvm(hw, ICE_RES_WRITE);
954954
if (err) {
955955
dev_err(dev, "Failed to acquire device flash lock, err %d aq_err %s\n",
956-
err, ice_aq_str(hw->adminq.sq_last_status));
956+
err, libie_aq_str(hw->adminq.sq_last_status));
957957
NL_SET_ERR_MSG_MOD(extack, "Failed to acquire device flash lock");
958958
return err;
959959
}
@@ -1046,7 +1046,7 @@ int ice_devlink_flash_update(struct devlink *devlink,
10461046
err = ice_acquire_nvm(hw, ICE_RES_WRITE);
10471047
if (err) {
10481048
dev_err(dev, "Failed to acquire device flash lock, err %d aq_err %s\n",
1049-
err, ice_aq_str(hw->adminq.sq_last_status));
1049+
err, libie_aq_str(hw->adminq.sq_last_status));
10501050
NL_SET_ERR_MSG_MOD(extack, "Failed to acquire device flash lock");
10511051
return err;
10521052
}

‎drivers/net/ethernet/intel/ice/ice_lib.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3745,11 +3745,11 @@ int ice_set_link(struct ice_vsi *vsi, bool ena)
37453745
if (hw->adminq.sq_last_status == LIBIE_AQ_RC_EMODE)
37463746
dev_dbg(dev, "can't set link to %s, err %d aq_err %s. not fatal, continuing\n",
37473747
(ena ? "ON" : "OFF"), status,
3748-
ice_aq_str(hw->adminq.sq_last_status));
3748+
libie_aq_str(hw->adminq.sq_last_status));
37493749
} else if (status) {
37503750
dev_err(dev, "can't set link to %s, err %d aq_err %s\n",
37513751
(ena ? "ON" : "OFF"), status,
3752-
ice_aq_str(hw->adminq.sq_last_status));
3752+
libie_aq_str(hw->adminq.sq_last_status));
37533753
return status;
37543754
}
37553755

0 commit comments

Comments
 (0)