Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/534137/?format=api
{ "id": 534137, "url": "http://patchwork.ozlabs.org/api/patches/534137/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445471784-36024-1-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": "<1445471784-36024-1-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-10-21T23:56:22", "name": "[next,S19,13/15] i40e: rework the functions to configure RSS with similar parameters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "efc6f7a534cc6646a4c24e06f2fc137b8dc46c73", "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/1445471784-36024-1-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/534137/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/534137/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 CEF75141317\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 22 Oct 2015 10:57:03 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id BE00D880E7;\n\tWed, 21 Oct 2015 23:57:01 +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 mTSFMKAq-mgL; Wed, 21 Oct 2015 23:57:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E8FDA87DF6;\n\tWed, 21 Oct 2015 23:57:00 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0C3F71C04C3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 21 Oct 2015 23:57:00 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 071878BEA9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 21 Oct 2015 23:57:00 +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 cz2aVrYqvU4M for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 21 Oct 2015 23:56:58 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C987D88396\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 21 Oct 2015 23:56:58 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga101.fm.intel.com with ESMTP; 21 Oct 2015 16:56:58 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby fmsmga002.fm.intel.com with ESMTP; 21 Oct 2015 16:56:58 -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.20,179,1444719600\"; d=\"scan'208\";a=\"832567008\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 21 Oct 2015 19:56:22 -0400", "Message-Id": "<1445471784-36024-1-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "Cc": "Helin Zhang <helin.zhang@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S19 13/15] i40e: rework the functions\n\tto configure RSS with similar parameters", "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: Helin Zhang <helin.zhang@intel.com>\n\nAdjust the RSS configure functions so that there is a generic way to\nhook to ethtool hooks.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\nChange-ID: If446e34fcfaf1bc3320d9d319829a095b5976e67\n\n---\nTesting-hints: Test with next patch.\n drivers/net/ethernet/intel/i40e/i40e.h | 1 +\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 -\n drivers/net/ethernet/intel/i40e/i40e_main.c | 95 +++++++++++++++++++-------\n 3 files changed, 71 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex ca07a7b..f6b747c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -187,6 +187,7 @@ struct i40e_lump_tracking {\n #define I40E_FDIR_BUFFER_HEAD_ROOM_FOR_ATR (I40E_FDIR_BUFFER_HEAD_ROOM * 4)\n \n #define I40E_HKEY_ARRAY_SIZE ((I40E_PFQF_HKEY_MAX_INDEX + 1) * 4)\n+#define I40E_HLUT_ARRAY_SIZE ((I40E_PFQF_HLUT_MAX_INDEX + 1) * 4)\n \n enum i40e_fd_stat_idx {\n \tI40E_FD_STAT_ATR,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 9c243aa..9d66a00 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -2578,7 +2578,6 @@ static int i40e_set_channels(struct net_device *dev,\n \t\treturn -EINVAL;\n }\n \n-#define I40E_HLUT_ARRAY_SIZE ((I40E_PFQF_HLUT_MAX_INDEX + 1) * 4)\n /**\n * i40e_get_rxfh_key_size - get the RSS hash key size\n * @netdev: network interface device structure\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 26e5ed0..be7fe65 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -55,6 +55,8 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit);\n static int i40e_setup_misc_vector(struct i40e_pf *pf);\n static void i40e_determine_queue_usage(struct i40e_pf *pf);\n static int i40e_setup_pf_filter_control(struct i40e_pf *pf);\n+static void i40e_fill_rss_lut(struct i40e_pf *pf, u8 *lut,\n+\t\t\t u16 rss_table_size, u16 rss_size);\n static void i40e_fdir_sb_setup(struct i40e_pf *pf);\n static int i40e_veb_get_bw_info(struct i40e_veb *veb);\n \n@@ -7817,7 +7819,8 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf)\n * @vsi: vsi structure\n * @seed: RSS hash seed\n **/\n-static int i40e_config_rss_aq(struct i40e_vsi *vsi, const u8 *seed)\n+static int i40e_config_rss_aq(struct i40e_vsi *vsi, const u8 *seed,\n+\t\t\t u8 *lut, u16 lut_size)\n {\n \tstruct i40e_aqc_get_set_rss_key_data rss_key;\n \tstruct i40e_pf *pf = vsi->back;\n@@ -7870,43 +7873,57 @@ static int i40e_vsi_config_rss(struct i40e_vsi *vsi)\n {\n \tu8 seed[I40E_HKEY_ARRAY_SIZE];\n \tstruct i40e_pf *pf = vsi->back;\n+\tu8 *lut;\n+\tint ret;\n+\n+\tif (!(pf->flags & I40E_FLAG_RSS_AQ_CAPABLE))\n+\t\treturn 0;\n+\n+\tlut = kzalloc(vsi->rss_table_size, GFP_KERNEL);\n+\tif (!lut)\n+\t\treturn -ENOMEM;\n \n+\ti40e_fill_rss_lut(pf, lut, vsi->rss_table_size, vsi->rss_size);\n \tnetdev_rss_key_fill((void *)seed, I40E_HKEY_ARRAY_SIZE);\n \tvsi->rss_size = min_t(int, pf->rss_size, vsi->num_queue_pairs);\n+\tret = i40e_config_rss_aq(vsi, seed, lut, vsi->rss_table_size);\n+\tkfree(lut);\n \n-\tif (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE)\n-\t\treturn i40e_config_rss_aq(vsi, seed);\n-\n-\treturn 0;\n+\treturn ret;\n }\n \n /**\n * i40e_config_rss_reg - Prepare for RSS if used\n- * @pf: board private structure\n+ * @vsi: Pointer to vsi structure\n * @seed: RSS hash seed\n+ * @lut: Lookup table\n+ * @lut_size: Lookup table size\n+ *\n+ * Returns 0 on success, negative on failure\n **/\n-static int i40e_config_rss_reg(struct i40e_pf *pf, const u8 *seed)\n+static int i40e_config_rss_reg(struct i40e_vsi *vsi, const u8 *seed,\n+\t\t\t const u8 *lut, u16 lut_size)\n {\n-\tstruct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];\n+\tstruct i40e_pf *pf = vsi->back;\n \tstruct i40e_hw *hw = &pf->hw;\n-\tu32 *seed_dw = (u32 *)seed;\n-\tu32 current_queue = 0;\n-\tu32 lut = 0;\n-\tint i, j;\n+\tu8 i;\n \n \t/* Fill out hash function seed */\n-\tfor (i = 0; i <= I40E_PFQF_HKEY_MAX_INDEX; i++)\n-\t\twr32(hw, I40E_PFQF_HKEY(i), seed_dw[i]);\n+\tif (seed) {\n+\t\tu32 *seed_dw = (u32 *)seed;\n \n-\tfor (i = 0; i <= I40E_PFQF_HLUT_MAX_INDEX; i++) {\n-\t\tlut = 0;\n-\t\tfor (j = 0; j < 4; j++) {\n-\t\t\tif (current_queue == vsi->rss_size)\n-\t\t\t\tcurrent_queue = 0;\n-\t\t\tlut |= ((current_queue) << (8 * j));\n-\t\t\tcurrent_queue++;\n-\t\t}\n-\t\twr32(&pf->hw, I40E_PFQF_HLUT(i), lut);\n+\t\tfor (i = 0; i <= I40E_PFQF_HKEY_MAX_INDEX; i++)\n+\t\t\twr32(hw, I40E_PFQF_HKEY(i), seed_dw[i]);\n+\t}\n+\n+\tif (lut) {\n+\t\tu32 *lut_dw = (u32 *)lut;\n+\n+\t\tif (lut_size != I40E_HLUT_ARRAY_SIZE)\n+\t\t\treturn -EINVAL;\n+\n+\t\tfor (i = 0; i <= I40E_PFQF_HLUT_MAX_INDEX; i++)\n+\t\t\twr32(hw, I40E_PFQF_HLUT(i), lut_dw[i]);\n \t}\n \ti40e_flush(hw);\n \n@@ -7914,6 +7931,22 @@ static int i40e_config_rss_reg(struct i40e_pf *pf, const u8 *seed)\n }\n \n /**\n+ * i40e_fill_rss_lut - Fill the RSS lookup table with default values\n+ * @pf: Pointer to board private structure\n+ * @lut: Lookup table\n+ * @rss_table_size: Lookup table size\n+ * @rss_size: Range of queue number for hashing\n+ */\n+static void i40e_fill_rss_lut(struct i40e_pf *pf, u8 *lut,\n+\t\t\t u16 rss_table_size, u16 rss_size)\n+{\n+\tu16 i;\n+\n+\tfor (i = 0; i < rss_table_size; i++)\n+\t\tlut[i] = i % rss_size;\n+}\n+\n+/**\n * i40e_config_rss - Prepare for RSS if used\n * @pf: board private structure\n **/\n@@ -7921,9 +7954,11 @@ static int i40e_config_rss(struct i40e_pf *pf)\n {\n \tstruct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];\n \tu8 seed[I40E_HKEY_ARRAY_SIZE];\n+\tu8 *lut;\n \tstruct i40e_hw *hw = &pf->hw;\n \tu32 reg_val;\n \tu64 hena;\n+\tint ret;\n \n \tnetdev_rss_key_fill((void *)seed, I40E_HKEY_ARRAY_SIZE);\n \n@@ -7944,10 +7979,20 @@ static int i40e_config_rss(struct i40e_pf *pf)\n \t\t\t(reg_val & ~I40E_PFQF_CTL_0_HASHLUTSIZE_512);\n \twr32(hw, I40E_PFQF_CTL_0, reg_val);\n \n+\tlut = kzalloc(vsi->rss_table_size, GFP_KERNEL);\n+\tif (!lut)\n+\t\treturn -ENOMEM;\n+\n+\ti40e_fill_rss_lut(pf, lut, vsi->rss_table_size, vsi->rss_size);\n+\n \tif (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE)\n-\t\treturn i40e_config_rss_aq(pf->vsi[pf->lan_vsi], seed);\n+\t\tret = i40e_config_rss_aq(vsi, seed, lut, vsi->rss_table_size);\n \telse\n-\t\treturn i40e_config_rss_reg(pf, seed);\n+\t\tret = i40e_config_rss_reg(vsi, seed, lut, vsi->rss_table_size);\n+\n+\tkfree(lut);\n+\n+\treturn ret;\n }\n \n /**\n", "prefixes": [ "next", "S19", "13/15" ] }