Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/658365/?format=api
{ "id": 658365, "url": "http://patchwork.ozlabs.org/api/patches/658365/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/147095231662.4841.672399088639313718.stgit@ahduyck-desk.amr.corp.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": "<147095231662.4841.672399088639313718.stgit@ahduyck-desk.amr.corp.intel.com>", "list_archive_url": null, "date": "2016-08-11T21:51:56", "name": "ixgbe: Force VLNCTRL.VFE to be set in all VMDq paths", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0832e6198304949a17efede14cbf364f18dd752f", "submitter": { "id": 251, "url": "http://patchwork.ozlabs.org/api/people/251/?format=api", "name": "Duyck, Alexander H", "email": "alexander.h.duyck@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/147095231662.4841.672399088639313718.stgit@ahduyck-desk.amr.corp.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/658365/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/658365/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 (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3s9MDg2B8bz9sBm\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 12 Aug 2016 07:52:02 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AD6888A05F;\n\tThu, 11 Aug 2016 21:52:00 +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 JKCA39z5bhKK; Thu, 11 Aug 2016 21:52:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2B71D8A015;\n\tThu, 11 Aug 2016 21:52:00 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 10F871C1722\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 11 Aug 2016 21:51:58 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0D4EE8A5FE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 11 Aug 2016 21:51: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 KZlZY0IBfoWW for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 11 Aug 2016 21:51:57 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3A6808A221\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 11 Aug 2016 21:51:57 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga104.fm.intel.com with ESMTP; 11 Aug 2016 14:51:57 -0700", "from ahduyck-desk.jf.intel.com (HELO\n\tahduyck-desk.amr.corp.intel.com) ([134.134.2.152])\n\tby orsmga001.jf.intel.com with ESMTP; 11 Aug 2016 14:51:56 -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.28,507,1464678000\"; d=\"scan'208\";\n\ta=\"1012867053\"", "From": "Alexander Duyck <alexander.h.duyck@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 11 Aug 2016 14:51:56 -0700", "Message-ID": "<147095231662.4841.672399088639313718.stgit@ahduyck-desk.amr.corp.intel.com>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH] ixgbe: Force VLNCTRL.VFE to be set in all\n\tVMDq paths", "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>", "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": "When I was adding the code for enabling VLAN promiscuous mode with SR-IOV\nenabled I had inadvertently left the VLNCTRL.VFE bit unchanged as I has\nassumed there was code in another path that was setting it when we enabled\nSR-IOV. This wasn't the case and as a result we were just disabling VLAN\nfiltering for all the VFs apparently.\n\nAlso the previous patches were always clearing CFIEN which was always set\nto 0 by the hardware anyway so I am dropping the redundant bit clearing.\n\nFixes: 16369564915a (\"ixgbe: Add support for VLAN promiscuous with SR-IOV\")\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 18 ++++++++++++------\n 1 file changed, 12 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex e06ca55..fa7fa09 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -4102,6 +4102,8 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter)\n \tstruct ixgbe_hw *hw = &adapter->hw;\n \tu32 vlnctrl, i;\n \n+\tvlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);\n+\n \tswitch (hw->mac.type) {\n \tcase ixgbe_mac_82599EB:\n \tcase ixgbe_mac_X540:\n@@ -4114,8 +4116,7 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter)\n \t\t/* fall through */\n \tcase ixgbe_mac_82598EB:\n \t\t/* legacy case, we can just disable VLAN filtering */\n-\t\tvlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);\n-\t\tvlnctrl &= ~(IXGBE_VLNCTRL_VFE | IXGBE_VLNCTRL_CFIEN);\n+\t\tvlnctrl &= ~IXGBE_VLNCTRL_VFE;\n \t\tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);\n \t\treturn;\n \t}\n@@ -4127,6 +4128,10 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter)\n \t/* Set flag so we don't redo unnecessary work */\n \tadapter->flags2 |= IXGBE_FLAG2_VLAN_PROMISC;\n \n+\t/* For VMDq and SR-IOV we must leave VLAN filtering enabled */\n+\tvlnctrl |= IXGBE_VLNCTRL_VFE;\n+\tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);\n+\n \t/* Add PF to all active pools */\n \tfor (i = IXGBE_VLVF_ENTRIES; --i;) {\n \t\tu32 reg_offset = IXGBE_VLVFB(i * 2 + VMDQ_P(0) / 32);\n@@ -4193,6 +4198,11 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter)\n \tstruct ixgbe_hw *hw = &adapter->hw;\n \tu32 vlnctrl, i;\n \n+\t/* Set VLAN filtering to enabled */\n+\tvlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);\n+\tvlnctrl |= IXGBE_VLNCTRL_VFE;\n+\tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);\n+\n \tswitch (hw->mac.type) {\n \tcase ixgbe_mac_82599EB:\n \tcase ixgbe_mac_X540:\n@@ -4204,10 +4214,6 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter)\n \t\t\tbreak;\n \t\t/* fall through */\n \tcase ixgbe_mac_82598EB:\n-\t\tvlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);\n-\t\tvlnctrl &= ~IXGBE_VLNCTRL_CFIEN;\n-\t\tvlnctrl |= IXGBE_VLNCTRL_VFE;\n-\t\tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);\n \t\treturn;\n \t}\n \n", "prefixes": [] }