Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/955594/?format=api
{ "id": 955594, "url": "http://patchwork.ozlabs.org/api/patches/955594/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180809132903.22819-9-anirudh.venkataramanan@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": "<20180809132903.22819-9-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-08-09T13:28:58", "name": "[v4,08/13] ice: Set VLAN flags correctly", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2b52936a73f64069bdf5dcec6e90f777094b3d89", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20180809132903.22819-9-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 60077, "url": "http://patchwork.ozlabs.org/api/series/60077/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=60077", "date": "2018-08-09T13:28:50", "name": "Bug fixes for ice", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/60077/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/955594/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/955594/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.137; helo=fraxinus.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 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 41mTcr09Kbz9s7t\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 9 Aug 2018 23:29:31 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2E90C86741;\n\tThu, 9 Aug 2018 13:29:30 +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 Db3sB8t9CEFp; Thu, 9 Aug 2018 13:29:28 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7EB0A86692;\n\tThu, 9 Aug 2018 13:29:28 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id E103A1C3F93\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:26 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id DD35629438\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:26 +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 siElkN6GYHZu for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:26 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 353C4240C4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:26 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t09 Aug 2018 06:29:25 -0700", "from kyungmin-mobl.amr.corp.intel.com (HELO\n\tavenkata-mobl4.localdomain) ([10.254.101.153])\n\tby orsmga004.jf.intel.com with ESMTP; 09 Aug 2018 06:29:24 -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.53,215,1531810800\"; d=\"scan'208\";a=\"223273568\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 9 Aug 2018 06:28:58 -0700", "Message-Id": "<20180809132903.22819-9-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20180809132903.22819-1-anirudh.venkataramanan@intel.com>", "References": "<20180809132903.22819-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v4 08/13] ice: Set VLAN flags correctly", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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>", "MIME-Version": "1.0", "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: Brett Creeley <brett.creeley@intel.com>\n\nIn the struct ice_aqc_vsi_props the field port_vlan_flags is an\noverloaded term because it is used for both port VLANs (PVLANs) and\nregular VLANs. This is an issue and is very confusing especially when\ndealing with VFs because normal VLANs and port VLANs are not the same.\nTo fix this the field was renamed to vlan_flags and all of the #define's\nlabeled *_PVLAN_* were renamed to *_VLAN_* if they are not specific to\nport VLANs.\n\nAlso in ice_vsi_manage_vlan_stripping, set the ICE_AQ_VSI_VLAN_MODE_ALL\nbit to allow the driver to add a VLAN tag to all packets it sends.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n .../net/ethernet/intel/ice/ice_adminq_cmd.h | 24 +++++++-------\n drivers/net/ethernet/intel/ice/ice_main.c | 31 +++++++++++--------\n 2 files changed, 30 insertions(+), 25 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex 6d3e11659ba5..a0614f472658 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -329,19 +329,19 @@ struct ice_aqc_vsi_props {\n \t/* VLAN section */\n \t__le16 pvid; /* VLANS include priority bits */\n \tu8 pvlan_reserved[2];\n-\tu8 port_vlan_flags;\n-#define ICE_AQ_VSI_PVLAN_MODE_S\t0\n-#define ICE_AQ_VSI_PVLAN_MODE_M\t(0x3 << ICE_AQ_VSI_PVLAN_MODE_S)\n-#define ICE_AQ_VSI_PVLAN_MODE_UNTAGGED\t0x1\n-#define ICE_AQ_VSI_PVLAN_MODE_TAGGED\t0x2\n-#define ICE_AQ_VSI_PVLAN_MODE_ALL\t0x3\n+\tu8 vlan_flags;\n+#define ICE_AQ_VSI_VLAN_MODE_S\t0\n+#define ICE_AQ_VSI_VLAN_MODE_M\t(0x3 << ICE_AQ_VSI_VLAN_MODE_S)\n+#define ICE_AQ_VSI_VLAN_MODE_UNTAGGED\t0x1\n+#define ICE_AQ_VSI_VLAN_MODE_TAGGED\t0x2\n+#define ICE_AQ_VSI_VLAN_MODE_ALL\t0x3\n #define ICE_AQ_VSI_PVLAN_INSERT_PVID\tBIT(2)\n-#define ICE_AQ_VSI_PVLAN_EMOD_S\t3\n-#define ICE_AQ_VSI_PVLAN_EMOD_M\t(0x3 << ICE_AQ_VSI_PVLAN_EMOD_S)\n-#define ICE_AQ_VSI_PVLAN_EMOD_STR_BOTH\t(0x0 << ICE_AQ_VSI_PVLAN_EMOD_S)\n-#define ICE_AQ_VSI_PVLAN_EMOD_STR_UP\t(0x1 << ICE_AQ_VSI_PVLAN_EMOD_S)\n-#define ICE_AQ_VSI_PVLAN_EMOD_STR\t(0x2 << ICE_AQ_VSI_PVLAN_EMOD_S)\n-#define ICE_AQ_VSI_PVLAN_EMOD_NOTHING\t(0x3 << ICE_AQ_VSI_PVLAN_EMOD_S)\n+#define ICE_AQ_VSI_VLAN_EMOD_S\t\t3\n+#define ICE_AQ_VSI_VLAN_EMOD_M\t\t(0x3 << ICE_AQ_VSI_VLAN_EMOD_S)\n+#define ICE_AQ_VSI_VLAN_EMOD_STR_BOTH\t(0x0 << ICE_AQ_VSI_VLAN_EMOD_S)\n+#define ICE_AQ_VSI_VLAN_EMOD_STR_UP\t(0x1 << ICE_AQ_VSI_VLAN_EMOD_S)\n+#define ICE_AQ_VSI_VLAN_EMOD_STR\t(0x2 << ICE_AQ_VSI_VLAN_EMOD_S)\n+#define ICE_AQ_VSI_VLAN_EMOD_NOTHING\t(0x3 << ICE_AQ_VSI_VLAN_EMOD_S)\n \tu8 pvlan_reserved2[3];\n \t/* ingress egress up sections */\n \t__le32 ingress_table; /* bitmap, 3 bits per up */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 3eff1d2d1543..68003fad33d1 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -1367,13 +1367,15 @@ static void ice_set_dflt_vsi_ctx(struct ice_vsi_ctx *ctxt)\n \tctxt->info.sw_flags = ICE_AQ_VSI_SW_FLAG_SRC_PRUNE;\n \t/* Traffic from VSI can be sent to LAN */\n \tctxt->info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA;\n-\t/* By default bits 3 and 4 in port_vlan_flags are 0's which results in\n-\t * legacy behavior (show VLAN, DEI, and UP) in descriptor. Also, allow\n-\t * all packets untagged/tagged.\n+\n+\t/* By default bits 3 and 4 in vlan_flags are 0's which results in legacy\n+\t * behavior (show VLAN, DEI, and UP) in descriptor. Also, allow all\n+\t * packets untagged/tagged.\n \t */\n-\tctxt->info.port_vlan_flags = ((ICE_AQ_VSI_PVLAN_MODE_ALL &\n-\t\t\t\t ICE_AQ_VSI_PVLAN_MODE_M) >>\n-\t\t\t\t ICE_AQ_VSI_PVLAN_MODE_S);\n+\tctxt->info.vlan_flags = ((ICE_AQ_VSI_VLAN_MODE_ALL &\n+\t\t\t\t ICE_AQ_VSI_VLAN_MODE_M) >>\n+\t\t\t\t ICE_AQ_VSI_VLAN_MODE_S);\n+\n \t/* Have 1:1 UP mapping for both ingress/egress tables */\n \ttable |= ICE_UP_TABLE_TRANSLATE(0, 0);\n \ttable |= ICE_UP_TABLE_TRANSLATE(1, 1);\n@@ -3732,10 +3734,10 @@ static int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi)\n \tenum ice_status status;\n \n \t/* Here we are configuring the VSI to let the driver add VLAN tags by\n-\t * setting port_vlan_flags to ICE_AQ_VSI_PVLAN_MODE_ALL. The actual VLAN\n-\t * tag insertion happens in the Tx hot path, in ice_tx_map.\n+\t * setting vlan_flags to ICE_AQ_VSI_VLAN_MODE_ALL. The actual VLAN tag\n+\t * insertion happens in the Tx hot path, in ice_tx_map.\n \t */\n-\tctxt.info.port_vlan_flags = ICE_AQ_VSI_PVLAN_MODE_ALL;\n+\tctxt.info.vlan_flags = ICE_AQ_VSI_VLAN_MODE_ALL;\n \n \tctxt.info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID);\n \tctxt.vsi_num = vsi->vsi_num;\n@@ -3747,7 +3749,7 @@ static int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi)\n \t\treturn -EIO;\n \t}\n \n-\tvsi->info.port_vlan_flags = ctxt.info.port_vlan_flags;\n+\tvsi->info.vlan_flags = ctxt.info.vlan_flags;\n \treturn 0;\n }\n \n@@ -3769,12 +3771,15 @@ static int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena)\n \t */\n \tif (ena) {\n \t\t/* Strip VLAN tag from Rx packet and put it in the desc */\n-\t\tctxt.info.port_vlan_flags = ICE_AQ_VSI_PVLAN_EMOD_STR_BOTH;\n+\t\tctxt.info.vlan_flags = ICE_AQ_VSI_VLAN_EMOD_STR_BOTH;\n \t} else {\n \t\t/* Disable stripping. Leave tag in packet */\n-\t\tctxt.info.port_vlan_flags = ICE_AQ_VSI_PVLAN_EMOD_NOTHING;\n+\t\tctxt.info.vlan_flags = ICE_AQ_VSI_VLAN_EMOD_NOTHING;\n \t}\n \n+\t/* Allow all packets untagged/tagged */\n+\tctxt.info.vlan_flags |= ICE_AQ_VSI_VLAN_MODE_ALL;\n+\n \tctxt.info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID);\n \tctxt.vsi_num = vsi->vsi_num;\n \n@@ -3785,7 +3790,7 @@ static int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena)\n \t\treturn -EIO;\n \t}\n \n-\tvsi->info.port_vlan_flags = ctxt.info.port_vlan_flags;\n+\tvsi->info.vlan_flags = ctxt.info.vlan_flags;\n \treturn 0;\n }\n \n", "prefixes": [ "v4", "08/13" ] }