Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1165387/?format=api
{ "id": 1165387, "url": "http://patchwork.ozlabs.org/api/patches/1165387/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190920091724.51767-4-alice.michael@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": "<20190920091724.51767-4-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-09-20T09:17:18", "name": "[next,S10,04/10] i40e: Extract detection of HW flags into a function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8e74745da886d07aaf46d889ed38076d72a82fb9", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20190920091724.51767-4-alice.michael@intel.com/mbox/", "series": [ { "id": 131821, "url": "http://patchwork.ozlabs.org/api/series/131821/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=131821", "date": "2019-09-20T09:17:15", "name": "[next,S10,01/10] i40e: Fix for persistent lldp support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/131821/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1165387/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1165387/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\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.136; helo=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 46Zgw52PTrz9sNk\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 21 Sep 2019 03:40:04 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 7FD112010C;\n\tFri, 20 Sep 2019 17:40:02 +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 5Rpev4IhpRG1; Fri, 20 Sep 2019 17:40:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6F24E20401;\n\tFri, 20 Sep 2019 17:40:00 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 47CB21BF2C6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:55 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 44FF420401\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:55 +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 nLolKjCngrr8 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:53 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 1E3B72010C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:52 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t20 Sep 2019 10:39:51 -0700", "from alicemic-1.jf.intel.com ([10.166.17.62])\n\tby fmsmga004.fm.intel.com with ESMTP; 20 Sep 2019 10:39:51 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,529,1559545200\"; d=\"scan'208\";a=\"212635329\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 20 Sep 2019 02:17:18 -0700", "Message-Id": "<20190920091724.51767-4-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190920091724.51767-1-alice.michael@intel.com>", "References": "<20190920091724.51767-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S10 04/10] i40e: Extract detection of\n\tHW flags into a function", "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>", "Cc": "Piotr Azarewicz <piotr.azarewicz@intel.com>", "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: Piotr Azarewicz <piotr.azarewicz@intel.com>\n\nMove code detecting HW flags based on device type and FW API version\ninto a single function.\n\nSigned-off-by: Piotr Azarewicz <piotr.azarewicz@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_adminq.c | 71 +++++++++++++++----\n drivers/net/ethernet/intel/i40e/i40e_common.c | 4 --\n 2 files changed, 58 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\nindex 72c04881d290..9f0a4e92a231 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n@@ -507,6 +507,59 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)\n \treturn ret_code;\n }\n \n+/**\n+ * i40e_set_hw_flags - set HW flags\n+ * @hw: pointer to the hardware structure\n+ **/\n+static void i40e_set_hw_flags(struct i40e_hw *hw)\n+{\n+\tstruct i40e_adminq_info *aq = &hw->aq;\n+\n+\thw->flags = 0;\n+\n+\tswitch (hw->mac.type) {\n+\tcase I40E_MAC_XL710:\n+\t\tif (aq->api_maj_ver > 1 ||\n+\t\t (aq->api_maj_ver == 1 &&\n+\t\t aq->api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710)) {\n+\t\t\thw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;\n+\t\t\thw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;\n+\t\t\t/* The ability to RX (not drop) 802.1ad frames */\n+\t\t\thw->flags |= I40E_HW_FLAG_802_1AD_CAPABLE;\n+\t\t}\n+\t\tbreak;\n+\tcase I40E_MAC_X722:\n+\t\thw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE |\n+\t\t\t I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;\n+\n+\t\tif (aq->api_maj_ver > 1 ||\n+\t\t (aq->api_maj_ver == 1 &&\n+\t\t aq->api_min_ver >= I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722))\n+\t\t\thw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;\n+\t\t/* fall through */\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\n+\t/* Newer versions of firmware require lock when reading the NVM */\n+\tif (aq->api_maj_ver > 1 ||\n+\t (aq->api_maj_ver == 1 &&\n+\t aq->api_min_ver >= 5))\n+\t\thw->flags |= I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;\n+\n+\tif (aq->api_maj_ver > 1 ||\n+\t (aq->api_maj_ver == 1 &&\n+\t aq->api_min_ver >= 8)) {\n+\t\thw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;\n+\t\thw->flags |= I40E_HW_FLAG_DROP_MODE;\n+\t}\n+\n+\tif (aq->api_maj_ver > 1 ||\n+\t (aq->api_maj_ver == 1 &&\n+\t aq->api_min_ver >= 9))\n+\t\thw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED;\n+}\n+\n /**\n * i40e_init_adminq - main initialization routine for Admin Queue\n * @hw: pointer to the hardware structure\n@@ -571,6 +624,11 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw)\n \tif (ret_code != I40E_SUCCESS)\n \t\tgoto init_adminq_free_arq;\n \n+\t/* Some features were introduced in different FW API version\n+\t * for different MAC type.\n+\t */\n+\ti40e_set_hw_flags(hw);\n+\n \t/* get the NVM version info */\n \ti40e_read_nvm_word(hw, I40E_SR_NVM_DEV_STARTER_VERSION,\n \t\t\t &hw->nvm.version);\n@@ -596,25 +654,12 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw)\n \t\thw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;\n \t}\n \n-\t/* Newer versions of firmware require lock when reading the NVM */\n-\tif (hw->aq.api_maj_ver > 1 ||\n-\t (hw->aq.api_maj_ver == 1 &&\n-\t hw->aq.api_min_ver >= 5))\n-\t\thw->flags |= I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;\n-\n \t/* The ability to RX (not drop) 802.1ad frames was added in API 1.7 */\n \tif (hw->aq.api_maj_ver > 1 ||\n \t (hw->aq.api_maj_ver == 1 &&\n \t hw->aq.api_min_ver >= 7))\n \t\thw->flags |= I40E_HW_FLAG_802_1AD_CAPABLE;\n \n-\tif (hw->aq.api_maj_ver > 1 ||\n-\t (hw->aq.api_maj_ver == 1 &&\n-\t hw->aq.api_min_ver >= 8)) {\n-\t\thw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;\n-\t\thw->flags |= I40E_HW_FLAG_DROP_MODE;\n-\t}\n-\n \tif (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {\n \t\tret_code = I40E_ERR_FIRMWARE_API_VERSION;\n \t\tgoto init_adminq_free_arq;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c\nindex f1d67267c983..fe553bb23d7a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c\n@@ -933,10 +933,6 @@ i40e_status i40e_init_shared_code(struct i40e_hw *hw)\n \telse\n \t\thw->pf_id = (u8)(func_rid & 0x7);\n \n-\tif (hw->mac.type == I40E_MAC_X722)\n-\t\thw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE |\n-\t\t\t I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;\n-\n \tstatus = i40e_init_nvm(hw);\n \treturn status;\n }\n", "prefixes": [ "next", "S10", "04/10" ] }