|
@@ -1,7 +1,7 @@
|
|
|
-From 0705499a65b8fdef3a2a375993b41cb8d3af8147 Mon Sep 17 00:00:00 2001
|
|
|
+From 0a0ec97aa74e28a9fdea0649bad95ba959172ded Mon Sep 17 00:00:00 2001
|
|
|
From: Jake Day <jake@ninebysix.com>
|
|
|
-Date: Thu, 7 Mar 2019 11:53:42 -0500
|
|
|
-Subject: [PATCH 02/11] suspend
|
|
|
+Date: Tue, 30 Apr 2019 20:48:59 -0400
|
|
|
+Subject: [PATCH 02/12] suspend
|
|
|
|
|
|
---
|
|
|
drivers/nvme/host/nvme.h | 5 +++++
|
|
@@ -13,7 +13,7 @@ Subject: [PATCH 02/11] suspend
|
|
|
6 files changed, 40 insertions(+), 1 deletion(-)
|
|
|
|
|
|
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
|
|
-index 60220de2db52..d49d7ccb71d3 100644
|
|
|
+index e82cdaec81c9..3b63eafb21d7 100644
|
|
|
--- a/drivers/nvme/host/nvme.h
|
|
|
+++ b/drivers/nvme/host/nvme.h
|
|
|
@@ -90,6 +90,11 @@ enum nvme_quirks {
|
|
@@ -29,7 +29,7 @@ index 60220de2db52..d49d7ccb71d3 100644
|
|
|
|
|
|
/*
|
|
|
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
|
|
-index f46313f441ec..68b63b160c9d 100644
|
|
|
+index 7b9ef8e734e7..b0e3ae90f5b7 100644
|
|
|
--- a/drivers/nvme/host/pci.c
|
|
|
+++ b/drivers/nvme/host/pci.c
|
|
|
@@ -30,6 +30,7 @@
|
|
@@ -40,7 +40,7 @@ index f46313f441ec..68b63b160c9d 100644
|
|
|
|
|
|
#include "nvme.h"
|
|
|
|
|
|
-@@ -2595,8 +2596,11 @@ static int nvme_suspend(struct device *dev)
|
|
|
+@@ -2599,8 +2600,11 @@ static int nvme_suspend(struct device *dev)
|
|
|
{
|
|
|
struct pci_dev *pdev = to_pci_dev(dev);
|
|
|
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
|
@@ -53,7 +53,7 @@ index f46313f441ec..68b63b160c9d 100644
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-@@ -2700,6 +2704,10 @@ static const struct pci_device_id nvme_id_table[] = {
|
|
|
+@@ -2704,6 +2708,10 @@ static const struct pci_device_id nvme_id_table[] = {
|
|
|
.driver_data = NVME_QUIRK_LIGHTNVM, },
|
|
|
{ PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */
|
|
|
.driver_data = NVME_QUIRK_LIGHTNVM, },
|
|
@@ -65,7 +65,7 @@ index f46313f441ec..68b63b160c9d 100644
|
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
|
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
|
|
|
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
|
|
-index c0673a717239..58cd0407c4ff 100644
|
|
|
+index 37d897bc4cf1..7587fbff6ea5 100644
|
|
|
--- a/drivers/pci/quirks.c
|
|
|
+++ b/drivers/pci/quirks.c
|
|
|
@@ -1332,6 +1332,10 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID,
|
|
@@ -120,10 +120,10 @@ index 0bd595a0b610..a8385e8894a5 100644
|
|
|
pm_notifier_call_chain(PM_POST_SUSPEND);
|
|
|
pm_restore_console();
|
|
|
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
|
|
-index 32dea29d05a0..96043d4b4b1f 100644
|
|
|
+index 9a85c7ae7362..7c6fc3f7c729 100644
|
|
|
--- a/kernel/sysctl.c
|
|
|
+++ b/kernel/sysctl.c
|
|
|
-@@ -311,7 +311,16 @@ static int min_extfrag_threshold;
|
|
|
+@@ -313,7 +313,16 @@ static int min_extfrag_threshold;
|
|
|
static int max_extfrag_threshold = 1000;
|
|
|
#endif
|
|
|
|