Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/511351/?format=api
{ "id": 511351, "url": "http://patchwork.ozlabs.org/api/patches/511351/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1440690163-128213-10-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": "<1440690163-128213-10-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-27T15:42:37", "name": "[next,S12,09/15] i40e/i40evf: Store CEE DCBX DesiredCfg and RemoteCfg", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7442ca9fef21dd1f320c7665986a81b679350f78", "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/1440690163-128213-10-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/511351/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/511351/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 A3CBE1401F0\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 28 Aug 2015 01:41:59 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id F17EE95178;\n\tThu, 27 Aug 2015 15:41:58 +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 fQt+MS5erDTH; Thu, 27 Aug 2015 15:41:56 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B3A66951A2;\n\tThu, 27 Aug 2015 15:41:56 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id C401D1C11E9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 27 Aug 2015 15:41:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id BEC0891D18\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 27 Aug 2015 15:41:54 +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 i83cpwXJkCPz for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 27 Aug 2015 15:41:54 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id EF81F91D13\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 27 Aug 2015 15:41:53 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga102.fm.intel.com with ESMTP; 27 Aug 2015 08:41:53 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga003.jf.intel.com with ESMTP; 27 Aug 2015 08:41:48 -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,422,1437462000\"; d=\"scan'208\";a=\"633370257\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 27 Aug 2015 11:42:37 -0400", "Message-Id": "<1440690163-128213-10-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1440690163-128213-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1440690163-128213-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S12 09/15] i40e/i40evf: Store CEE\n\tDCBX DesiredCfg and RemoteCfg", "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: Neerav Parikh <neerav.parikh@intel.com>\n\nThis patch adds capability to query and store the CEE DCBX DesiredCfg\nand RemoteCfg data from the LLDP MIB.\nAdded new member \"desired_dcbx_config\" in the i40e_hw data structure\nto hold CEE only DesiredCfg data.\n\nSigned-off-by: Neerav Parikh <neerav.parikh@intel.com>\nChange-ID: I19c550369594384eaff4cc63e690ca740231195d\n---\n drivers/net/ethernet/intel/i40e/i40e_dcb.c | 44 ++++++++++++++++++++++-----\n drivers/net/ethernet/intel/i40e/i40e_type.h | 5 +--\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 5 +--\n 3 files changed, 42 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\nindex 89e60e3..fbec7d7 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n@@ -762,6 +762,36 @@ static void i40e_cee_to_dcb_config(\n }\n \n /**\n+ * i40e_get_ieee_dcb_config\n+ * @hw: pointer to the hw struct\n+ *\n+ * Get IEEE mode DCB configuration from the Firmware\n+ **/\n+static i40e_status i40e_get_ieee_dcb_config(struct i40e_hw *hw)\n+{\n+\ti40e_status ret = 0;\n+\n+\t/* IEEE mode */\n+\thw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_IEEE;\n+\t/* Get Local DCB Config */\n+\tret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_LOCAL, 0,\n+\t\t\t\t &hw->local_dcbx_config);\n+\tif (ret)\n+\t\tgoto out;\n+\n+\t/* Get Remote DCB Config */\n+\tret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_REMOTE,\n+\t\t\t\t I40E_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE,\n+\t\t\t\t &hw->remote_dcbx_config);\n+\t/* Don't treat ENOENT as an error for Remote MIBs */\n+\tif (hw->aq.asq_last_status == I40E_AQ_RC_ENOENT)\n+\t\tret = 0;\n+\n+out:\n+\treturn ret;\n+}\n+\n+/**\n * i40e_get_dcb_config\n * @hw: pointer to the hw struct\n *\n@@ -776,7 +806,7 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)\n \t/* If Firmware version < v4.33 IEEE only */\n \tif (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) ||\n \t (hw->aq.fw_maj_ver < 4))\n-\t\tgoto ieee;\n+\t\treturn i40e_get_ieee_dcb_config(hw);\n \n \t/* If Firmware version == v4.33 use old CEE struct */\n \tif ((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver == 33)) {\n@@ -805,16 +835,14 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)\n \n \t/* CEE mode not enabled try querying IEEE data */\n \tif (hw->aq.asq_last_status == I40E_AQ_RC_ENOENT)\n-\t\tgoto ieee;\n-\telse\n+\t\treturn i40e_get_ieee_dcb_config(hw);\n+\n+\tif (ret)\n \t\tgoto out;\n \n-ieee:\n-\t/* IEEE mode */\n-\thw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_IEEE;\n-\t/* Get Local DCB Config */\n+\t/* Get CEE DCB Desired Config */\n \tret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_LOCAL, 0,\n-\t\t\t\t &hw->local_dcbx_config);\n+\t\t\t\t &hw->desired_dcbx_config);\n \tif (ret)\n \t\tgoto out;\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex f45f372..b1ee6ce 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -502,8 +502,9 @@ struct i40e_hw {\n \tu16 dcbx_status;\n \n \t/* DCBX info */\n-\tstruct i40e_dcbx_config local_dcbx_config;\n-\tstruct i40e_dcbx_config remote_dcbx_config;\n+\tstruct i40e_dcbx_config local_dcbx_config; /* Oper/Local Cfg */\n+\tstruct i40e_dcbx_config remote_dcbx_config; /* Peer Cfg */\n+\tstruct i40e_dcbx_config desired_dcbx_config; /* CEE Desired Cfg */\n \n \t/* debug mask */\n \tu32 debug_mask;\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex 43782ed..919516a 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -496,8 +496,9 @@ struct i40e_hw {\n \tu16 dcbx_status;\n \n \t/* DCBX info */\n-\tstruct i40e_dcbx_config local_dcbx_config;\n-\tstruct i40e_dcbx_config remote_dcbx_config;\n+\tstruct i40e_dcbx_config local_dcbx_config; /* Oper/Local Cfg */\n+\tstruct i40e_dcbx_config remote_dcbx_config; /* Peer Cfg */\n+\tstruct i40e_dcbx_config desired_dcbx_config; /* CEE Desired Cfg */\n \n \t/* debug mask */\n \tu32 debug_mask;\n", "prefixes": [ "next", "S12", "09/15" ] }