Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/523531/?format=api
{ "id": 523531, "url": "http://patchwork.ozlabs.org/api/patches/523531/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1443463964-148204-2-git-send-email-catherine.sullivan@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": "<1443463964-148204-2-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-09-28T18:12:30", "name": "[next,S16,01/15] i40e: generate fewer startup messages", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5ae0e845dec9e4e77923d17eaec793c3326ac38a", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1443463964-148204-2-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/523531/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/523531/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id BC91A1400B7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Sep 2015 04:14:01 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 07BBC954A5;\n\tMon, 28 Sep 2015 18:14:01 +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 KAGOKofHYqBK; Mon, 28 Sep 2015 18:14:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 6D24E9548E;\n\tMon, 28 Sep 2015 18:14:00 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 63B481CE9AE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Sep 2015 18:13:59 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 5FBDE921CF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Sep 2015 18:13:59 +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 IuZda-qbqPTU for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Sep 2015 18:13:58 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A96B7921C4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Sep 2015 18:13:58 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga103.fm.intel.com with ESMTP; 28 Sep 2015 11:13:09 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 28 Sep 2015 11:13:08 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.17,603,1437462000\"; d=\"scan'208\";a=\"569971483\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 28 Sep 2015 14:12:30 -0400", "Message-Id": "<1443463964-148204-2-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1443463964-148204-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1443463964-148204-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S16 01/15] i40e: generate fewer\n\tstartup messages", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "From: Shannon Nelson <shannon.nelson@intel.com>\n\nCut down on the number of startup log entries by putting a couple behind\ndebug flags and combining a couple others into a single line.\n\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: I708089f086308f84d43f8b6f0e8a634a02d058fb\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 4 ++--\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_main.c | 20 ++++++++++++--------\n drivers/net/ethernet/intel/i40e/i40e_ptp.c | 4 ++--\n 4 files changed, 17 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 0ed6506..cb8002f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -584,10 +584,10 @@ struct i40e_device {\n };\n \n /**\n- * i40e_fw_version_str - format the FW and NVM version strings\n+ * i40e_nvm_version_str - format the NVM version strings\n * @hw: ptr to the hardware info\n **/\n-static inline char *i40e_fw_version_str(struct i40e_hw *hw)\n+static inline char *i40e_nvm_version_str(struct i40e_hw *hw)\n {\n \tstatic char buf[32];\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex d6b0788..0d5aecf 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1122,7 +1122,7 @@ static void i40e_get_drvinfo(struct net_device *netdev,\n \tstrlcpy(drvinfo->driver, i40e_driver_name, sizeof(drvinfo->driver));\n \tstrlcpy(drvinfo->version, i40e_driver_version_str,\n \t\tsizeof(drvinfo->version));\n-\tstrlcpy(drvinfo->fw_version, i40e_fw_version_str(&pf->hw),\n+\tstrlcpy(drvinfo->fw_version, i40e_nvm_version_str(&pf->hw),\n \t\tsizeof(drvinfo->fw_version));\n \tstrlcpy(drvinfo->bus_info, pci_name(pf->pdev),\n \t\tsizeof(drvinfo->bus_info));\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex f8401d0..5503763 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -6402,8 +6402,9 @@ static void i40e_config_bridge_mode(struct i40e_veb *veb)\n {\n \tstruct i40e_pf *pf = veb->pf;\n \n-\tdev_info(&pf->pdev->dev, \"enabling bridge mode: %s\\n\",\n-\t\t veb->bridge_mode == BRIDGE_MODE_VEPA ? \"VEPA\" : \"VEB\");\n+\tif (pf->hw.debug_mask & I40E_DEBUG_LAN)\n+\t\tdev_info(&pf->pdev->dev, \"enabling bridge mode: %s\\n\",\n+\t\t\t veb->bridge_mode == BRIDGE_MODE_VEPA ? \"VEPA\" : \"VEB\");\n \tif (veb->bridge_mode & BRIDGE_MODE_VEPA)\n \t\ti40e_disable_pf_switch_lb(pf);\n \telse\n@@ -10133,6 +10134,10 @@ static void i40e_print_features(struct i40e_pf *pf)\n \tif (pf->flags & I40E_FLAG_FCOE_ENABLED)\n \t\tbuf += sprintf(buf, \"FCOE \");\n #endif\n+\tif (pf->flags & I40E_FLAG_VEB_MODE_ENABLED)\n+\t\tbuf += sprintf(buf, \"VEB \");\n+\telse\n+\t\tbuf += sprintf(buf, \"VEPA \");\n \n \tBUG_ON(buf > (string + INFO_STRING_LEN));\n \tdev_info(&pf->pdev->dev, \"%s\\n\", string);\n@@ -10272,13 +10277,12 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tpf->hw.fc.requested_mode = I40E_FC_NONE;\n \n \terr = i40e_init_adminq(hw);\n-\tdev_info(&pdev->dev, \"%s\\n\", i40e_fw_version_str(hw));\n \n-\t/* provide additional fw info, like api and ver */\n-\tdev_info(&pdev->dev, \"fw_version:%d.%d.%05d\\n\",\n-\t\t hw->aq.fw_maj_ver, hw->aq.fw_min_ver, hw->aq.fw_build);\n-\tdev_info(&pdev->dev, \"fw api version:%d.%d\\n\",\n-\t\t hw->aq.api_maj_ver, hw->aq.api_min_ver);\n+\t/* provide nvm, fw, api versions */\n+\tdev_info(&pdev->dev, \"fw %d.%d.%05d api %d.%d nvm %s\\n\",\n+\t\t hw->aq.fw_maj_ver, hw->aq.fw_min_ver, hw->aq.fw_build,\n+\t\t hw->aq.api_maj_ver, hw->aq.api_min_ver,\n+\t\t i40e_nvm_version_str(hw));\n \n \tif (err) {\n \t\tdev_info(&pdev->dev,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c\nindex 552c84e..565ca7c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c\n@@ -674,8 +674,8 @@ void i40e_ptp_init(struct i40e_pf *pf)\n \t\tstruct timespec64 ts;\n \t\tu32 regval;\n \n-\t\tdev_info(&pf->pdev->dev, \"%s: added PHC on %s\\n\", __func__,\n-\t\t\t netdev->name);\n+\t\tif (pf->hw.debug_mask & I40E_DEBUG_LAN)\n+\t\t\tdev_info(&pf->pdev->dev, \"PHC enabled\\n\");\n \t\tpf->flags |= I40E_FLAG_PTP;\n \n \t\t/* Ensure the clocks are running. */\n", "prefixes": [ "next", "S16", "01/15" ] }