Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1234518/?format=api
{ "id": 1234518, "url": "http://patchwork.ozlabs.org/api/patches/1234518/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200206092013.23388-8-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": "<20200206092013.23388-8-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-02-06T09:20:06", "name": "[S37,v3,08/15] ice: fix and consolidate logging of NVM/firmware version information", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "800ef6a0e78f2194230516c54cb5aa2d893baa24", "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/20200206092013.23388-8-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 157176, "url": "http://patchwork.ozlabs.org/api/series/157176/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=157176", "date": "2020-02-06T09:20:02", "name": "[S37,v3,01/15] ice: Fix DCB rebuild after reset", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/157176/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1234518/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1234518/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.136;\n\thelo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 48D5dD0STZz9sSD\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 7 Feb 2020 04:53:20 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 756FB2206D;\n\tThu, 6 Feb 2020 17:53:18 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 3ngm-O5HVfOu; Thu, 6 Feb 2020 17:53:15 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id CC0ED2202E;\n\tThu, 6 Feb 2020 17:53:15 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9BEAE1BF9B6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:09 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 8D55886938\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:09 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id xd-LYdy2MFXA for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:08 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 9AD078693D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:08 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Feb 2020 09:53:07 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga004.fm.intel.com with ESMTP; 06 Feb 2020 09:53:07 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,410,1574150400\"; d=\"scan'208\";a=\"255160936\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 6 Feb 2020 01:20:06 -0800", "Message-Id": "<20200206092013.23388-8-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200206092013.23388-1-anthony.l.nguyen@intel.com>", "References": "<20200206092013.23388-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S37 v3 08/15] ice: fix and consolidate\n\tlogging of NVM/firmware version information", "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\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<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\t<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: Bruce Allan <bruce.w.allan@intel.com>\n\nLogging the firmware/NVM information during driver load is redundant since\nthat information is also available via ethtool. Move the functionality\nfound in ice_nvm_version_str() directly into ice_get_drvinfo() and remove\ncalling the former and logging that info during driver probe. This also\ngets rid of a bug in ice_nvm_version_str() where it returns a pointer to\na buffer which is free'ed when that function exits.\n\nSigned-off-by: Bruce Allan <bruce.w.allan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 15 +++++++++++++--\n drivers/net/ethernet/intel/ice/ice_lib.c | 19 -------------------\n drivers/net/ethernet/intel/ice/ice_lib.h | 2 --\n drivers/net/ethernet/intel/ice/ice_main.c | 5 -----\n 4 files changed, 13 insertions(+), 28 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 26eca4ce9e2c..7539fd8147de 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -166,13 +166,24 @@ static void\n ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n+\tu8 oem_ver, oem_patch, nvm_ver_hi, nvm_ver_lo;\n \tstruct ice_vsi *vsi = np->vsi;\n \tstruct ice_pf *pf = vsi->back;\n+\tstruct ice_hw *hw = &pf->hw;\n+\tu16 oem_build;\n \n \tstrlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));\n \tstrlcpy(drvinfo->version, ice_drv_ver, sizeof(drvinfo->version));\n-\tstrlcpy(drvinfo->fw_version, ice_nvm_version_str(&pf->hw),\n-\t\tsizeof(drvinfo->fw_version));\n+\n+\t/* Display NVM version (from which the firmware version can be\n+\t * determined) which contains more pertinent information.\n+\t */\n+\tice_get_nvm_version(hw, &oem_ver, &oem_build, &oem_patch,\n+\t\t\t &nvm_ver_hi, &nvm_ver_lo);\n+\tsnprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),\n+\t\t \"%x.%02x 0x%x %d.%d.%d\", nvm_ver_hi, nvm_ver_lo,\n+\t\t hw->nvm.eetrack, oem_ver, oem_build, oem_patch);\n+\n \tstrlcpy(drvinfo->bus_info, pci_name(pf->pdev),\n \t\tsizeof(drvinfo->bus_info));\n \tdrvinfo->n_priv_flags = ICE_PRIV_FLAG_ARRAY_SIZE;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 90efa0e718b4..37ff98da5ca8 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -2940,25 +2940,6 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc)\n }\n #endif /* CONFIG_DCB */\n \n-/**\n- * ice_nvm_version_str - format the NVM version strings\n- * @hw: ptr to the hardware info\n- */\n-char *ice_nvm_version_str(struct ice_hw *hw)\n-{\n-\tu8 oem_ver, oem_patch, ver_hi, ver_lo;\n-\tstatic char buf[ICE_NVM_VER_LEN];\n-\tu16 oem_build;\n-\n-\tice_get_nvm_version(hw, &oem_ver, &oem_build, &oem_patch, &ver_hi,\n-\t\t\t &ver_lo);\n-\n-\tsnprintf(buf, sizeof(buf), \"%x.%02x 0x%x %d.%d.%d\", ver_hi, ver_lo,\n-\t\t hw->nvm.eetrack, oem_ver, oem_build, oem_patch);\n-\n-\treturn buf;\n-}\n-\n /**\n * ice_update_ring_stats - Update ring statistics\n * @ring: ring to update\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h\nindex 85d07fedff93..002fdbdade4f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.h\n@@ -99,8 +99,6 @@ void ice_vsi_cfg_frame_size(struct ice_vsi *vsi);\n \n u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran);\n \n-char *ice_nvm_version_str(struct ice_hw *hw);\n-\n enum ice_status\n ice_vsi_cfg_mac_fltr(struct ice_vsi *vsi, const u8 *macaddr, bool set);\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 809e7bee8f62..f3ca72a19d03 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -3270,11 +3270,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \t\tgoto err_exit_unroll;\n \t}\n \n-\tdev_info(dev, \"firmware %d.%d.%d api %d.%d.%d nvm %s build 0x%08x\\n\",\n-\t\t hw->fw_maj_ver, hw->fw_min_ver, hw->fw_patch,\n-\t\t hw->api_maj_ver, hw->api_min_ver, hw->api_patch,\n-\t\t ice_nvm_version_str(hw), hw->fw_build);\n-\n \tice_request_fw(pf);\n \n \t/* if ice_request_fw fails, ICE_FLAG_ADV_FEATURES bit won't be\n", "prefixes": [ "S37", "v3", "08/15" ] }