Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/560305/?format=api
{ "id": 560305, "url": "http://patchwork.ozlabs.org/api/patches/560305/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1450823114-29514-4-git-send-email-deepthi.kavalur@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": "<1450823114-29514-4-git-send-email-deepthi.kavalur@intel.com>", "list_archive_url": null, "date": "2015-12-22T22:25:05", "name": "[next,S24,03/12] i40e/i40evf: Fix for UDP/TCP RSS for X722", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "73b53f719b1e5c8d885e02060a33fe340054dd6c", "submitter": { "id": 67654, "url": "http://patchwork.ozlabs.org/api/people/67654/?format=api", "name": "Deepthi Kavalur", "email": "deepthi.kavalur@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/1450823114-29514-4-git-send-email-deepthi.kavalur@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/560305/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/560305/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 EDDDD140307\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 23 Dec 2015 09:25:21 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 4B013958FA;\n\tTue, 22 Dec 2015 22:25:21 +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 DJMoko1R9Uk1; Tue, 22 Dec 2015 22:25:19 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 11D8B958FD;\n\tTue, 22 Dec 2015 22:25:19 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id DC7B11CF45E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 22:25:15 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D7A2990E1E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 22:25:15 +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 fdZKy-lt+1Ha for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 22:25:13 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A1F3E925B9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 22:25:13 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga103.jf.intel.com with ESMTP; 22 Dec 2015 14:25:13 -0800", "from dkavalur-mobl.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.61])\n\tby orsmga002.jf.intel.com with ESMTP; 22 Dec 2015 14:25:13 -0800" ], "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.20,466,1444719600\"; d=\"scan'208\";a=\"877072049\"", "From": "Deepthi Kavalur <deepthi.kavalur@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 22 Dec 2015 14:25:05 -0800", "Message-Id": "<1450823114-29514-4-git-send-email-deepthi.kavalur@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1450823114-29514-1-git-send-email-deepthi.kavalur@intel.com>", "References": "<1450823114-29514-1-git-send-email-deepthi.kavalur@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S24 03/12] i40e/i40evf: Fix for\n\tUDP/TCP RSS for X722", "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: Anjali Singhai Jain <anjali.singhai@intel.com>\n\nThe PCTYPES for the X710 and X722 families are different. This patch\nmakes adjustments for that.\n\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 18 ++++++++++++++\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 +++++\n drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 29 +++++++++++++++++++---\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 8 +++---\n 4 files changed, 54 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 80c3f20..29eb718 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -2169,6 +2169,10 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)\n \t\tcase 0:\n \t\t\treturn -EINVAL;\n \t\tcase (RXH_L4_B_0_1 | RXH_L4_B_2_3):\n+\t\t\tif (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE)\n+\t\t\t\thena |=\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK);\n+\n \t\t\thena |= BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP);\n \t\t\tbreak;\n \t\tdefault:\n@@ -2180,6 +2184,10 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)\n \t\tcase 0:\n \t\t\treturn -EINVAL;\n \t\tcase (RXH_L4_B_0_1 | RXH_L4_B_2_3):\n+\t\t\tif (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE)\n+\t\t\t\thena |=\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK);\n+\n \t\t\thena |= BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP);\n \t\t\tbreak;\n \t\tdefault:\n@@ -2191,6 +2199,11 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)\n \t\tcase 0:\n \t\t\treturn -EINVAL;\n \t\tcase (RXH_L4_B_0_1 | RXH_L4_B_2_3):\n+\t\t\tif (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE)\n+\t\t\t\thena |=\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) |\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP);\n+\n \t\t\thena |= (BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |\n \t\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV4));\n \t\t\tbreak;\n@@ -2203,6 +2216,11 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)\n \t\tcase 0:\n \t\t\treturn -EINVAL;\n \t\tcase (RXH_L4_B_0_1 | RXH_L4_B_2_3):\n+\t\t\tif (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE)\n+\t\t\t\thena |=\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) |\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP);\n+\n \t\t\thena |= (BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |\n \t\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6));\n \t\t\tbreak;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex aa58a49..3cc98b0 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -1213,6 +1213,12 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)\n \t\tvfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_RSS_REG;\n \t}\n \n+\tif (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE) {\n+\t\tif (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)\n+\t\t\tvfres->vf_offload_flags |=\n+\t\t\t\tI40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2;\n+\t}\n+\n \tif (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING)\n \t\tvfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING;\n \ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\nindex 8906785..bd1c272 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n@@ -459,6 +459,7 @@ static int i40evf_set_rss_hash_opt(struct i40evf_adapter *adapter,\n \t\t\t\t struct ethtool_rxnfc *nfc)\n {\n \tstruct i40e_hw *hw = &adapter->hw;\n+\tu32 flags = adapter->vf_res->vf_offload_flags;\n \n \tu64 hena = (u64)rd32(hw, I40E_VFQF_HENA(0)) |\n \t\t ((u64)rd32(hw, I40E_VFQF_HENA(1)) << 32);\n@@ -477,19 +478,34 @@ static int i40evf_set_rss_hash_opt(struct i40evf_adapter *adapter,\n \n \tswitch (nfc->flow_type) {\n \tcase TCP_V4_FLOW:\n-\t\tif (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3))\n+\t\tif (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {\n+\t\t\tif (flags & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)\n+\t\t\t\thena |=\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK);\n+\n \t\t\thena |= BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP);\n-\t\telse\n+\t\t} else {\n \t\t\treturn -EINVAL;\n+\t\t}\n \t\tbreak;\n \tcase TCP_V6_FLOW:\n-\t\tif (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3))\n+\t\tif (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {\n+\t\t\tif (flags & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)\n+\t\t\t\thena |=\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK);\n+\n \t\t\thena |= BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP);\n-\t\telse\n+\t\t} else {\n \t\t\treturn -EINVAL;\n+\t\t}\n \t\tbreak;\n \tcase UDP_V4_FLOW:\n \t\tif (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {\n+\t\t\tif (flags & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)\n+\t\t\t\thena |=\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) |\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP);\n+\n \t\t\thena |= (BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |\n \t\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV4));\n \t\t} else {\n@@ -498,6 +514,11 @@ static int i40evf_set_rss_hash_opt(struct i40evf_adapter *adapter,\n \t\tbreak;\n \tcase UDP_V6_FLOW:\n \t\tif (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {\n+\t\t\tif (flags & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)\n+\t\t\t\thena |=\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) |\n+\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP);\n+\n \t\t\thena |= (BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |\n \t\t\t\t BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6));\n \t\t} else {\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex 2817b54..7bdb9f9 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -1456,7 +1456,11 @@ static int i40evf_init_rss(struct i40evf_adapter *adapter)\n \tint ret;\n \n \t/* Enable PCTYPES for RSS, TCP/UDP with IPv4/IPv6 */\n-\thena = I40E_DEFAULT_RSS_HENA;\n+\tif (adapter->vf_res->vf_offload_flags &\n+\t\t\t\t\tI40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)\n+\t\thena = I40E_DEFAULT_RSS_HENA_EXPANDED;\n+\telse\n+\t\thena = I40E_DEFAULT_RSS_HENA;\n \twr32(hw, I40E_VFQF_HENA(0), (u32)hena);\n \twr32(hw, I40E_VFQF_HENA(1), (u32)(hena >> 32));\n \n@@ -2507,8 +2511,6 @@ static void i40evf_init_task(struct work_struct *work)\n \tif (adapter->vf_res->vf_offload_flags &\n \t\t I40E_VIRTCHNL_VF_OFFLOAD_WB_ON_ITR)\n \t\tadapter->flags |= I40EVF_FLAG_WB_ON_ITR_CAPABLE;\n-\tif (!RSS_AQ(adapter))\n-\t\ti40evf_init_rss(adapter);\n \terr = i40evf_request_misc_irq(adapter);\n \tif (err)\n \t\tgoto err_sw_init;\n", "prefixes": [ "next", "S24", "03/12" ] }