Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/952649/?format=api
{ "id": 952649, "url": "http://patchwork.ozlabs.org/api/patches/952649/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180802004036.89363-5-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": "<20180802004036.89363-5-alice.michael@intel.com>", "list_archive_url": null, "date": "2018-08-02T00:40:28", "name": "[next,S94,05/13] i40e: Enable interrupts in recovery mode", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "3d51ae0c34323fe958d0fcdf0bf183b617a48718", "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/20180802004036.89363-5-alice.michael@intel.com/mbox/", "series": [ { "id": 58958, "url": "http://patchwork.ozlabs.org/api/series/58958/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=58958", "date": "2018-08-02T00:40:26", "name": null, "version": 1, "mbox": "http://patchwork.ozlabs.org/series/58958/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/952649/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/952649/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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 41h3nf5WJ2z9s3x\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 2 Aug 2018 18:51:50 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 1BEA387C93;\n\tThu, 2 Aug 2018 08:51:49 +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 qBTu028aPVgC; Thu, 2 Aug 2018 08:51:43 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id CC2D587C94;\n\tThu, 2 Aug 2018 08:51:42 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 639151CF33D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 2 Aug 2018 08:51:29 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 4C36487C74\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 2 Aug 2018 08:51:21 +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 iEIXoAgu1Lq4 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 2 Aug 2018 08:51:17 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 2F5E287C2E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 2 Aug 2018 08:51:17 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t02 Aug 2018 01:51:17 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby fmsmga002.fm.intel.com with ESMTP; 02 Aug 2018 01:51:16 -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.51,434,1526367600\"; d=\"scan'208\";a=\"72695382\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Wed, 1 Aug 2018 17:40:28 -0700", "Message-Id": "<20180802004036.89363-5-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.5", "In-Reply-To": "<20180802004036.89363-1-alice.michael@intel.com>", "References": "<20180802004036.89363-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S94 05/13] i40e: Enable interrupts in\n\trecovery mode", "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>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Patryk Małek <patryk.malek@intel.com>\n\nThis patch enables interrupts in recovery mode. Thanks to\nthis, NVM update process speed is significantly increased since\nwe do not wait for watchdog to trigger the driver to take a look\nat AdminQ in order to check if there is an event to read.\nInstead we are immediately notified via an interrupt.\n\nAdditionally this patch corrects interrupts reinitialization\nin i40e_rebuild.\n\nSigned-off-by: Patryk Małek <patryk.malek@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 104 +++++++++++++++++++++++-----\n 1 file changed, 85 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex c1bccf8..d53938c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -44,6 +44,7 @@ static int i40e_setup_pf_filter_control(struct i40e_pf *pf);\n static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired);\n static int i40e_reset(struct i40e_pf *pf);\n static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired);\n+static int i40e_setup_misc_vector_for_recovery_mode(struct i40e_pf *pf);\n static bool i40e_check_recovery_mode(struct i40e_pf *pf);\n static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw);\n static void i40e_fdir_sb_setup(struct i40e_pf *pf);\n@@ -3929,7 +3930,8 @@ static irqreturn_t i40e_intr(int irq, void *data)\n enable_intr:\n \t/* re-enable interrupt causes */\n \twr32(hw, I40E_PFINT_ICR0_ENA, ena_mask);\n-\tif (!test_bit(__I40E_DOWN, pf->state)) {\n+\tif (!test_bit(__I40E_DOWN, pf->state) ||\n+\t test_bit(__I40E_RECOVERY_MODE, pf->state)) {\n \t\ti40e_service_event_schedule(pf);\n \t\ti40e_irq_dynamic_enable_icr0(pf);\n \t}\n@@ -9335,8 +9337,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)\n \tu32 val;\n \tint v;\n \n-\tif (pf->hw.mac.type == I40E_MAC_X722 &&\n-\t test_bit(__I40E_EMP_RESET_INTR_RECEIVED, pf->state) &&\n+\tif (test_bit(__I40E_EMP_RESET_INTR_RECEIVED, pf->state) &&\n \t i40e_check_recovery_mode(pf)) {\n \t\ti40e_set_ethtool_ops(pf->vsi[pf->lan_vsi]->netdev);\n \t}\n@@ -9370,11 +9371,24 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)\n \t/* re-verify the eeprom if we just had an EMP reset */\n \tif (test_and_clear_bit(__I40E_EMP_RESET_INTR_RECEIVED, pf->state)) {\n \t\ti40e_verify_eeprom(pf);\n+\t}\n+\n+\tif (test_bit(__I40E_RECOVERY_MODE, pf->state)) {\n+\t\tif (i40e_get_capabilities(pf,\n+\t\t\t\t\t i40e_aqc_opc_list_func_capabilities))\n+\t\t\tgoto end_unlock;\n+\n+\t\t/* reinit the misc interrupt */\n+\t\tif (i40e_setup_misc_vector_for_recovery_mode(pf))\n+\t\t\tgoto end_unlock;\n+\n+\t\t/* tell the firmware that we're starting */\n+\t\ti40e_send_version(pf);\n+\n \t\t/* bail out in case recovery mode was detected, as there is\n \t\t * no need for further configuration.\n \t\t */\n-\t\tif (test_bit(__I40E_RECOVERY_MODE, pf->state))\n-\t\t\tgoto end_unlock;\n+\t\tgoto end_unlock;\n \t}\n \n \ti40e_clear_pxe_mode(hw);\n@@ -10682,6 +10696,48 @@ static int i40e_restore_interrupt_scheme(struct i40e_pf *pf)\n }\n \n /**\n+ * i40e_setup_misc_vector_for_recovery_mode - Setup the misc vector to handle\n+ * non queue events in recovery mode\n+ * @pf: board private structure\n+ *\n+ * This sets up the handler for MSIX 0 or MSI/legacy, which is used to manage\n+ * the non-queue interrupts, e.g. AdminQ and errors in recovery mode.\n+ * This is handled differently than in recovery mode since no Tx/Rx resources\n+ * are being allocated.\n+ **/\n+static int i40e_setup_misc_vector_for_recovery_mode(struct i40e_pf *pf)\n+{\n+\tint err;\n+\n+\tif (pf->flags & I40E_FLAG_MSIX_ENABLED) {\n+\t\terr = i40e_setup_misc_vector(pf);\n+\n+\t\tif (err) {\n+\t\t\tdev_info(&pf->pdev->dev,\n+\t\t\t\t \"MSI-X misc vector request failed, error %d\\n\",\n+\t\t\t\t err);\n+\t\t\treturn err;\n+\t\t}\n+\t} else {\n+\t\tu32 flags = pf->flags & I40E_FLAG_MSI_ENABLED ? 0 : IRQF_SHARED;\n+\n+\t\terr = request_irq(pf->pdev->irq, i40e_intr, flags,\n+\t\t\t\t pf->int_name, pf);\n+\n+\t\tif (err) {\n+\t\t\tdev_info(&pf->pdev->dev,\n+\t\t\t\t \"MSI/legacy misc vector request failed, error %d\\n\",\n+\t\t\t\t err);\n+\t\t\treturn err;\n+\t\t}\n+\t\ti40e_enable_misc_int_causes(pf);\n+\t\ti40e_irq_dynamic_enable_icr0(pf);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/**\n * i40e_setup_misc_vector - Setup the misc vector to handle non queue events\n * @pf: board private structure\n *\n@@ -13587,12 +13643,6 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)\n \tint err;\n \tint v_idx;\n \n-\terr = i40e_sw_init(pf);\n-\tif (err) {\n-\t\tdev_info(&pf->pdev->dev, \"sw_init failed: %d\\n\", err);\n-\t\tgoto err_sw_init;\n-\t}\n-\n \tpci_save_state(pf->pdev);\n \n \t/* set up periodic task facility */\n@@ -13616,7 +13666,7 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)\n \telse\n \t\tpf->num_alloc_vsi = pf->hw.func_caps.num_vsis;\n \n-\t/* Set up the *vsi struct and our local tracking of the MAIN PF vsi. */\n+\t/* Set up the vsi struct and our local tracking of the MAIN PF vsi. */\n \tpf->vsi = kcalloc(pf->num_alloc_vsi, sizeof(struct i40e_vsi *),\n \t\t\t GFP_KERNEL);\n \tif (!pf->vsi) {\n@@ -13624,6 +13674,9 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)\n \t\tgoto err_switch_setup;\n \t}\n \n+\t/* We allocate one VSI which is needed as absolute minimum\n+\t * in order to register the netdev\n+\t */\n \tv_idx = i40e_vsi_mem_alloc(pf, I40E_VSI_MAIN);\n \tif (v_idx < 0)\n \t\tgoto err_switch_setup;\n@@ -13631,6 +13684,7 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)\n \tvsi = pf->vsi[v_idx];\n \tif (!vsi)\n \t\tgoto err_switch_setup;\n+\tvsi->alloc_queue_pairs = 1;\n \terr = i40e_config_netdev(vsi);\n \tif (err)\n \t\tgoto err_switch_setup;\n@@ -13639,6 +13693,10 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)\n \t\tgoto err_switch_setup;\n \ti40e_dbg_pf_init(pf);\n \n+\terr = i40e_setup_misc_vector_for_recovery_mode(pf);\n+\tif (err)\n+\t\tgoto err_switch_setup;\n+\n \t/* tell the firmware that we're starting */\n \ti40e_send_version(pf);\n \n@@ -13651,7 +13709,6 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)\n err_switch_setup:\n \ti40e_reset_interrupt_capability(pf);\n \tdel_timer_sync(&pf->service_timer);\n-err_sw_init:\n \ti40e_shutdown_adminq(hw);\n \tiounmap(hw->hw_addr);\n \tkfree(pf);\n@@ -13849,11 +13906,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t\tdev_warn(&pdev->dev, \"This device is a pre-production adapter/LOM. Please be aware there may be issues with your hardware. If you are experiencing problems please contact your Intel or hardware representative who provided you with this hardware.\\n\");\n \n \ti40e_clear_pxe_mode(hw);\n-\n-\tif (pf->hw.mac.type == I40E_MAC_X722)\n-\t\tif (i40e_check_recovery_mode(pf))\n-\t\t\treturn i40e_init_recovery_mode(pf, hw);\n-\n \terr = i40e_get_capabilities(pf, i40e_aqc_opc_list_func_capabilities);\n \tif (err)\n \t\tgoto err_adminq_setup;\n@@ -13864,6 +13916,9 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t\tgoto err_sw_init;\n \t}\n \n+\tif (i40e_check_recovery_mode(pf))\n+\t\treturn i40e_init_recovery_mode(pf, hw);\n+\n \terr = i40e_init_lan_hmc(hw, hw->func_caps.num_tx_qp,\n \t\t\t\thw->func_caps.num_rx_qp, 0, 0);\n \tif (err) {\n@@ -14316,11 +14371,22 @@ static void i40e_remove(struct pci_dev *pdev)\n \tmutex_destroy(&hw->aq.arq_mutex);\n \tmutex_destroy(&hw->aq.asq_mutex);\n \n+\t/* Free MSI/legacy interrupt 0 when in recovery mode.\n+\t * This is normally done in i40e_vsi_free_irq on\n+\t * VSI close but since recovery mode doesn't allow to up\n+\t * an interface and we do not allocate all Rx/Tx resources\n+\t * for it we'll just do it here\n+\t */\n+\tif (test_bit(__I40E_RECOVERY_MODE, pf->state) &&\n+\t !(pf->flags & I40E_FLAG_MSIX_ENABLED))\n+\t\tfree_irq(pf->pdev->irq, pf);\n+\n \t/* Clear all dynamic memory lists of rings, q_vectors, and VSIs */\n \ti40e_clear_interrupt_scheme(pf);\n \tfor (i = 0; i < pf->num_alloc_vsi; i++) {\n \t\tif (pf->vsi[i]) {\n-\t\t\ti40e_vsi_clear_rings(pf->vsi[i]);\n+\t\t\tif (!test_bit(__I40E_RECOVERY_MODE, pf->state))\n+\t\t\t\ti40e_vsi_clear_rings(pf->vsi[i]);\n \t\t\ti40e_vsi_clear(pf->vsi[i]);\n \t\t\tpf->vsi[i] = NULL;\n \t\t}\n", "prefixes": [ "next", "S94", "05/13" ] }