Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1291739/?format=api
{ "id": 1291739, "url": "http://patchwork.ozlabs.org/api/patches/1291739/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200516003644.4658-3-anthony.l.nguyen@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": "<20200516003644.4658-3-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-16T00:36:32", "name": "[S43,03/15] ice: Fix Tx timeout when link is toggled on a VF's interface", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5dac344b575b138363fdfe7ab5b9282d270e8b1c", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20200516003644.4658-3-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 177325, "url": "http://patchwork.ozlabs.org/api/series/177325/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=177325", "date": "2020-05-16T00:36:39", "name": "[S43,01/15] ice: Call ice_aq_set_mac_cfg", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/177325/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1291739/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1291739/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 spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=silver.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49P5y55CYlz9sTM\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 16 May 2020 10:39:25 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 41F22227FF;\n\tSat, 16 May 2020 00:39:24 +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 uuetJ6l+VfB8; Sat, 16 May 2020 00:39:22 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 5050B22731;\n\tSat, 16 May 2020 00:39:22 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by ash.osuosl.org (Postfix) with ESMTP id 8613B1BF2B9\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:39:20 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by whitealder.osuosl.org (Postfix) with ESMTP id 80C9787CEB\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:39:20 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id JV2bAqf+88PH for <intel-wired-lan@lists.osuosl.org>;\n Sat, 16 May 2020 00:39:19 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by whitealder.osuosl.org (Postfix) with ESMTPS id 4D81A877FA\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:39:19 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 May 2020 17:39:18 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by FMSMGA003.fm.intel.com with ESMTP; 15 May 2020 17:39:18 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n wXGqh0+bh0nGk3pA/qD/gC1vCm+T+UrILeTGHMhHIvDq75SvI33cTDTBMB+D6JKFuijmUtgOgz\n KisBTEzE0/9A==", "\n cSr/CW+4GiQ0P/Z2+mK6IXgy6Pr7wbFEaseWil71T8w25sOVrwTHrStKtfMCeBeCBc1v2vqadt\n QbGLtoojwirQ==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,397,1583222400\"; d=\"scan'208\";a=\"307560858\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 15 May 2020 17:36:32 -0700", "Message-Id": "<20200516003644.4658-3-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200516003644.4658-1-anthony.l.nguyen@intel.com>", "References": "<20200516003644.4658-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S43 03/15] ice: Fix Tx timeout when link\n is toggled on a VF's interface", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "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\nCurrently if the iavf is loaded and a VF link transitions from up to\ndown to up again a Tx timeout will be triggered. This happens because\nTx/Rx queue interrupts are only enabled when receiving the\nVIRTCHNL_OP_CONFIG_MAP_IRQ message, which happens on reset or initial\niavf driver load, but not when bringing link up. This is problematic\nbecause they are disabled on the VIRTCHNL_OP_DISABLE_QUEUES message,\nwhich is part of bringing a VF's link down. However, they are not\nenabled on the VIRTCHNL_OP_ENABLE_QUEUES message, which is part of\nbringing a VF's link up.\n\nFix this by re-enabling the VF's Rx and Tx queue interrupts when they\nwere previously configured. This is done by first checking to make\nsure the previous value in QINT_[R|T]QCTL.MSIX_INDX is not 0, which\nis used to represent the OICR in the VF's interrupt space. If the\nMSIX_INDX is non-zero then enable the interrupt by setting the\nQINT_[R|T]CTL.CAUSE_ENA bit to 1.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 48 +++++++++++++++++++\n 1 file changed, 48 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 7c8c1687f0bf..2e6c81555668 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -2291,6 +2291,52 @@ static bool ice_vc_validate_vqs_bitmaps(struct virtchnl_queue_select *vqs)\n \treturn true;\n }\n \n+/**\n+ * ice_vf_ena_txq_interrupt - enable Tx queue interrupt via QINT_TQCTL\n+ * @vsi: VSI of the VF to configure\n+ * @q_idx: VF queue index used to determine the queue in the PF's space\n+ */\n+static void ice_vf_ena_txq_interrupt(struct ice_vsi *vsi, u32 q_idx)\n+{\n+\tstruct ice_hw *hw = &vsi->back->hw;\n+\tu32 pfq = vsi->txq_map[q_idx];\n+\tu32 reg;\n+\n+\treg = rd32(hw, QINT_TQCTL(pfq));\n+\n+\t/* MSI-X index 0 in the VF's space is always for the OICR, which means\n+\t * this is most likely a poll mode VF driver, so don't enable an\n+\t * interrupt that was never configured via VIRTCHNL_OP_CONFIG_IRQ_MAP\n+\t */\n+\tif (!(reg & QINT_TQCTL_MSIX_INDX_M))\n+\t\treturn;\n+\n+\twr32(hw, QINT_TQCTL(pfq), reg | QINT_TQCTL_CAUSE_ENA_M);\n+}\n+\n+/**\n+ * ice_vf_ena_rxq_interrupt - enable Tx queue interrupt via QINT_RQCTL\n+ * @vsi: VSI of the VF to configure\n+ * @q_idx: VF queue index used to determine the queue in the PF's space\n+ */\n+static void ice_vf_ena_rxq_interrupt(struct ice_vsi *vsi, u32 q_idx)\n+{\n+\tstruct ice_hw *hw = &vsi->back->hw;\n+\tu32 pfq = vsi->rxq_map[q_idx];\n+\tu32 reg;\n+\n+\treg = rd32(hw, QINT_RQCTL(pfq));\n+\n+\t/* MSI-X index 0 in the VF's space is always for the OICR, which means\n+\t * this is most likely a poll mode VF driver, so don't enable an\n+\t * interrupt that was never configured via VIRTCHNL_OP_CONFIG_IRQ_MAP\n+\t */\n+\tif (!(reg & QINT_RQCTL_MSIX_INDX_M))\n+\t\treturn;\n+\n+\twr32(hw, QINT_RQCTL(pfq), reg | QINT_RQCTL_CAUSE_ENA_M);\n+}\n+\n /**\n * ice_vc_ena_qs_msg\n * @vf: pointer to the VF info\n@@ -2351,6 +2397,7 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\t\tgoto error_param;\n \t\t}\n \n+\t\tice_vf_ena_rxq_interrupt(vsi, vf_q_id);\n \t\tset_bit(vf_q_id, vf->rxq_ena);\n \t}\n \n@@ -2365,6 +2412,7 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tif (test_bit(vf_q_id, vf->txq_ena))\n \t\t\tcontinue;\n \n+\t\tice_vf_ena_txq_interrupt(vsi, vf_q_id);\n \t\tset_bit(vf_q_id, vf->txq_ena);\n \t}\n \n", "prefixes": [ "S43", "03/15" ] }