Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/750534/?format=api
{ "id": 750534, "url": "http://patchwork.ozlabs.org/api/patches/750534/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170413084555.6962-4-alice.michael@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": "<20170413084555.6962-4-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-04-13T08:45:47", "name": "[next,S70,04/12] i40e: factor out queue control from i40e_vsi_control_(tx|rx)", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "bf7f2dc99d6a435ede072bebfa626ff08628cea0", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20170413084555.6962-4-alice.michael@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/750534/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/750534/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\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 3w3mvX30DXz9s8Q\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 14 Apr 2017 02:48:40 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 072EE8A688;\n\tThu, 13 Apr 2017 16:48:39 +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 0e2RvwzxMdu8; Thu, 13 Apr 2017 16:48:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B9A4D8A689;\n\tThu, 13 Apr 2017 16:48:36 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5AC631BFE90\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 16:48:32 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 540E489C9E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 16:48:32 +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 ogMEwXPFYMYR for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 16:48:30 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 1C21E89BF3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 16:48:30 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t13 Apr 2017 09:48:28 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby orsmga002.jf.intel.com with ESMTP; 13 Apr 2017 09:48:28 -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.37,195,1488873600\"; d=\"scan'208\";a=\"73711318\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Thu, 13 Apr 2017 04:45:47 -0400", "Message-Id": "<20170413084555.6962-4-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170413084555.6962-1-alice.michael@intel.com>", "References": "<20170413084555.6962-1-alice.michael@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S70 04/12] i40e: factor out queue\n\tcontrol from i40e_vsi_control_(tx|rx)", "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: Jacob Keller <jacob.e.keller@intel.com>\n\nA future patch will need to be able to handle controlling queues without\nwaiting until all VSIs are handled. Factor out the direct queue\nmodification so that we can easily re-use this code. The result is also\na bit easier to read since we don't embed multiple single-letter loop\ncounters.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: Id923cbfa43127b1c24d8ed4f809b1012c736d9ac\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 139 ++++++++++++++++++----------\n 1 file changed, 89 insertions(+), 50 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 1c06693..ebf2ad4 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -3919,6 +3919,8 @@ static void i40e_netpoll(struct net_device *netdev)\n }\n #endif\n \n+#define I40E_QTX_ENA_WAIT_COUNT 50\n+\n /**\n * i40e_pf_txq_wait - Wait for a PF's Tx queue to be enabled or disabled\n * @pf: the PF being configured\n@@ -3949,6 +3951,50 @@ static int i40e_pf_txq_wait(struct i40e_pf *pf, int pf_q, bool enable)\n }\n \n /**\n+ * i40e_control_tx_q - Start or stop a particular Tx queue\n+ * @pf: the PF structure\n+ * @pf_q: the PF queue to configure\n+ * @enable: start or stop the queue\n+ *\n+ * This function enables or disables a single queue. Note that any delay\n+ * required after the operation is expected to be handled by the caller of\n+ * this function.\n+ **/\n+static void i40e_control_tx_q(struct i40e_pf *pf, int pf_q, bool enable)\n+{\n+\tstruct i40e_hw *hw = &pf->hw;\n+\tu32 tx_reg;\n+\tint i;\n+\n+\t/* warn the TX unit of coming changes */\n+\ti40e_pre_tx_queue_cfg(&pf->hw, pf_q, enable);\n+\tif (!enable)\n+\t\tusleep_range(10, 20);\n+\n+\tfor (i = 0; i < I40E_QTX_ENA_WAIT_COUNT; i++) {\n+\t\ttx_reg = rd32(hw, I40E_QTX_ENA(pf_q));\n+\t\tif (((tx_reg >> I40E_QTX_ENA_QENA_REQ_SHIFT) & 1) ==\n+\t\t ((tx_reg >> I40E_QTX_ENA_QENA_STAT_SHIFT) & 1))\n+\t\t\tbreak;\n+\t\tusleep_range(1000, 2000);\n+\t}\n+\n+\t/* Skip if the queue is already in the requested state */\n+\tif (enable == !!(tx_reg & I40E_QTX_ENA_QENA_STAT_MASK))\n+\t\treturn;\n+\n+\t/* turn on/off the queue */\n+\tif (enable) {\n+\t\twr32(hw, I40E_QTX_HEAD(pf_q), 0);\n+\t\ttx_reg |= I40E_QTX_ENA_QENA_REQ_MASK;\n+\t} else {\n+\t\ttx_reg &= ~I40E_QTX_ENA_QENA_REQ_MASK;\n+\t}\n+\n+\twr32(hw, I40E_QTX_ENA(pf_q), tx_reg);\n+}\n+\n+/**\n * i40e_vsi_control_tx - Start or stop a VSI's rings\n * @vsi: the VSI being configured\n * @enable: start or stop the rings\n@@ -3956,39 +4002,13 @@ static int i40e_pf_txq_wait(struct i40e_pf *pf, int pf_q, bool enable)\n static int i40e_vsi_control_tx(struct i40e_vsi *vsi, bool enable)\n {\n \tstruct i40e_pf *pf = vsi->back;\n-\tstruct i40e_hw *hw = &pf->hw;\n-\tint i, j, pf_q, ret = 0;\n-\tu32 tx_reg;\n+\tint i, pf_q, ret = 0;\n \n \tpf_q = vsi->base_queue;\n \tfor (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) {\n+\t\ti40e_control_tx_q(pf, pf_q, enable);\n \n-\t\t/* warn the TX unit of coming changes */\n-\t\ti40e_pre_tx_queue_cfg(&pf->hw, pf_q, enable);\n-\t\tif (!enable)\n-\t\t\tusleep_range(10, 20);\n-\n-\t\tfor (j = 0; j < 50; j++) {\n-\t\t\ttx_reg = rd32(hw, I40E_QTX_ENA(pf_q));\n-\t\t\tif (((tx_reg >> I40E_QTX_ENA_QENA_REQ_SHIFT) & 1) ==\n-\t\t\t ((tx_reg >> I40E_QTX_ENA_QENA_STAT_SHIFT) & 1))\n-\t\t\t\tbreak;\n-\t\t\tusleep_range(1000, 2000);\n-\t\t}\n-\t\t/* Skip if the queue is already in the requested state */\n-\t\tif (enable == !!(tx_reg & I40E_QTX_ENA_QENA_STAT_MASK))\n-\t\t\tcontinue;\n-\n-\t\t/* turn on/off the queue */\n-\t\tif (enable) {\n-\t\t\twr32(hw, I40E_QTX_HEAD(pf_q), 0);\n-\t\t\ttx_reg |= I40E_QTX_ENA_QENA_REQ_MASK;\n-\t\t} else {\n-\t\t\ttx_reg &= ~I40E_QTX_ENA_QENA_REQ_MASK;\n-\t\t}\n-\n-\t\twr32(hw, I40E_QTX_ENA(pf_q), tx_reg);\n-\t\t/* No waiting for the Tx queue to disable */\n+\t\t/* Don't wait to disable when port Tx is suspended */\n \t\tif (!enable && test_bit(__I40E_PORT_TX_SUSPENDED, &pf->state))\n \t\t\tcontinue;\n \n@@ -4035,6 +4055,43 @@ static int i40e_pf_rxq_wait(struct i40e_pf *pf, int pf_q, bool enable)\n }\n \n /**\n+ * i40e_control_rx_q - Start or stop a particular Rx queue\n+ * @pf: the PF structure\n+ * @pf_q: the PF queue to configure\n+ * @enable: start or stop the queue\n+ *\n+ * This function enables or disables a single queue. Note that any delay\n+ * required after the operation is expected to be handled by the caller of\n+ * this function.\n+ **/\n+static void i40e_control_rx_q(struct i40e_pf *pf, int pf_q, bool enable)\n+{\n+\tstruct i40e_hw *hw = &pf->hw;\n+\tu32 rx_reg;\n+\tint i;\n+\n+\tfor (i = 0; i < I40E_QTX_ENA_WAIT_COUNT; i++) {\n+\t\trx_reg = rd32(hw, I40E_QRX_ENA(pf_q));\n+\t\tif (((rx_reg >> I40E_QRX_ENA_QENA_REQ_SHIFT) & 1) ==\n+\t\t ((rx_reg >> I40E_QRX_ENA_QENA_STAT_SHIFT) & 1))\n+\t\t\tbreak;\n+\t\tusleep_range(1000, 2000);\n+\t}\n+\n+\t/* Skip if the queue is already in the requested state */\n+\tif (enable == !!(rx_reg & I40E_QRX_ENA_QENA_STAT_MASK))\n+\t\treturn;\n+\n+\t/* turn on/off the queue */\n+\tif (enable)\n+\t\trx_reg |= I40E_QRX_ENA_QENA_REQ_MASK;\n+\telse\n+\t\trx_reg &= ~I40E_QRX_ENA_QENA_REQ_MASK;\n+\n+\twr32(hw, I40E_QRX_ENA(pf_q), rx_reg);\n+}\n+\n+/**\n * i40e_vsi_control_rx - Start or stop a VSI's rings\n * @vsi: the VSI being configured\n * @enable: start or stop the rings\n@@ -4042,31 +4099,13 @@ static int i40e_pf_rxq_wait(struct i40e_pf *pf, int pf_q, bool enable)\n static int i40e_vsi_control_rx(struct i40e_vsi *vsi, bool enable)\n {\n \tstruct i40e_pf *pf = vsi->back;\n-\tstruct i40e_hw *hw = &pf->hw;\n-\tint i, j, pf_q, ret = 0;\n-\tu32 rx_reg;\n+\tint i, pf_q, ret = 0;\n \n \tpf_q = vsi->base_queue;\n \tfor (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) {\n-\t\tfor (j = 0; j < 50; j++) {\n-\t\t\trx_reg = rd32(hw, I40E_QRX_ENA(pf_q));\n-\t\t\tif (((rx_reg >> I40E_QRX_ENA_QENA_REQ_SHIFT) & 1) ==\n-\t\t\t ((rx_reg >> I40E_QRX_ENA_QENA_STAT_SHIFT) & 1))\n-\t\t\t\tbreak;\n-\t\t\tusleep_range(1000, 2000);\n-\t\t}\n+\t\ti40e_control_rx_q(pf, pf_q, enable);\n \n-\t\t/* Skip if the queue is already in the requested state */\n-\t\tif (enable == !!(rx_reg & I40E_QRX_ENA_QENA_STAT_MASK))\n-\t\t\tcontinue;\n-\n-\t\t/* turn on/off the queue */\n-\t\tif (enable)\n-\t\t\trx_reg |= I40E_QRX_ENA_QENA_REQ_MASK;\n-\t\telse\n-\t\t\trx_reg &= ~I40E_QRX_ENA_QENA_REQ_MASK;\n-\t\twr32(hw, I40E_QRX_ENA(pf_q), rx_reg);\n-\t\t/* No waiting for the Tx queue to disable */\n+\t\t/* Don't wait to disable when port Tx is suspended */\n \t\tif (!enable && test_bit(__I40E_PORT_TX_SUSPENDED, &pf->state))\n \t\t\tcontinue;\n \n", "prefixes": [ "next", "S70", "04/12" ] }