Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/461893/?format=api
{ "id": 461893, "url": "http://patchwork.ozlabs.org/api/patches/461893/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1429229172-143692-12-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": "<1429229172-143692-12-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-04-17T00:06:08", "name": "[net-next,S4,11/15] i40e/i40evf: Update Flex-10 related device/function capabilities", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5511857a4aaa799b6acccfd7677addfaf4f1c604", "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/1429229172-143692-12-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/461893/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/461893/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 fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id A7B081402A6\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 17 Apr 2015 10:03:26 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id E04D389E8A;\n\tFri, 17 Apr 2015 00:03:25 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 3QU4nOC6GK4F; Fri, 17 Apr 2015 00:03:25 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6A37B89E85;\n\tFri, 17 Apr 2015 00:03:25 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id CAD841C223A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:24 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C68FA89E86\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:24 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 8nM4GYBNueXt for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:24 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4CF6D89E85\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:24 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 16 Apr 2015 17:03:24 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 16 Apr 2015 17:03:23 -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.11,591,1422950400\"; d=\"scan'208\";a=\"481989691\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 16 Apr 2015 20:06:08 -0400", "Message-Id": "<1429229172-143692-12-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1429229172-143692-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1429229172-143692-1-git-send-email-catherine.sullivan@intel.com>", "Cc": "Akeem G Abodunrin <akeem.g.abodunrin@intel.com>,\n\tPawel Orlowski <pawel.orlowski@intel.com>", "Subject": "[Intel-wired-lan] [net-next S4 11/15] i40e/i40evf: Update Flex-10\n\trelated device/function capabilities", "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: Pawel Orlowski <pawel.orlowski@intel.com>\n\nThe Flex10 device/function capability has been upgraded to include\ninformation needed to support Flex-10 configurations. This patch adds new\nfields to the i40e_hw_capabilities structure and updates\ni40e_parse_discover_capabilities functions to extract them from the AQ response.\nNaming convention has changed to use flex10 mode instead of existing mfp_mode_1.\n\nSigned-off-by: Pawel Orlowski <pawel.orlowski@intel.com>\nSigned-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>\nChange-ID: I305dd888866985a30293acb3fb14fa43ca6b79ea\n---\n drivers/net/ethernet/intel/i40e/i40e_common.c | 24 +++++++++++++++++++-----\n drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_type.h | 12 +++++++++++-\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 12 +++++++++++-\n 4 files changed, 42 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c\nindex 0bae22d..6c90d3d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c\n@@ -2391,7 +2391,7 @@ i40e_aq_erase_nvm_exit:\n #define I40E_DEV_FUNC_CAP_MSIX_VF\t0x44\n #define I40E_DEV_FUNC_CAP_FLOW_DIRECTOR\t0x45\n #define I40E_DEV_FUNC_CAP_IEEE_1588\t0x46\n-#define I40E_DEV_FUNC_CAP_MFP_MODE_1\t0xF1\n+#define I40E_DEV_FUNC_CAP_FLEX10\t0xF1\n #define I40E_DEV_FUNC_CAP_CEM\t\t0xF2\n #define I40E_DEV_FUNC_CAP_IWARP\t\t0x51\n #define I40E_DEV_FUNC_CAP_LED\t\t0x61\n@@ -2415,6 +2415,7 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,\n \tstruct i40e_aqc_list_capabilities_element_resp *cap;\n \tu32 valid_functions, num_functions;\n \tu32 number, logical_id, phys_id;\n+\tu8 major_rev;\n \tstruct i40e_hw_capabilities *p;\n \tu32 i = 0;\n \tu16 id;\n@@ -2433,6 +2434,7 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,\n \t\tnumber = le32_to_cpu(cap->number);\n \t\tlogical_id = le32_to_cpu(cap->logical_id);\n \t\tphys_id = le32_to_cpu(cap->phys_id);\n+\t\tmajor_rev = cap->major_rev;\n \n \t\tswitch (id) {\n \t\tcase I40E_DEV_FUNC_CAP_SWITCH_MODE:\n@@ -2507,9 +2509,21 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,\n \t\tcase I40E_DEV_FUNC_CAP_MSIX_VF:\n \t\t\tp->num_msix_vectors_vf = number;\n \t\t\tbreak;\n-\t\tcase I40E_DEV_FUNC_CAP_MFP_MODE_1:\n-\t\t\tif (number == 1)\n-\t\t\t\tp->mfp_mode_1 = true;\n+\t\tcase I40E_DEV_FUNC_CAP_FLEX10:\n+\t\t\tif (major_rev == 1) {\n+\t\t\t\tif (number == 1) {\n+\t\t\t\t\tp->flex10_enable = true;\n+\t\t\t\t\tp->flex10_capable = true;\n+\t\t\t\t}\n+\t\t\t} else {\n+\t\t\t\t/* Capability revision >= 2 */\n+\t\t\t\tif (number & 1)\n+\t\t\t\t\tp->flex10_enable = true;\n+\t\t\t\tif (number & 2)\n+\t\t\t\t\tp->flex10_capable = true;\n+\t\t\t}\n+\t\t\tp->flex10_mode = logical_id;\n+\t\t\tp->flex10_status = phys_id;\n \t\t\tbreak;\n \t\tcase I40E_DEV_FUNC_CAP_CEM:\n \t\t\tif (number == 1)\n@@ -2557,7 +2571,7 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,\n \t/* Software override ensuring FCoE is disabled if npar or mfp\n \t * mode because it is not supported in these modes.\n \t */\n-\tif (p->npar_enable || p->mfp_mode_1)\n+\tif (p->npar_enable || p->flex10_enable)\n \t\tp->fcoe = false;\n \n \t/* count the enabled ports (aka the \"not disabled\" ports) */\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 44e905b..b276793 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -7681,7 +7681,7 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t}\n \n \t/* MFP mode enabled */\n-\tif (pf->hw.func_caps.npar_enable || pf->hw.func_caps.mfp_mode_1) {\n+\tif (pf->hw.func_caps.npar_enable || pf->hw.func_caps.flex10_enable) {\n \t\tpf->flags |= I40E_FLAG_MFP_ENABLED;\n \t\tdev_info(&pf->pdev->dev, \"MFP mode Enabled\\n\");\n \t\tif (i40e_get_npar_bw_setting(pf))\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex 350c5ee..220371e 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -213,7 +213,17 @@ struct i40e_hw_capabilities {\n \tbool dcb;\n \tbool fcoe;\n \tbool iscsi; /* Indicates iSCSI enabled */\n-\tbool mfp_mode_1;\n+\tbool flex10_enable;\n+\tbool flex10_capable;\n+\tu32 flex10_mode;\n+#define I40E_FLEX10_MODE_UNKNOWN\t0x0\n+#define I40E_FLEX10_MODE_DCC\t\t0x1\n+#define I40E_FLEX10_MODE_DCI\t\t0x2\n+\n+\tu32 flex10_status;\n+#define I40E_FLEX10_STATUS_DCC_ERROR\t0x1\n+#define I40E_FLEX10_STATUS_VC_MODE\t0x2\n+\n \tbool mgmt_cem;\n \tbool ieee_1588;\n \tbool iwarp;\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex 068813d..3969c65 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -213,7 +213,17 @@ struct i40e_hw_capabilities {\n \tbool dcb;\n \tbool fcoe;\n \tbool iscsi; /* Indicates iSCSI enabled */\n-\tbool mfp_mode_1;\n+\tbool flex10_enable;\n+\tbool flex10_capable;\n+\tu32 flex10_mode;\n+#define I40E_FLEX10_MODE_UNKNOWN\t0x0\n+#define I40E_FLEX10_MODE_DCC\t\t0x1\n+#define I40E_FLEX10_MODE_DCI\t\t0x2\n+\n+\tu32 flex10_status;\n+#define I40E_FLEX10_STATUS_DCC_ERROR\t0x1\n+#define I40E_FLEX10_STATUS_VC_MODE\t0x2\n+\n \tbool mgmt_cem;\n \tbool ieee_1588;\n \tbool iwarp;\n", "prefixes": [ "net-next", "S4", "11/15" ] }