From: Greg Kroah-Hartman Date: Sun, 24 Jun 2018 13:07:11 +0000 (+0800) Subject: drop nvme patch from 4.14 X-Git-Tag: v4.17.3~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93ea978c8b3aee493e37b09de2a97a7565fb25df;p=thirdparty%2Fkernel%2Fstable-queue.git drop nvme patch from 4.14 --- diff --git a/queue-4.14/nvme-pci-sync-controller-reset-for-aer-slot_reset.patch b/queue-4.14/nvme-pci-sync-controller-reset-for-aer-slot_reset.patch deleted file mode 100644 index e6c9826c15f..00000000000 --- a/queue-4.14/nvme-pci-sync-controller-reset-for-aer-slot_reset.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cc1d5e749a2e1cf59fa940b976181e631d6985e1 Mon Sep 17 00:00:00 2001 -From: Keith Busch -Date: Thu, 10 May 2018 08:34:20 -0600 -Subject: nvme/pci: Sync controller reset for AER slot_reset - -From: Keith Busch - -commit cc1d5e749a2e1cf59fa940b976181e631d6985e1 upstream. - -AER handling expects a successful return from slot_reset means the -driver made the device functional again. The nvme driver had been using -an asynchronous reset to recover the device, so the device -may still be initializing after control is returned to the -AER handler. This creates problems for subsequent event handling, -causing the initializion to fail. - -This patch fixes that by syncing the controller reset before returning -to the AER driver, and reporting the true state of the reset. - -Link: https://bugzilla.kernel.org/show_bug.cgi?id=199657 -Reported-by: Alex Gagniuc -Cc: Sinan Kaya -Cc: Bjorn Helgaas -Cc: stable@vger.kernel.org -Tested-by: Alex Gagniuc -Reviewed-by: Christoph Hellwig -Reviewed-by: Martin K. Petersen -Signed-off-by: Keith Busch -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/nvme/host/pci.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - ---- a/drivers/nvme/host/pci.c -+++ b/drivers/nvme/host/pci.c -@@ -2508,8 +2508,15 @@ static pci_ers_result_t nvme_slot_reset( - - dev_info(dev->ctrl.device, "restart after slot reset\n"); - pci_restore_state(pdev); -- nvme_reset_ctrl(&dev->ctrl); -- return PCI_ERS_RESULT_RECOVERED; -+ nvme_reset_ctrl_sync(&dev->ctrl); -+ -+ switch (dev->ctrl.state) { -+ case NVME_CTRL_LIVE: -+ case NVME_CTRL_ADMIN_ONLY: -+ return PCI_ERS_RESULT_RECOVERED; -+ default: -+ return PCI_ERS_RESULT_DISCONNECT; -+ } - } - - static void nvme_error_resume(struct pci_dev *pdev) diff --git a/queue-4.14/series b/queue-4.14/series index 879cec66bcb..ff78c9e7c7d 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -40,6 +40,5 @@ cpufreq-fix-new-policy-initialization-during-limits-updates-via-sysfs.patch cpufreq-governors-fix-long-idle-detection-logic-in-load-calculation.patch libata-zpodd-small-read-overflow-in-eject_tray.patch libata-drop-sandisk-sd7ub3q-g1001-nolpm-quirk.patch -nvme-pci-sync-controller-reset-for-aer-slot_reset.patch w1-mxc_w1-enable-clock-before-calling-clk_get_rate-on-it.patch x86-intel_rdt-enable-cmt-and-mbm-on-new-skylake-stepping.patch