Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1285695/?format=api
{ "id": 1285695, "url": "http://patchwork.ozlabs.org/api/patches/1285695/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200508004113.39725-6-anthony.l.nguyen@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200508004113.39725-6-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-08T00:41:04", "name": "[S41,06/15] ice: Provide more meaningful error message", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "07f6d6c63a60324b69c21b7aaa28011a149deb22", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200508004113.39725-6-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 175527, "url": "http://patchwork.ozlabs.org/api/series/175527/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=175527", "date": "2020-05-08T00:41:10", "name": "[S41,01/15] ice: Add VF promiscuous support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/175527/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1285695/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1285695/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49JBQy0Yjwz9sSG\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 8 May 2020 10:43:54 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 19DC9896BD;\n\tFri, 8 May 2020 00:43:52 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 6PaAprtZVXva; Fri, 8 May 2020 00:43:48 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2D087896BC;\n\tFri, 8 May 2020 00:43:48 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by ash.osuosl.org (Postfix) with ESMTP id 4BA5D1BF2C4\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2020 00:43:43 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by whitealder.osuosl.org (Postfix) with ESMTP id 438F487871\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2020 00:43:43 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id hkVJOy5b+FGx for <intel-wired-lan@lists.osuosl.org>;\n Fri, 8 May 2020 00:43:35 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by whitealder.osuosl.org (Postfix) with ESMTPS id E5C47878B7\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2020 00:43:34 +0000 (UTC)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 07 May 2020 17:43:33 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by orsmga007.jf.intel.com with ESMTP; 07 May 2020 17:43:33 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n oecXlVFgIeAJ2oaaBk805oFqss0eXVL+k8wzheMviRwyZDW0HhOhFdIG21HspsU6jkOT5NjRgv\n 7yo6a62r6sIQ==", "\n m8D+f04/Oso+Nu4oTtIYACfJsgMsGnkJT0Q9E0fQjtpp7QxufYd/tLkrWUtZMgQYkOgfnwT/PR\n Yspi13WPMj7A==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,365,1583222400\"; d=\"scan'208\";a=\"249468771\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 7 May 2020 17:41:04 -0700", "Message-Id": "<20200508004113.39725-6-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200508004113.39725-1-anthony.l.nguyen@intel.com>", "References": "<20200508004113.39725-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S41 06/15] ice: Provide more meaningful\n error message", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Lihong Yang <lihong.yang@intel.com>\n\nWhen printing the ice status or AQ error codes, instead of printing out the\nnumerical value, provide the description of the error code. This provides\nmore info about the issue than a number.\n\nSigned-off-by: Lihong Yang <lihong.yang@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice.h | 2 +\n drivers/net/ethernet/intel/ice/ice_base.c | 8 +-\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 42 +++--\n drivers/net/ethernet/intel/ice/ice_lib.c | 103 +++++-----\n drivers/net/ethernet/intel/ice/ice_main.c | 177 +++++++++++++++---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 28 +--\n 6 files changed, 247 insertions(+), 113 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 2dcbb60060f1..b9860b8350ca 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -542,6 +542,8 @@ int ice_init_peer_devices(struct ice_pf *pf);\n int\n ice_for_each_peer(struct ice_pf *pf, void *data,\n \t\t int (*fn)(struct ice_peer_dev_int *, void *));\n+const char *ice_stat_str(enum ice_status stat_err);\n+const char *ice_aq_str(enum ice_aq_err aq_err);\n int ice_open(struct net_device *netdev);\n int ice_stop(struct net_device *netdev);\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c\nindex a19cd6f5436b..ee1c698ff056 100644\n--- a/drivers/net/ethernet/intel/ice/ice_base.c\n+++ b/drivers/net/ethernet/intel/ice/ice_base.c\n@@ -662,8 +662,8 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring,\n \tstatus = ice_ena_vsi_txq(vsi->port_info, vsi->idx, tc, ring->q_handle,\n \t\t\t\t 1, qg_buf, buf_len, NULL);\n \tif (status) {\n-\t\tdev_err(ice_pf_to_dev(pf), \"Failed to set LAN Tx queue context, error: %d\\n\",\n-\t\t\tstatus);\n+\t\tdev_err(ice_pf_to_dev(pf), \"Failed to set LAN Tx queue context, error: %s\\n\",\n+\t\t\tice_stat_str(status));\n \t\treturn -ENODEV;\n \t}\n \n@@ -832,8 +832,8 @@ ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n \t} else if (status == ICE_ERR_DOES_NOT_EXIST) {\n \t\tdev_dbg(ice_pf_to_dev(vsi->back), \"LAN Tx queues do not exist, nothing to disable\\n\");\n \t} else if (status) {\n-\t\tdev_err(ice_pf_to_dev(vsi->back), \"Failed to disable LAN Tx queues, error: %d\\n\",\n-\t\t\tstatus);\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"Failed to disable LAN Tx queues, error: %s\\n\",\n+\t\t\tice_stat_str(status));\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex db547c0c7c6f..b814bc54f752 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -275,8 +275,9 @@ ice_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,\n \n \tstatus = ice_acquire_nvm(hw, ICE_RES_READ);\n \tif (status) {\n-\t\tdev_err(dev, \"ice_acquire_nvm failed, err %d aq_err %d\\n\",\n-\t\t\tstatus, hw->adminq.sq_last_status);\n+\t\tdev_err(dev, \"ice_acquire_nvm failed, err %s aq_err %s\\n\",\n+\t\t\tice_stat_str(status),\n+\t\t\tice_aq_str(hw->adminq.sq_last_status));\n \t\tret = -EIO;\n \t\tgoto out;\n \t}\n@@ -284,8 +285,9 @@ ice_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,\n \tstatus = ice_read_flat_nvm(hw, eeprom->offset, &eeprom->len, buf,\n \t\t\t\t false);\n \tif (status) {\n-\t\tdev_err(dev, \"ice_read_flat_nvm failed, err %d aq_err %d\\n\",\n-\t\t\tstatus, hw->adminq.sq_last_status);\n+\t\tdev_err(dev, \"ice_read_flat_nvm failed, err %s aq_err %s\\n\",\n+\t\t\tice_stat_str(status),\n+\t\t\tice_aq_str(hw->adminq.sq_last_status));\n \t\tret = -EIO;\n \t\tgoto release;\n \t}\n@@ -334,7 +336,8 @@ static u64 ice_link_test(struct net_device *netdev)\n \tnetdev_info(netdev, \"link test\\n\");\n \tstatus = ice_get_link_status(np->vsi->port_info, &link_up);\n \tif (status) {\n-\t\tnetdev_err(netdev, \"link query error, status = %d\\n\", status);\n+\t\tnetdev_err(netdev, \"link query error, status = %s\\n\",\n+\t\t\t ice_stat_str(status));\n \t\treturn 1;\n \t}\n \n@@ -1160,8 +1163,9 @@ static int ice_nway_reset(struct net_device *netdev)\n \t\tstatus = ice_aq_set_link_restart_an(pi, false, NULL);\n \n \tif (status) {\n-\t\tnetdev_info(netdev, \"link restart failed, err %d aq_err %d\\n\",\n-\t\t\t status, pi->hw->adminq.sq_last_status);\n+\t\tnetdev_info(netdev, \"link restart failed, err %s aq_err %s\\n\",\n+\t\t\t ice_stat_str(status),\n+\t\t\t ice_aq_str(pi->hw->adminq.sq_last_status));\n \t\treturn -EIO;\n \t}\n \n@@ -2462,8 +2466,8 @@ ice_set_rss_hash_opt(struct ice_vsi *vsi, struct ethtool_rxnfc *nfc)\n \n \tstatus = ice_add_rss_cfg(&pf->hw, vsi->idx, hashed_flds, hdrs);\n \tif (status) {\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed, vsi num = %d, error = %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed, vsi num = %d, error = %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n \t\treturn -EINVAL;\n \t}\n \n@@ -2964,16 +2968,19 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)\n \tstatus = ice_set_fc(pi, &aq_failures, link_up);\n \n \tif (aq_failures & ICE_SET_FC_AQ_FAIL_GET) {\n-\t\tnetdev_info(netdev, \"Set fc failed on the get_phy_capabilities call with err %d aq_err %d\\n\",\n-\t\t\t status, hw->adminq.sq_last_status);\n+\t\tnetdev_info(netdev, \"Set fc failed on the get_phy_capabilities call with err %s aq_err %s\\n\",\n+\t\t\t ice_stat_str(status),\n+\t\t\t ice_aq_str(hw->adminq.sq_last_status));\n \t\terr = -EAGAIN;\n \t} else if (aq_failures & ICE_SET_FC_AQ_FAIL_SET) {\n-\t\tnetdev_info(netdev, \"Set fc failed on the set_phy_config call with err %d aq_err %d\\n\",\n-\t\t\t status, hw->adminq.sq_last_status);\n+\t\tnetdev_info(netdev, \"Set fc failed on the set_phy_config call with err %s aq_err %s\\n\",\n+\t\t\t ice_stat_str(status),\n+\t\t\t ice_aq_str(hw->adminq.sq_last_status));\n \t\terr = -EAGAIN;\n \t} else if (aq_failures & ICE_SET_FC_AQ_FAIL_UPDATE) {\n-\t\tnetdev_info(netdev, \"Set fc failed on the get_link_info call with err %d aq_err %d\\n\",\n-\t\t\t status, hw->adminq.sq_last_status);\n+\t\tnetdev_info(netdev, \"Set fc failed on the get_link_info call with err %s aq_err %s\\n\",\n+\t\t\t ice_stat_str(status),\n+\t\t\t ice_aq_str(hw->adminq.sq_last_status));\n \t\terr = -EAGAIN;\n \t}\n \n@@ -3227,8 +3234,9 @@ static int ice_vsi_set_dflt_rss_lut(struct ice_vsi *vsi, int req_rss_size)\n \tstatus = ice_aq_set_rss_lut(hw, vsi->idx, vsi->rss_lut_type, lut,\n \t\t\t\t vsi->rss_table_size);\n \tif (status) {\n-\t\tdev_err(dev, \"Cannot set RSS lut, err %d aq_err %d\\n\",\n-\t\t\tstatus, hw->adminq.rq_last_status);\n+\t\tdev_err(dev, \"Cannot set RSS lut, err %s aq_err %s\\n\",\n+\t\t\tice_stat_str(status),\n+\t\t\tice_aq_str(hw->adminq.rq_last_status));\n \t\terr = -EIO;\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 34b41b1039f1..ae2528762b07 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -248,8 +248,8 @@ void ice_vsi_delete(struct ice_vsi *vsi)\n \n \tstatus = ice_free_vsi(&pf->hw, vsi->idx, ctxt, false, NULL);\n \tif (status)\n-\t\tdev_err(ice_pf_to_dev(pf), \"Failed to delete VSI %i in FW - error: %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_err(ice_pf_to_dev(pf), \"Failed to delete VSI %i in FW - error: %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n \n \tkfree(ctxt);\n }\n@@ -532,8 +532,8 @@ static void ice_vsi_clean_rss_flow_fld(struct ice_vsi *vsi)\n \n \tstatus = ice_rem_vsi_rss_cfg(&pf->hw, vsi->idx);\n \tif (status)\n-\t\tdev_dbg(ice_pf_to_dev(pf), \"ice_rem_vsi_rss_cfg failed for vsi = %d, error = %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_dbg(ice_pf_to_dev(pf), \"ice_rem_vsi_rss_cfg failed for vsi = %d, error = %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n }\n \n /**\n@@ -1204,7 +1204,8 @@ static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi)\n \t\t\t\t vsi->rss_table_size);\n \n \tif (status) {\n-\t\tdev_err(dev, \"set_rss_lut failed, error %d\\n\", status);\n+\t\tdev_err(dev, \"set_rss_lut failed, error %s\\n\",\n+\t\t\tice_stat_str(status));\n \t\terr = -EIO;\n \t\tgoto ice_vsi_cfg_rss_exit;\n \t}\n@@ -1226,7 +1227,8 @@ static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi)\n \tstatus = ice_aq_set_rss_key(&pf->hw, vsi->idx, key);\n \n \tif (status) {\n-\t\tdev_err(dev, \"set_rss_key failed, error %d\\n\", status);\n+\t\tdev_err(dev, \"set_rss_key failed, error %s\\n\",\n+\t\t\tice_stat_str(status));\n \t\terr = -EIO;\n \t}\n \n@@ -1259,8 +1261,8 @@ static void ice_vsi_set_vf_rss_flow_fld(struct ice_vsi *vsi)\n \n \tstatus = ice_add_avf_rss_cfg(&pf->hw, vsi->idx, ICE_DEFAULT_RSS_HENA);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_avf_rss_cfg failed for vsi = %d, error = %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_avf_rss_cfg failed for vsi = %d, error = %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n }\n \n /**\n@@ -1292,57 +1294,57 @@ static void ice_vsi_set_rss_flow_fld(struct ice_vsi *vsi)\n \tstatus = ice_add_rss_cfg(hw, vsi_handle, ICE_FLOW_HASH_IPV4,\n \t\t\t\t ICE_FLOW_SEG_HDR_IPV4);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for ipv4 flow, vsi = %d, error = %d\\n\",\n-\t\t\tvsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for ipv4 flow, vsi = %d, error = %s\\n\",\n+\t\t\tvsi_num, ice_stat_str(status));\n \n \t/* configure RSS for IPv6 with input set IPv6 src/dst */\n \tstatus = ice_add_rss_cfg(hw, vsi_handle, ICE_FLOW_HASH_IPV6,\n \t\t\t\t ICE_FLOW_SEG_HDR_IPV6);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for ipv6 flow, vsi = %d, error = %d\\n\",\n-\t\t\tvsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for ipv6 flow, vsi = %d, error = %s\\n\",\n+\t\t\tvsi_num, ice_stat_str(status));\n \n \t/* configure RSS for tcp4 with input set IP src/dst, TCP src/dst */\n \tstatus = ice_add_rss_cfg(hw, vsi_handle, ICE_HASH_TCP_IPV4,\n \t\t\t\t ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV4);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for tcp4 flow, vsi = %d, error = %d\\n\",\n-\t\t\tvsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for tcp4 flow, vsi = %d, error = %s\\n\",\n+\t\t\tvsi_num, ice_stat_str(status));\n \n \t/* configure RSS for udp4 with input set IP src/dst, UDP src/dst */\n \tstatus = ice_add_rss_cfg(hw, vsi_handle, ICE_HASH_UDP_IPV4,\n \t\t\t\t ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV4);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for udp4 flow, vsi = %d, error = %d\\n\",\n-\t\t\tvsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for udp4 flow, vsi = %d, error = %s\\n\",\n+\t\t\tvsi_num, ice_stat_str(status));\n \n \t/* configure RSS for sctp4 with input set IP src/dst */\n \tstatus = ice_add_rss_cfg(hw, vsi_handle, ICE_FLOW_HASH_IPV4,\n \t\t\t\t ICE_FLOW_SEG_HDR_SCTP | ICE_FLOW_SEG_HDR_IPV4);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for sctp4 flow, vsi = %d, error = %d\\n\",\n-\t\t\tvsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for sctp4 flow, vsi = %d, error = %s\\n\",\n+\t\t\tvsi_num, ice_stat_str(status));\n \n \t/* configure RSS for tcp6 with input set IPv6 src/dst, TCP src/dst */\n \tstatus = ice_add_rss_cfg(hw, vsi_handle, ICE_HASH_TCP_IPV6,\n \t\t\t\t ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV6);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for tcp6 flow, vsi = %d, error = %d\\n\",\n-\t\t\tvsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for tcp6 flow, vsi = %d, error = %s\\n\",\n+\t\t\tvsi_num, ice_stat_str(status));\n \n \t/* configure RSS for udp6 with input set IPv6 src/dst, UDP src/dst */\n \tstatus = ice_add_rss_cfg(hw, vsi_handle, ICE_HASH_UDP_IPV6,\n \t\t\t\t ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV6);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for udp6 flow, vsi = %d, error = %d\\n\",\n-\t\t\tvsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for udp6 flow, vsi = %d, error = %s\\n\",\n+\t\t\tvsi_num, ice_stat_str(status));\n \n \t/* configure RSS for sctp6 with input set IPv6 src/dst */\n \tstatus = ice_add_rss_cfg(hw, vsi_handle, ICE_FLOW_HASH_IPV6,\n \t\t\t\t ICE_FLOW_SEG_HDR_SCTP | ICE_FLOW_SEG_HDR_IPV6);\n \tif (status)\n-\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for sctp6 flow, vsi = %d, error = %d\\n\",\n-\t\t\tvsi_num, status);\n+\t\tdev_dbg(dev, \"ice_add_rss_cfg failed for sctp6 flow, vsi = %d, error = %s\\n\",\n+\t\t\tvsi_num, ice_stat_str(status));\n }\n \n /**\n@@ -1544,11 +1546,11 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid)\n \tif (!status) {\n \t\tvsi->num_vlan--;\n \t} else if (status == ICE_ERR_DOES_NOT_EXIST) {\n-\t\tdev_dbg(dev, \"Failed to remove VLAN %d on VSI %i, it does not exist, status: %d\\n\",\n-\t\t\tvid, vsi->vsi_num, status);\n+\t\tdev_dbg(dev, \"Failed to remove VLAN %d on VSI %i, it does not exist, status: %s\\n\",\n+\t\t\tvid, vsi->vsi_num, ice_stat_str(status));\n \t} else {\n-\t\tdev_err(dev, \"Error removing VLAN %d on vsi %i error: %d\\n\",\n-\t\t\tvid, vsi->vsi_num, status);\n+\t\tdev_err(dev, \"Error removing VLAN %d on vsi %i error: %s\\n\",\n+\t\t\tvid, vsi->vsi_num, ice_stat_str(status));\n \t\terr = -EIO;\n \t}\n \n@@ -1772,8 +1774,9 @@ int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi)\n \n \tstatus = ice_update_vsi(hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for VLAN insert failed, err %d aq_err %d\\n\",\n-\t\t\tstatus, hw->adminq.sq_last_status);\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for VLAN insert failed, err %s aq_err %s\\n\",\n+\t\t\tice_stat_str(status),\n+\t\t\tice_aq_str(hw->adminq.sq_last_status));\n \t\tret = -EIO;\n \t\tgoto out;\n \t}\n@@ -1818,8 +1821,9 @@ int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena)\n \n \tstatus = ice_update_vsi(hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for VLAN strip failed, ena = %d err %d aq_err %d\\n\",\n-\t\t\tena, status, hw->adminq.sq_last_status);\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for VLAN strip failed, ena = %d err %s aq_err %s\\n\",\n+\t\t\tena, ice_stat_str(status),\n+\t\t\tice_aq_str(hw->adminq.sq_last_status));\n \t\tret = -EIO;\n \t\tgoto out;\n \t}\n@@ -1957,9 +1961,10 @@ int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena, bool vlan_promisc)\n \n \tstatus = ice_update_vsi(&pf->hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tnetdev_err(vsi->netdev, \"%sabling VLAN pruning on VSI handle: %d, VSI HW ID: %d failed, err = %d, aq_err = %d\\n\",\n-\t\t\t ena ? \"En\" : \"Dis\", vsi->idx, vsi->vsi_num, status,\n-\t\t\t pf->hw.adminq.sq_last_status);\n+\t\tnetdev_err(vsi->netdev, \"%sabling VLAN pruning on VSI handle: %d, VSI HW ID: %d failed, err = %s, aq_err = %s\\n\",\n+\t\t\t ena ? \"En\" : \"Dis\", vsi->idx, vsi->vsi_num,\n+\t\t\t ice_stat_str(status),\n+\t\t\t ice_aq_str(pf->hw.adminq.sq_last_status));\n \t\tgoto err_out;\n \t}\n \n@@ -2060,8 +2065,8 @@ ice_vsi_add_rem_eth_mac(struct ice_vsi *vsi, bool add_rule)\n \t\tstatus = ice_remove_eth_mac(&pf->hw, &tmp_add_list);\n \n \tif (status)\n-\t\tdev_err(dev, \"Failure Adding or Removing Ethertype on VSI %i error: %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_err(dev, \"Failure Adding or Removing Ethertype on VSI %i error: %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n \n \tice_free_fltr_list(dev, &tmp_add_list);\n }\n@@ -2108,9 +2113,9 @@ void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create)\n \t\tstatus = ice_remove_eth_mac(&pf->hw, &tmp_add_list);\n \n \tif (status)\n-\t\tdev_err(dev, \"Fail %s %s LLDP rule on VSI %i error: %d\\n\",\n+\t\tdev_err(dev, \"Fail %s %s LLDP rule on VSI %i error: %s\\n\",\n \t\t\tcreate ? \"adding\" : \"removing\", tx ? \"TX\" : \"RX\",\n-\t\t\tvsi->vsi_num, status);\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n \n \tice_free_fltr_list(dev, &tmp_add_list);\n }\n@@ -2258,8 +2263,8 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,\n \tstatus = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc,\n \t\t\t\t max_txqs);\n \tif (status) {\n-\t\tdev_err(dev, \"VSI %d failed lan queue config, error %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_err(dev, \"VSI %d failed lan queue config, error %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n \t\tgoto unroll_vector_base;\n \t}\n \n@@ -2864,8 +2869,8 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi)\n \tstatus = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc,\n \t\t\t\t max_txqs);\n \tif (status) {\n-\t\tdev_err(ice_pf_to_dev(pf), \"VSI %d failed lan queue config, error %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_err(ice_pf_to_dev(pf), \"VSI %d failed lan queue config, error %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n \t\tif (init_vsi) {\n \t\t\tret = -EIO;\n \t\t\tgoto err_vectors;\n@@ -2974,8 +2979,8 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc)\n \t\t\t\t max_txqs);\n \n \tif (status) {\n-\t\tdev_err(dev, \"VSI %d failed TC config, error %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_err(dev, \"VSI %d failed TC config, error %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n \t\tret = -EIO;\n \t\tgoto out;\n \t}\n@@ -3129,8 +3134,8 @@ int ice_set_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi)\n \n \tstatus = ice_cfg_dflt_vsi(&vsi->back->hw, vsi->idx, true, ICE_FLTR_RX);\n \tif (status) {\n-\t\tdev_err(dev, \"Failed to set VSI %d as the default forwarding VSI, error %d\\n\",\n-\t\t\tvsi->vsi_num, status);\n+\t\tdev_err(dev, \"Failed to set VSI %d as the default forwarding VSI, error %s\\n\",\n+\t\t\tvsi->vsi_num, ice_stat_str(status));\n \t\treturn -EIO;\n \t}\n \n@@ -3168,8 +3173,8 @@ int ice_clear_dflt_vsi(struct ice_sw *sw)\n \tstatus = ice_cfg_dflt_vsi(&dflt_vsi->back->hw, dflt_vsi->idx, false,\n \t\t\t\t ICE_FLTR_RX);\n \tif (status) {\n-\t\tdev_err(dev, \"Failed to clear the default forwarding VSI %d, error %d\\n\",\n-\t\t\tdflt_vsi->vsi_num, status);\n+\t\tdev_err(dev, \"Failed to clear the default forwarding VSI %d, error %s\\n\",\n+\t\t\tdflt_vsi->vsi_num, ice_stat_str(status));\n \t\treturn -EIO;\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex f6c2dd55553f..13cfdda7df97 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -164,8 +164,8 @@ static int ice_init_mac_fltr(struct ice_pf *pf)\n \t * had an error\n \t */\n \tif (status && vsi->netdev->reg_state == NETREG_REGISTERED) {\n-\t\tdev_err(ice_pf_to_dev(pf), \"Could not add MAC filters error %d. Unregistering device\\n\",\n-\t\t\tstatus);\n+\t\tdev_err(ice_pf_to_dev(pf), \"Could not add MAC filters error %s. Unregistering device\\n\",\n+\t\t\tice_stat_str(status));\n \t\tunregister_netdev(vsi->netdev);\n \t\tfree_netdev(vsi->netdev);\n \t\tvsi->netdev = NULL;\n@@ -1021,8 +1021,8 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)\n \t\tif (ret == ICE_ERR_AQ_NO_WORK)\n \t\t\tbreak;\n \t\tif (ret) {\n-\t\t\tdev_err(dev, \"%s Receive Queue event error %d\\n\", qtype,\n-\t\t\t\tret);\n+\t\t\tdev_err(dev, \"%s Receive Queue event error %s\\n\", qtype,\n+\t\t\t\tice_stat_str(ret));\n \t\t\tbreak;\n \t\t}\n \n@@ -1816,8 +1816,8 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog)\n \tstatus = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc,\n \t\t\t\t max_txqs);\n \tif (status) {\n-\t\tdev_err(dev, \"Failed VSI LAN queue config for XDP, error:%d\\n\",\n-\t\t\tstatus);\n+\t\tdev_err(dev, \"Failed VSI LAN queue config for XDP, error: %s\\n\",\n+\t\t\tice_stat_str(status));\n \t\tgoto clear_xdp_rings;\n \t}\n \tice_vsi_assign_bpf_prog(vsi, prog);\n@@ -3816,8 +3816,8 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)\n \tflags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;\n \tstatus = ice_aq_manage_mac_write(hw, mac, flags, NULL);\n \tif (status) {\n-\t\tnetdev_err(netdev, \"can't set MAC %pM. write to firmware failed error %d\\n\",\n-\t\t\t mac, status);\n+\t\tnetdev_err(netdev, \"can't set MAC %pM. write to firmware failed error %s\\n\",\n+\t\t\t mac, ice_stat_str(status));\n \t}\n \treturn 0;\n }\n@@ -3881,8 +3881,8 @@ ice_set_tx_maxrate(struct net_device *netdev, int queue_index, u32 maxrate)\n \t\tstatus = ice_cfg_q_bw_lmt(vsi->port_info, vsi->idx, tc,\n \t\t\t\t\t q_handle, ICE_MAX_BW, maxrate * 1000);\n \tif (status) {\n-\t\tnetdev_err(netdev, \"Unable to set Tx max rate, error %d\\n\",\n-\t\t\t status);\n+\t\tnetdev_err(netdev, \"Unable to set Tx max rate, error %s\\n\",\n+\t\t\t ice_stat_str(status));\n \t\treturn -EIO;\n \t}\n \n@@ -4680,8 +4680,9 @@ static int ice_vsi_rebuild_by_type(struct ice_pf *pf, enum ice_vsi_type type)\n \t\t/* replay filters for the VSI */\n \t\tstatus = ice_replay_vsi(&pf->hw, vsi->idx);\n \t\tif (status) {\n-\t\t\tdev_err(dev, \"replay VSI failed, status %d, VSI index %d, type %s\\n\",\n-\t\t\t\tstatus, vsi->idx, ice_vsi_type_str(type));\n+\t\t\tdev_err(dev, \"replay VSI failed, status %s, VSI index %d, type %s\\n\",\n+\t\t\t\tice_stat_str(status), vsi->idx,\n+\t\t\t\tice_vsi_type_str(type));\n \t\t\treturn -EIO;\n \t\t}\n \n@@ -4750,7 +4751,8 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)\n \n \tret = ice_init_all_ctrlq(hw);\n \tif (ret) {\n-\t\tdev_err(dev, \"control queues init failed %d\\n\", ret);\n+\t\tdev_err(dev, \"control queues init failed %s\\n\",\n+\t\t\tice_stat_str(ret));\n \t\tgoto err_init_ctrlq;\n \t}\n \n@@ -4766,7 +4768,8 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)\n \n \tret = ice_clear_pf_cfg(hw);\n \tif (ret) {\n-\t\tdev_err(dev, \"clear PF configuration failed %d\\n\", ret);\n+\t\tdev_err(dev, \"clear PF configuration failed %s\\n\",\n+\t\t\tice_stat_str(ret));\n \t\tgoto err_init_ctrlq;\n \t}\n \n@@ -4780,7 +4783,7 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)\n \n \tret = ice_get_caps(hw);\n \tif (ret) {\n-\t\tdev_err(dev, \"ice_get_caps failed %d\\n\", ret);\n+\t\tdev_err(dev, \"ice_get_caps failed %s\\n\", ice_stat_str(ret));\n \t\tgoto err_init_ctrlq;\n \t}\n \n@@ -4830,8 +4833,8 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)\n \t/* tell the firmware we are up */\n \tret = ice_send_version(pf);\n \tif (ret) {\n-\t\tdev_err(dev, \"Rebuild failed due to error sending driver version: %d\\n\",\n-\t\t\tret);\n+\t\tdev_err(dev, \"Rebuild failed due to error sending driver version: %s\\n\",\n+\t\t\tice_stat_str(ret));\n \t\tgoto err_vsi_rebuild;\n \t}\n \n@@ -4957,6 +4960,112 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu)\n \treturn err;\n }\n \n+/**\n+ * ice_aq_str - convert AQ err code to a string\n+ * @aq_err: the AQ error code to convert\n+ */\n+const char *ice_aq_str(enum ice_aq_err aq_err)\n+{\n+\tswitch (aq_err) {\n+\tcase ICE_AQ_RC_OK:\n+\t\treturn \"OK\";\n+\tcase ICE_AQ_RC_EPERM:\n+\t\treturn \"ICE_AQ_RC_EPERM\";\n+\tcase ICE_AQ_RC_ENOENT:\n+\t\treturn \"ICE_AQ_RC_ENOENT\";\n+\tcase ICE_AQ_RC_ENOMEM:\n+\t\treturn \"ICE_AQ_RC_ENOMEM\";\n+\tcase ICE_AQ_RC_EBUSY:\n+\t\treturn \"ICE_AQ_RC_EBUSY\";\n+\tcase ICE_AQ_RC_EEXIST:\n+\t\treturn \"ICE_AQ_RC_EEXIST\";\n+\tcase ICE_AQ_RC_EINVAL:\n+\t\treturn \"ICE_AQ_RC_EINVAL\";\n+\tcase ICE_AQ_RC_ENOSPC:\n+\t\treturn \"ICE_AQ_RC_ENOSPC\";\n+\tcase ICE_AQ_RC_ENOSYS:\n+\t\treturn \"ICE_AQ_RC_ENOSYS\";\n+\tcase ICE_AQ_RC_ENOSEC:\n+\t\treturn \"ICE_AQ_RC_ENOSEC\";\n+\tcase ICE_AQ_RC_EBADSIG:\n+\t\treturn \"ICE_AQ_RC_EBADSIG\";\n+\tcase ICE_AQ_RC_ESVN:\n+\t\treturn \"ICE_AQ_RC_ESVN\";\n+\tcase ICE_AQ_RC_EBADMAN:\n+\t\treturn \"ICE_AQ_RC_EBADMAN\";\n+\tcase ICE_AQ_RC_EBADBUF:\n+\t\treturn \"ICE_AQ_RC_EBADBUF\";\n+\t}\n+\n+\treturn \"ICE_AQ_RC_UNKNOWN\";\n+}\n+\n+/**\n+ * ice_stat_str - convert status err code to a string\n+ * @stat_err: the status error code to convert\n+ */\n+const char *ice_stat_str(enum ice_status stat_err)\n+{\n+\tswitch (stat_err) {\n+\tcase ICE_SUCCESS:\n+\t\treturn \"OK\";\n+\tcase ICE_ERR_PARAM:\n+\t\treturn \"ICE_ERR_PARAM\";\n+\tcase ICE_ERR_NOT_IMPL:\n+\t\treturn \"ICE_ERR_NOT_IMPL\";\n+\tcase ICE_ERR_NOT_READY:\n+\t\treturn \"ICE_ERR_NOT_READY\";\n+\tcase ICE_ERR_NOT_SUPPORTED:\n+\t\treturn \"ICE_ERR_NOT_SUPPORTED\";\n+\tcase ICE_ERR_BAD_PTR:\n+\t\treturn \"ICE_ERR_BAD_PTR\";\n+\tcase ICE_ERR_INVAL_SIZE:\n+\t\treturn \"ICE_ERR_INVAL_SIZE\";\n+\tcase ICE_ERR_DEVICE_NOT_SUPPORTED:\n+\t\treturn \"ICE_ERR_DEVICE_NOT_SUPPORTED\";\n+\tcase ICE_ERR_RESET_FAILED:\n+\t\treturn \"ICE_ERR_RESET_FAILED\";\n+\tcase ICE_ERR_FW_API_VER:\n+\t\treturn \"ICE_ERR_FW_API_VER\";\n+\tcase ICE_ERR_NO_MEMORY:\n+\t\treturn \"ICE_ERR_NO_MEMORY\";\n+\tcase ICE_ERR_CFG:\n+\t\treturn \"ICE_ERR_CFG\";\n+\tcase ICE_ERR_OUT_OF_RANGE:\n+\t\treturn \"ICE_ERR_OUT_OF_RANGE\";\n+\tcase ICE_ERR_ALREADY_EXISTS:\n+\t\treturn \"ICE_ERR_ALREADY_EXISTS\";\n+\tcase ICE_ERR_NVM_CHECKSUM:\n+\t\treturn \"ICE_ERR_NVM_CHECKSUM\";\n+\tcase ICE_ERR_BUF_TOO_SHORT:\n+\t\treturn \"ICE_ERR_BUF_TOO_SHORT\";\n+\tcase ICE_ERR_NVM_BLANK_MODE:\n+\t\treturn \"ICE_ERR_NVM_BLANK_MODE\";\n+\tcase ICE_ERR_IN_USE:\n+\t\treturn \"ICE_ERR_IN_USE\";\n+\tcase ICE_ERR_MAX_LIMIT:\n+\t\treturn \"ICE_ERR_MAX_LIMIT\";\n+\tcase ICE_ERR_RESET_ONGOING:\n+\t\treturn \"ICE_ERR_RESET_ONGOING\";\n+\tcase ICE_ERR_HW_TABLE:\n+\t\treturn \"ICE_ERR_HW_TABLE\";\n+\tcase ICE_ERR_DOES_NOT_EXIST:\n+\t\treturn \"ICE_ERR_DOES_NOT_EXIST\";\n+\tcase ICE_ERR_AQ_ERROR:\n+\t\treturn \"ICE_ERR_AQ_ERROR\";\n+\tcase ICE_ERR_AQ_TIMEOUT:\n+\t\treturn \"ICE_ERR_AQ_TIMEOUT\";\n+\tcase ICE_ERR_AQ_FULL:\n+\t\treturn \"ICE_ERR_AQ_FULL\";\n+\tcase ICE_ERR_AQ_NO_WORK:\n+\t\treturn \"ICE_ERR_AQ_NO_WORK\";\n+\tcase ICE_ERR_AQ_EMPTY:\n+\t\treturn \"ICE_ERR_AQ_EMPTY\";\n+\t}\n+\n+\treturn \"ICE_ERR_UNKNOWN\";\n+}\n+\n /**\n * ice_set_rss - Set RSS keys and lut\n * @vsi: Pointer to VSI structure\n@@ -4981,8 +5090,9 @@ int ice_set_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)\n \t\tstatus = ice_aq_set_rss_key(hw, vsi->idx, buf);\n \n \t\tif (status) {\n-\t\t\tdev_err(dev, \"Cannot set RSS key, err %d aq_err %d\\n\",\n-\t\t\t\tstatus, hw->adminq.rq_last_status);\n+\t\t\tdev_err(dev, \"Cannot set RSS key, err %s aq_err %s\\n\",\n+\t\t\t\tice_stat_str(status),\n+\t\t\t\tice_aq_str(hw->adminq.rq_last_status));\n \t\t\treturn -EIO;\n \t\t}\n \t}\n@@ -4991,8 +5101,9 @@ int ice_set_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)\n \t\tstatus = ice_aq_set_rss_lut(hw, vsi->idx, vsi->rss_lut_type,\n \t\t\t\t\t lut, lut_size);\n \t\tif (status) {\n-\t\t\tdev_err(dev, \"Cannot set RSS lut, err %d aq_err %d\\n\",\n-\t\t\t\tstatus, hw->adminq.rq_last_status);\n+\t\t\tdev_err(dev, \"Cannot set RSS lut, err %s aq_err %s\\n\",\n+\t\t\t\tice_stat_str(status),\n+\t\t\t\tice_aq_str(hw->adminq.rq_last_status));\n \t\t\treturn -EIO;\n \t\t}\n \t}\n@@ -5023,8 +5134,9 @@ int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)\n \n \t\tstatus = ice_aq_get_rss_key(hw, vsi->idx, buf);\n \t\tif (status) {\n-\t\t\tdev_err(dev, \"Cannot get RSS key, err %d aq_err %d\\n\",\n-\t\t\t\tstatus, hw->adminq.rq_last_status);\n+\t\t\tdev_err(dev, \"Cannot get RSS key, err %s aq_err %s\\n\",\n+\t\t\t\tice_stat_str(status),\n+\t\t\t\tice_aq_str(hw->adminq.rq_last_status));\n \t\t\treturn -EIO;\n \t\t}\n \t}\n@@ -5033,8 +5145,9 @@ int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)\n \t\tstatus = ice_aq_get_rss_lut(hw, vsi->idx, vsi->rss_lut_type,\n \t\t\t\t\t lut, lut_size);\n \t\tif (status) {\n-\t\t\tdev_err(dev, \"Cannot get RSS lut, err %d aq_err %d\\n\",\n-\t\t\t\tstatus, hw->adminq.rq_last_status);\n+\t\t\tdev_err(dev, \"Cannot get RSS lut, err %s aq_err %s\\n\",\n+\t\t\t\tice_stat_str(status),\n+\t\t\t\tice_aq_str(hw->adminq.rq_last_status));\n \t\t\treturn -EIO;\n \t\t}\n \t}\n@@ -5101,8 +5214,9 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode)\n \n \tstatus = ice_update_vsi(hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for bridge mode failed, bmode = %d err %d aq_err %d\\n\",\n-\t\t\tbmode, status, hw->adminq.sq_last_status);\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for bridge mode failed, bmode = %d err %s aq_err %s\\n\",\n+\t\t\tbmode, ice_stat_str(status),\n+\t\t\tice_aq_str(hw->adminq.sq_last_status));\n \t\tret = -EIO;\n \t\tgoto out;\n \t}\n@@ -5171,8 +5285,9 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,\n \t\t */\n \t\tstatus = ice_update_sw_rule_bridge_mode(hw);\n \t\tif (status) {\n-\t\t\tnetdev_err(dev, \"switch rule update failed, mode = %d err %d aq_err %d\\n\",\n-\t\t\t\t mode, status, hw->adminq.sq_last_status);\n+\t\t\tnetdev_err(dev, \"switch rule update failed, mode = %d err %s aq_err %s\\n\",\n+\t\t\t\t mode, ice_stat_str(status),\n+\t\t\t\t ice_aq_str(hw->adminq.sq_last_status));\n \t\t\t/* revert hw->evb_veb */\n \t\t\thw->evb_veb = (pf_sw->bridge_mode == BRIDGE_MODE_VEB);\n \t\t\treturn -EIO;\n@@ -5298,8 +5413,8 @@ ice_udp_tunnel_add(struct net_device *netdev, struct udp_tunnel_info *ti)\n \t\tnetdev_info(netdev, \"Max tunneled UDP ports reached, port %d not added\\n\",\n \t\t\t port);\n \telse if (status)\n-\t\tnetdev_err(netdev, \"Error adding UDP tunnel - %d\\n\",\n-\t\t\t status);\n+\t\tnetdev_err(netdev, \"Error adding UDP tunnel - %s\\n\",\n+\t\t\t ice_stat_str(status));\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 8a909b9df342..c8b8741a3b47 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -491,8 +491,9 @@ static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 pvid_info, bool enable)\n \n \tstatus = ice_update_vsi(hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tdev_info(ice_hw_to_dev(hw), \"update VSI for port VLAN failed, err %d aq_err %d\\n\",\n-\t\t\t status, hw->adminq.sq_last_status);\n+\t\tdev_info(ice_hw_to_dev(hw), \"update VSI for port VLAN failed, err %s aq_err %s\\n\",\n+\t\t\t ice_stat_str(status),\n+\t\t\t ice_aq_str(hw->adminq.sq_last_status));\n \t\tret = -EIO;\n \t\tgoto out;\n \t}\n@@ -1634,8 +1635,9 @@ ice_vc_send_msg_to_vf(struct ice_vf *vf, u32 v_opcode,\n \taq_ret = ice_aq_send_msg_to_vf(&pf->hw, vf->vf_id, v_opcode, v_retval,\n \t\t\t\t msg, msglen, NULL);\n \tif (aq_ret && pf->hw.mailboxq.sq_last_status != ICE_AQ_RC_ENOSYS) {\n-\t\tdev_info(dev, \"Unable to send the message to VF %d ret %d aq_err %d\\n\",\n-\t\t\t vf->vf_id, aq_ret, pf->hw.mailboxq.sq_last_status);\n+\t\tdev_info(dev, \"Unable to send the message to VF %d ret %s aq_err %s\\n\",\n+\t\t\t vf->vf_id, ice_stat_str(aq_ret),\n+\t\t\t ice_aq_str(pf->hw.mailboxq.sq_last_status));\n \t\treturn -EIO;\n \t}\n \n@@ -2050,8 +2052,9 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena)\n \n \tstatus = ice_update_vsi(&pf->hw, vf_vsi->idx, ctx, NULL);\n \tif (status) {\n-\t\tdev_err(dev, \"Failed to %sable spoofchk on VF %d VSI %d\\n error %d\\n\",\n-\t\t\tena ? \"en\" : \"dis\", vf->vf_id, vf_vsi->vsi_num, status);\n+\t\tdev_err(dev, \"Failed to %sable spoofchk on VF %d VSI %d\\n error %s\\n\",\n+\t\t\tena ? \"en\" : \"dis\", vf->vf_id, vf_vsi->vsi_num,\n+\t\t\tice_stat_str(status));\n \t\tret = -EIO;\n \t\tgoto out;\n \t}\n@@ -2207,8 +2210,9 @@ static int ice_vc_cfg_promiscuous_mode_msg(struct ice_vf *vf, u8 *msg)\n \t\t */\n \t\tstatus = ice_vf_set_vsi_promisc(vf, vsi, promisc_m, rm_promisc);\n \t\tif (status) {\n-\t\t\tdev_err(dev, \"%sable Tx/Rx filter promiscuous mode on VF-%d failed, error: %d\\n\",\n-\t\t\t\trm_promisc ? \"dis\" : \"en\", vf->vf_id, status);\n+\t\t\tdev_err(dev, \"%sable Tx/Rx filter promiscuous mode on VF-%d failed, error: %s\\n\",\n+\t\t\t\trm_promisc ? \"dis\" : \"en\", vf->vf_id,\n+\t\t\t\tice_stat_str(status));\n \t\t\tv_ret = ice_err_to_virt_err(status);\n \t\t\tgoto error_param;\n \t\t} else {\n@@ -2782,8 +2786,8 @@ ice_vc_add_mac_addr(struct ice_vf *vf, struct ice_vsi *vsi, u8 *mac_addr)\n \t\t\tvf->vf_id);\n \t\treturn -EEXIST;\n \t} else if (status) {\n-\t\tdev_err(dev, \"Failed to add MAC %pM for VF %d\\n, error %d\\n\",\n-\t\t\tmac_addr, vf->vf_id, status);\n+\t\tdev_err(dev, \"Failed to add MAC %pM for VF %d\\n, error %s\\n\",\n+\t\t\tmac_addr, vf->vf_id, ice_stat_str(status));\n \t\treturn -EIO;\n \t}\n \n@@ -2819,8 +2823,8 @@ ice_vc_del_mac_addr(struct ice_vf *vf, struct ice_vsi *vsi, u8 *mac_addr)\n \t\t\tvf->vf_id);\n \t\treturn -ENOENT;\n \t} else if (status) {\n-\t\tdev_err(dev, \"Failed to delete MAC %pM for VF %d, error %d\\n\",\n-\t\t\tmac_addr, vf->vf_id, status);\n+\t\tdev_err(dev, \"Failed to delete MAC %pM for VF %d, error %s\\n\",\n+\t\t\tmac_addr, vf->vf_id, ice_stat_str(status));\n \t\treturn -EIO;\n \t}\n \n", "prefixes": [ "S41", "06/15" ] }