Update NVMe part of suspend.patch
Note: NVMe part will be merged into Linux 5.3. Remove the part in 0002-suspend.patch when it arrives. For 5.2 - (Reverted NVMe part of 0002-suspend.patch to apply following patch set) - nvme: export get and set features · torvalds/linux@1a87ee6 torvalds/linux@1a87ee6 - nvme-pci: use host managed power state for suspend · torvalds/linux@d916b1b torvalds/linux@d916b1b#diff-bc4c090f021c046a7d256a3fcf86b7da For 4.19, this patch is also applied - nvme-pci: Sync queues on reset · torvalds/linux@d6135c3 torvalds/linux@d6135c3#diff-bc4c090f021c046a7d256a3fcf86b7da See - Surface Book with Performance Base: NVMe SSD breaks suspend (s2idle) · Issue jakeday#123 · jakeday/linux-surface jakeday#123
This commit is contained in:
parent
360a2b1c45
commit
e8a3d85b22
|
@ -1,97 +1,269 @@
|
||||||
From 5b096f13d4fdc994dbef3b0ff8c50c1fea7adb1e Mon Sep 17 00:00:00 2001
|
From ae134bb7065d18be2c462e46e00b7fbbac22f98b Mon Sep 17 00:00:00 2001
|
||||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
|
||||||
Date: Fri, 26 Jul 2019 03:41:22 +0200
|
Date: Wed, 31 Jul 2019 08:39:18 +0900
|
||||||
Subject: [PATCH 02/12] suspend
|
Subject: [PATCH 02/12] suspend
|
||||||
|
|
||||||
---
|
Note:
|
||||||
drivers/nvme/host/nvme.h | 5 +++++
|
NVMe part will be merged into Linux 5.3. Remove the part in this
|
||||||
drivers/nvme/host/pci.c | 10 +++++++++-
|
patch when it arrives.
|
||||||
drivers/pci/quirks.c | 4 ++++
|
|
||||||
include/linux/pci_ids.h | 2 ++
|
|
||||||
kernel/power/suspend.c | 11 +++++++++++
|
|
||||||
kernel/sysctl.c | 9 +++++++++
|
|
||||||
6 files changed, 40 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
|
---
|
||||||
|
drivers/nvme/host/core.c | 36 +++++++++++++--
|
||||||
|
drivers/nvme/host/nvme.h | 7 +++
|
||||||
|
drivers/nvme/host/pci.c | 96 ++++++++++++++++++++++++++++++++++++++--
|
||||||
|
kernel/power/suspend.c | 11 +++++
|
||||||
|
kernel/sysctl.c | 9 ++++
|
||||||
|
5 files changed, 153 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
||||||
|
index e26d1191c..6d7be7d34 100644
|
||||||
|
--- a/drivers/nvme/host/core.c
|
||||||
|
+++ b/drivers/nvme/host/core.c
|
||||||
|
@@ -1028,15 +1028,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,
|
||||||
|
- void *buffer, size_t buflen, u32 *result)
|
||||||
|
+static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid,
|
||||||
|
+ unsigned int dword11, void *buffer, size_t buflen, u32 *result)
|
||||||
|
{
|
||||||
|
struct nvme_command c;
|
||||||
|
union nvme_result res;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
memset(&c, 0, sizeof(c));
|
||||||
|
- c.features.opcode = nvme_admin_set_features;
|
||||||
|
+ c.features.opcode = op;
|
||||||
|
c.features.fid = cpu_to_le32(fid);
|
||||||
|
c.features.dword11 = cpu_to_le32(dword11);
|
||||||
|
|
||||||
|
@@ -1047,6 +1047,24 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
+int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||||
|
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||||
|
+ u32 *result)
|
||||||
|
+{
|
||||||
|
+ return nvme_features(dev, nvme_admin_set_features, fid, dword11, buffer,
|
||||||
|
+ buflen, result);
|
||||||
|
+}
|
||||||
|
+EXPORT_SYMBOL_GPL(nvme_set_features);
|
||||||
|
+
|
||||||
|
+int nvme_get_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||||
|
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||||
|
+ u32 *result)
|
||||||
|
+{
|
||||||
|
+ return nvme_features(dev, nvme_admin_get_features, fid, dword11, buffer,
|
||||||
|
+ buflen, result);
|
||||||
|
+}
|
||||||
|
+EXPORT_SYMBOL_GPL(nvme_get_features);
|
||||||
|
+
|
||||||
|
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
|
||||||
|
{
|
||||||
|
u32 q_count = (*count - 1) | ((*count - 1) << 16);
|
||||||
|
@@ -3556,6 +3574,18 @@ static void nvme_free_ctrl(struct device *dev)
|
||||||
|
nvme_put_subsystem(subsys);
|
||||||
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
+void nvme_sync_queues(struct nvme_ctrl *ctrl)
|
||||||
|
+{
|
||||||
|
+ struct nvme_ns *ns;
|
||||||
|
+
|
||||||
|
+ down_read(&ctrl->namespaces_rwsem);
|
||||||
|
+ list_for_each_entry(ns, &ctrl->namespaces, list)
|
||||||
|
+ blk_sync_queue(ns->queue);
|
||||||
|
+ up_read(&ctrl->namespaces_rwsem);
|
||||||
|
+}
|
||||||
|
+EXPORT_SYMBOL_GPL(nvme_sync_queues);
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Initialize a NVMe controller structures. This needs to be called during
|
||||||
|
* earliest initialization so that we have the initialized structured around
|
||||||
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
||||||
index d5e29b57eb34..cadc756e0534 100644
|
index e82cdaec8..400ce4c01 100644
|
||||||
--- a/drivers/nvme/host/nvme.h
|
--- a/drivers/nvme/host/nvme.h
|
||||||
+++ b/drivers/nvme/host/nvme.h
|
+++ b/drivers/nvme/host/nvme.h
|
||||||
@@ -90,6 +90,11 @@ enum nvme_quirks {
|
@@ -433,6 +433,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
|
||||||
* Set MEDIUM priority on SQ creation
|
void nvme_stop_queues(struct nvme_ctrl *ctrl);
|
||||||
*/
|
void nvme_start_queues(struct nvme_ctrl *ctrl);
|
||||||
NVME_QUIRK_MEDIUM_PRIO_SQ = (1 << 7),
|
void nvme_kill_queues(struct nvme_ctrl *ctrl);
|
||||||
+
|
+void nvme_sync_queues(struct nvme_ctrl *ctrl);
|
||||||
+ /*
|
void nvme_unfreeze(struct nvme_ctrl *ctrl);
|
||||||
+ * Do not disable nvme when suspending (s2idle)
|
void nvme_wait_freeze(struct nvme_ctrl *ctrl);
|
||||||
+ */
|
void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);
|
||||||
+ NVME_QUIRK_NO_DISABLE = (1 << 8),
|
@@ -450,6 +451,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
|
||||||
};
|
union nvme_result *result, void *buffer, unsigned bufflen,
|
||||||
|
unsigned timeout, int qid, int at_head,
|
||||||
/*
|
blk_mq_req_flags_t flags);
|
||||||
|
+int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||||
|
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||||
|
+ u32 *result);
|
||||||
|
+int nvme_get_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||||
|
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||||
|
+ u32 *result);
|
||||||
|
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);
|
||||||
|
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
|
||||||
|
int nvme_reset_ctrl(struct nvme_ctrl *ctrl);
|
||||||
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
||||||
index 0a5d064f82ca..55c6a273588a 100644
|
index 0a5d064f8..e99c2f168 100644
|
||||||
--- a/drivers/nvme/host/pci.c
|
--- a/drivers/nvme/host/pci.c
|
||||||
+++ b/drivers/nvme/host/pci.c
|
+++ b/drivers/nvme/host/pci.c
|
||||||
@@ -30,6 +30,7 @@
|
@@ -26,6 +26,7 @@
|
||||||
|
#include <linux/mutex.h>
|
||||||
|
#include <linux/once.h>
|
||||||
|
#include <linux/pci.h>
|
||||||
|
+#include <linux/suspend.h>
|
||||||
|
#include <linux/t10-pi.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||||
#include <linux/sed-opal.h>
|
@@ -106,6 +107,7 @@ struct nvme_dev {
|
||||||
+#include <linux/suspend.h>
|
u32 cmbloc;
|
||||||
|
struct nvme_ctrl ctrl;
|
||||||
|
struct completion ioq_wait;
|
||||||
|
+ u32 last_ps;
|
||||||
|
|
||||||
#include "nvme.h"
|
mempool_t *iod_mempool;
|
||||||
|
|
||||||
@@ -2609,8 +2610,11 @@ static int nvme_suspend(struct device *dev)
|
@@ -2267,6 +2269,7 @@ static void nvme_reset_work(struct work_struct *work)
|
||||||
|
*/
|
||||||
|
if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)
|
||||||
|
nvme_dev_disable(dev, false);
|
||||||
|
+ nvme_sync_queues(&dev->ctrl);
|
||||||
|
|
||||||
|
mutex_lock(&dev->shutdown_lock);
|
||||||
|
result = nvme_pci_enable(dev);
|
||||||
|
@@ -2605,16 +2608,94 @@ static void nvme_remove(struct pci_dev *pdev)
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM_SLEEP
|
||||||
|
+static int nvme_get_power_state(struct nvme_ctrl *ctrl, u32 *ps)
|
||||||
|
+{
|
||||||
|
+ return nvme_get_features(ctrl, NVME_FEAT_POWER_MGMT, 0, NULL, 0, ps);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int nvme_set_power_state(struct nvme_ctrl *ctrl, u32 ps)
|
||||||
|
+{
|
||||||
|
+ return nvme_set_features(ctrl, NVME_FEAT_POWER_MGMT, ps, NULL, 0, NULL);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int nvme_resume(struct device *dev)
|
||||||
|
+{
|
||||||
|
+ struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev));
|
||||||
|
+ struct nvme_ctrl *ctrl = &ndev->ctrl;
|
||||||
|
+
|
||||||
|
+ if (pm_resume_via_firmware() || !ctrl->npss ||
|
||||||
|
+ nvme_set_power_state(ctrl, ndev->last_ps) != 0)
|
||||||
|
+ nvme_reset_ctrl(ctrl);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int nvme_suspend(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pdev = to_pci_dev(dev);
|
struct pci_dev *pdev = to_pci_dev(dev);
|
||||||
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
||||||
+ struct nvme_ctrl *ctrl = &ndev->ctrl;
|
+ struct nvme_ctrl *ctrl = &ndev->ctrl;
|
||||||
|
+ int ret = -EBUSY;
|
||||||
+
|
+
|
||||||
+ if (!(pm_suspend_via_s2idle() && (ctrl->quirks & NVME_QUIRK_NO_DISABLE)))
|
+ /*
|
||||||
|
+ * The platform does not remove power for a kernel managed suspend so
|
||||||
|
+ * use host managed nvme power settings for lowest idle power if
|
||||||
|
+ * possible. This should have quicker resume latency than a full device
|
||||||
|
+ * shutdown. But if the firmware is involved after the suspend or the
|
||||||
|
+ * device does not support any non-default power states, shut down the
|
||||||
|
+ * device fully.
|
||||||
|
+ */
|
||||||
|
+ if (pm_suspend_via_firmware() || !ctrl->npss) {
|
||||||
+ nvme_dev_disable(ndev, true);
|
+ nvme_dev_disable(ndev, true);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ nvme_start_freeze(ctrl);
|
||||||
|
+ nvme_wait_freeze(ctrl);
|
||||||
|
+ nvme_sync_queues(ctrl);
|
||||||
|
+
|
||||||
|
+ if (ctrl->state != NVME_CTRL_LIVE &&
|
||||||
|
+ ctrl->state != NVME_CTRL_ADMIN_ONLY)
|
||||||
|
+ goto unfreeze;
|
||||||
|
+
|
||||||
|
+ ndev->last_ps = 0;
|
||||||
|
+ ret = nvme_get_power_state(ctrl, &ndev->last_ps);
|
||||||
|
+ if (ret < 0)
|
||||||
|
+ goto unfreeze;
|
||||||
|
+
|
||||||
|
+ ret = nvme_set_power_state(ctrl, ctrl->npss);
|
||||||
|
+ if (ret < 0)
|
||||||
|
+ goto unfreeze;
|
||||||
|
+
|
||||||
|
+ if (ret) {
|
||||||
|
+ /*
|
||||||
|
+ * Clearing npss forces a controller reset on resume. The
|
||||||
|
+ * correct value will be resdicovered then.
|
||||||
|
+ */
|
||||||
|
+ nvme_dev_disable(ndev, true);
|
||||||
|
+ ctrl->npss = 0;
|
||||||
|
+ ret = 0;
|
||||||
|
+ goto unfreeze;
|
||||||
|
+ }
|
||||||
|
+ /*
|
||||||
|
+ * A saved state prevents pci pm from generically controlling the
|
||||||
|
+ * device's power. If we're using protocol specific settings, we don't
|
||||||
|
+ * want pci interfering.
|
||||||
|
+ */
|
||||||
|
+ pci_save_state(pdev);
|
||||||
|
+unfreeze:
|
||||||
|
+ nvme_unfreeze(ctrl);
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int nvme_simple_suspend(struct device *dev)
|
||||||
|
+{
|
||||||
|
+ struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev));
|
||||||
|
|
||||||
- nvme_dev_disable(ndev, true);
|
nvme_dev_disable(ndev, true);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2714,6 +2718,10 @@ static const struct pci_device_id nvme_id_table[] = {
|
-static int nvme_resume(struct device *dev)
|
||||||
.driver_data = NVME_QUIRK_LIGHTNVM, },
|
+static int nvme_simple_resume(struct device *dev)
|
||||||
{ PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */
|
{
|
||||||
.driver_data = NVME_QUIRK_LIGHTNVM, },
|
struct pci_dev *pdev = to_pci_dev(dev);
|
||||||
+ { PCI_VDEVICE(SK_HYNIX, 0x1527), /* Sk Hynix */
|
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
||||||
+ .driver_data = NVME_QUIRK_NO_DISABLE, },
|
@@ -2622,9 +2703,16 @@ static int nvme_resume(struct device *dev)
|
||||||
+ { PCI_VDEVICE(TOSHIBA, 0x010f), /* TOSHIBA NVMe found on Surface Book with Performance Base */
|
nvme_reset_ctrl(&ndev->ctrl);
|
||||||
+ .driver_data = NVME_QUIRK_NO_DISABLE, },
|
return 0;
|
||||||
{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
|
}
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
|
-#endif
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
|
|
||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
|
||||||
index 28c64f84bfe7..30c013926470 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,
|
|
||||||
occur when mode detecting */
|
|
||||||
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_VIA, PCI_ANY_ID,
|
|
||||||
PCI_CLASS_STORAGE_IDE, 8, quirk_no_ata_d3);
|
|
||||||
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SK_HYNIX, 0x1527, quirk_no_ata_d3);
|
|
||||||
+/* TOSHIBA NVMe disk found on Surface Book with Performance Base
|
|
||||||
+ cannot wakeup from D3 state after s2idle */
|
|
||||||
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_TOSHIBA, 0x010f, quirk_no_ata_d3);
|
|
||||||
|
|
||||||
/*
|
-static SIMPLE_DEV_PM_OPS(nvme_dev_pm_ops, nvme_suspend, nvme_resume);
|
||||||
* This was originally an Alpha-specific thing, but it really fits here.
|
+const struct dev_pm_ops nvme_dev_pm_ops = {
|
||||||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
|
+ .suspend = nvme_suspend,
|
||||||
index d157983b84cf..c9aaf755b649 100644
|
+ .resume = nvme_resume,
|
||||||
--- a/include/linux/pci_ids.h
|
+ .freeze = nvme_simple_suspend,
|
||||||
+++ b/include/linux/pci_ids.h
|
+ .thaw = nvme_simple_resume,
|
||||||
@@ -3086,4 +3086,6 @@
|
+ .poweroff = nvme_simple_suspend,
|
||||||
|
+ .restore = nvme_simple_resume,
|
||||||
|
+};
|
||||||
|
+#endif /* CONFIG_PM_SLEEP */
|
||||||
|
|
||||||
#define PCI_VENDOR_ID_NCUBE 0x10ff
|
static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev,
|
||||||
|
pci_channel_state_t state)
|
||||||
+#define PCI_VENDOR_ID_SK_HYNIX 0x1c5c
|
@@ -2727,9 +2815,11 @@ static struct pci_driver nvme_driver = {
|
||||||
+
|
.probe = nvme_probe,
|
||||||
#endif /* _LINUX_PCI_IDS_H */
|
.remove = nvme_remove,
|
||||||
|
.shutdown = nvme_shutdown,
|
||||||
|
+#ifdef CONFIG_PM_SLEEP
|
||||||
|
.driver = {
|
||||||
|
.pm = &nvme_dev_pm_ops,
|
||||||
|
},
|
||||||
|
+#endif
|
||||||
|
.sriov_configure = pci_sriov_configure_simple,
|
||||||
|
.err_handler = &nvme_err_handler,
|
||||||
|
};
|
||||||
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
|
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
|
||||||
index 0bd595a0b610..a8385e8894a5 100644
|
index 0bd595a0b..a8385e889 100644
|
||||||
--- a/kernel/power/suspend.c
|
--- a/kernel/power/suspend.c
|
||||||
+++ b/kernel/power/suspend.c
|
+++ b/kernel/power/suspend.c
|
||||||
@@ -526,6 +526,8 @@ int suspend_devices_and_enter(suspend_state_t state)
|
@@ -526,6 +526,8 @@ int suspend_devices_and_enter(suspend_state_t state)
|
||||||
|
@ -120,7 +292,7 @@ index 0bd595a0b610..a8385e8894a5 100644
|
||||||
pm_notifier_call_chain(PM_POST_SUSPEND);
|
pm_notifier_call_chain(PM_POST_SUSPEND);
|
||||||
pm_restore_console();
|
pm_restore_console();
|
||||||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
||||||
index f8576509c7be..a5fa80e72aba 100644
|
index f8576509c..a5fa80e72 100644
|
||||||
--- a/kernel/sysctl.c
|
--- a/kernel/sysctl.c
|
||||||
+++ b/kernel/sysctl.c
|
+++ b/kernel/sysctl.c
|
||||||
@@ -313,7 +313,16 @@ static int min_extfrag_threshold;
|
@@ -313,7 +313,16 @@ static int min_extfrag_threshold;
|
||||||
|
|
|
@ -1,97 +1,234 @@
|
||||||
From a5017ecfa0b620c7d7d86faf06d629ce4a2a3b1a Mon Sep 17 00:00:00 2001
|
From 0aa6cc9a8970c8dae97563a1886dafc9ef79e011 Mon Sep 17 00:00:00 2001
|
||||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
|
||||||
Date: Fri, 26 Jul 2019 04:44:56 +0200
|
Date: Wed, 31 Jul 2019 08:41:30 +0900
|
||||||
Subject: [PATCH 02/12] suspend
|
Subject: [PATCH 02/12] suspend
|
||||||
|
|
||||||
---
|
Note:
|
||||||
drivers/nvme/host/nvme.h | 5 +++++
|
NVMe part will be merged into Linux 5.3. Remove the part in this
|
||||||
drivers/nvme/host/pci.c | 10 +++++++++-
|
patch when it arrives.
|
||||||
drivers/pci/quirks.c | 4 ++++
|
|
||||||
include/linux/pci_ids.h | 2 ++
|
|
||||||
kernel/power/suspend.c | 11 +++++++++++
|
|
||||||
kernel/sysctl.c | 9 +++++++++
|
|
||||||
6 files changed, 40 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
|
---
|
||||||
|
drivers/nvme/host/core.c | 24 ++++++++--
|
||||||
|
drivers/nvme/host/nvme.h | 6 +++
|
||||||
|
drivers/nvme/host/pci.c | 95 ++++++++++++++++++++++++++++++++++++++--
|
||||||
|
kernel/power/suspend.c | 11 +++++
|
||||||
|
kernel/sysctl.c | 9 ++++
|
||||||
|
5 files changed, 139 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
||||||
|
index 22c68e3b7..3b3960e0c 100644
|
||||||
|
--- a/drivers/nvme/host/core.c
|
||||||
|
+++ b/drivers/nvme/host/core.c
|
||||||
|
@@ -1113,15 +1113,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,
|
||||||
|
- void *buffer, size_t buflen, u32 *result)
|
||||||
|
+static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid,
|
||||||
|
+ unsigned int dword11, void *buffer, size_t buflen, u32 *result)
|
||||||
|
{
|
||||||
|
struct nvme_command c;
|
||||||
|
union nvme_result res;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
memset(&c, 0, sizeof(c));
|
||||||
|
- c.features.opcode = nvme_admin_set_features;
|
||||||
|
+ c.features.opcode = op;
|
||||||
|
c.features.fid = cpu_to_le32(fid);
|
||||||
|
c.features.dword11 = cpu_to_le32(dword11);
|
||||||
|
|
||||||
|
@@ -1132,6 +1132,24 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
+int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||||
|
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||||
|
+ u32 *result)
|
||||||
|
+{
|
||||||
|
+ return nvme_features(dev, nvme_admin_set_features, fid, dword11, buffer,
|
||||||
|
+ buflen, result);
|
||||||
|
+}
|
||||||
|
+EXPORT_SYMBOL_GPL(nvme_set_features);
|
||||||
|
+
|
||||||
|
+int nvme_get_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||||
|
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||||
|
+ u32 *result)
|
||||||
|
+{
|
||||||
|
+ return nvme_features(dev, nvme_admin_get_features, fid, dword11, buffer,
|
||||||
|
+ buflen, result);
|
||||||
|
+}
|
||||||
|
+EXPORT_SYMBOL_GPL(nvme_get_features);
|
||||||
|
+
|
||||||
|
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
|
||||||
|
{
|
||||||
|
u32 q_count = (*count - 1) | ((*count - 1) << 16);
|
||||||
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
||||||
index 55553d293a98..506656ec65ea 100644
|
index 55553d293..038b8931d 100644
|
||||||
--- a/drivers/nvme/host/nvme.h
|
--- a/drivers/nvme/host/nvme.h
|
||||||
+++ b/drivers/nvme/host/nvme.h
|
+++ b/drivers/nvme/host/nvme.h
|
||||||
@@ -92,6 +92,11 @@ enum nvme_quirks {
|
@@ -459,6 +459,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
|
||||||
* Broken Write Zeroes.
|
union nvme_result *result, void *buffer, unsigned bufflen,
|
||||||
*/
|
unsigned timeout, int qid, int at_head,
|
||||||
NVME_QUIRK_DISABLE_WRITE_ZEROES = (1 << 9),
|
blk_mq_req_flags_t flags, bool poll);
|
||||||
+
|
+int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||||
+ /*
|
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||||
+ * Do not disable nvme when suspending (s2idle)
|
+ u32 *result);
|
||||||
+ */
|
+int nvme_get_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||||
+ NVME_QUIRK_NO_DISABLE = (1 << 10),
|
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||||
};
|
+ u32 *result);
|
||||||
|
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);
|
||||||
/*
|
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
|
||||||
|
int nvme_reset_ctrl(struct nvme_ctrl *ctrl);
|
||||||
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
||||||
index f5bc1c30cef5..c163415503b8 100644
|
index f5bc1c30c..aea3b42a5 100644
|
||||||
--- a/drivers/nvme/host/pci.c
|
--- a/drivers/nvme/host/pci.c
|
||||||
+++ b/drivers/nvme/host/pci.c
|
+++ b/drivers/nvme/host/pci.c
|
||||||
@@ -23,6 +23,7 @@
|
@@ -18,6 +18,7 @@
|
||||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/sed-opal.h>
|
#include <linux/once.h>
|
||||||
#include <linux/pci-p2pdma.h>
|
#include <linux/pci.h>
|
||||||
+#include <linux/suspend.h>
|
+#include <linux/suspend.h>
|
||||||
|
#include <linux/t10-pi.h>
|
||||||
|
#include <linux/types.h>
|
||||||
|
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||||
|
@@ -116,6 +117,7 @@ struct nvme_dev {
|
||||||
|
u32 cmbsz;
|
||||||
|
u32 cmbloc;
|
||||||
|
struct nvme_ctrl ctrl;
|
||||||
|
+ u32 last_ps;
|
||||||
|
|
||||||
#include "trace.h"
|
mempool_t *iod_mempool;
|
||||||
#include "nvme.h"
|
|
||||||
@@ -2847,8 +2848,11 @@ static int nvme_suspend(struct device *dev)
|
@@ -2843,16 +2845,94 @@ static void nvme_remove(struct pci_dev *pdev)
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM_SLEEP
|
||||||
|
+static int nvme_get_power_state(struct nvme_ctrl *ctrl, u32 *ps)
|
||||||
|
+{
|
||||||
|
+ return nvme_get_features(ctrl, NVME_FEAT_POWER_MGMT, 0, NULL, 0, ps);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int nvme_set_power_state(struct nvme_ctrl *ctrl, u32 ps)
|
||||||
|
+{
|
||||||
|
+ return nvme_set_features(ctrl, NVME_FEAT_POWER_MGMT, ps, NULL, 0, NULL);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int nvme_resume(struct device *dev)
|
||||||
|
+{
|
||||||
|
+ struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev));
|
||||||
|
+ struct nvme_ctrl *ctrl = &ndev->ctrl;
|
||||||
|
+
|
||||||
|
+ if (pm_resume_via_firmware() || !ctrl->npss ||
|
||||||
|
+ nvme_set_power_state(ctrl, ndev->last_ps) != 0)
|
||||||
|
+ nvme_reset_ctrl(ctrl);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int nvme_suspend(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pdev = to_pci_dev(dev);
|
struct pci_dev *pdev = to_pci_dev(dev);
|
||||||
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
||||||
+ struct nvme_ctrl *ctrl = &ndev->ctrl;
|
+ struct nvme_ctrl *ctrl = &ndev->ctrl;
|
||||||
|
+ int ret = -EBUSY;
|
||||||
+
|
+
|
||||||
+ if (!(pm_suspend_via_s2idle() && (ctrl->quirks & NVME_QUIRK_NO_DISABLE)))
|
+ /*
|
||||||
|
+ * The platform does not remove power for a kernel managed suspend so
|
||||||
|
+ * use host managed nvme power settings for lowest idle power if
|
||||||
|
+ * possible. This should have quicker resume latency than a full device
|
||||||
|
+ * shutdown. But if the firmware is involved after the suspend or the
|
||||||
|
+ * device does not support any non-default power states, shut down the
|
||||||
|
+ * device fully.
|
||||||
|
+ */
|
||||||
|
+ if (pm_suspend_via_firmware() || !ctrl->npss) {
|
||||||
+ nvme_dev_disable(ndev, true);
|
+ nvme_dev_disable(ndev, true);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ nvme_start_freeze(ctrl);
|
||||||
|
+ nvme_wait_freeze(ctrl);
|
||||||
|
+ nvme_sync_queues(ctrl);
|
||||||
|
+
|
||||||
|
+ if (ctrl->state != NVME_CTRL_LIVE &&
|
||||||
|
+ ctrl->state != NVME_CTRL_ADMIN_ONLY)
|
||||||
|
+ goto unfreeze;
|
||||||
|
+
|
||||||
|
+ ndev->last_ps = 0;
|
||||||
|
+ ret = nvme_get_power_state(ctrl, &ndev->last_ps);
|
||||||
|
+ if (ret < 0)
|
||||||
|
+ goto unfreeze;
|
||||||
|
+
|
||||||
|
+ ret = nvme_set_power_state(ctrl, ctrl->npss);
|
||||||
|
+ if (ret < 0)
|
||||||
|
+ goto unfreeze;
|
||||||
|
+
|
||||||
|
+ if (ret) {
|
||||||
|
+ /*
|
||||||
|
+ * Clearing npss forces a controller reset on resume. The
|
||||||
|
+ * correct value will be resdicovered then.
|
||||||
|
+ */
|
||||||
|
+ nvme_dev_disable(ndev, true);
|
||||||
|
+ ctrl->npss = 0;
|
||||||
|
+ ret = 0;
|
||||||
|
+ goto unfreeze;
|
||||||
|
+ }
|
||||||
|
+ /*
|
||||||
|
+ * A saved state prevents pci pm from generically controlling the
|
||||||
|
+ * device's power. If we're using protocol specific settings, we don't
|
||||||
|
+ * want pci interfering.
|
||||||
|
+ */
|
||||||
|
+ pci_save_state(pdev);
|
||||||
|
+unfreeze:
|
||||||
|
+ nvme_unfreeze(ctrl);
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int nvme_simple_suspend(struct device *dev)
|
||||||
|
+{
|
||||||
|
+ struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev));
|
||||||
|
|
||||||
- nvme_dev_disable(ndev, true);
|
nvme_dev_disable(ndev, true);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2954,6 +2958,10 @@ static const struct pci_device_id nvme_id_table[] = {
|
-static int nvme_resume(struct device *dev)
|
||||||
.driver_data = NVME_QUIRK_LIGHTNVM, },
|
+static int nvme_simple_resume(struct device *dev)
|
||||||
{ PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */
|
{
|
||||||
.driver_data = NVME_QUIRK_LIGHTNVM, },
|
struct pci_dev *pdev = to_pci_dev(dev);
|
||||||
+ { PCI_VDEVICE(SK_HYNIX, 0x1527), /* Sk Hynix */
|
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
||||||
+ .driver_data = NVME_QUIRK_NO_DISABLE, },
|
@@ -2860,9 +2940,16 @@ static int nvme_resume(struct device *dev)
|
||||||
+ { PCI_VDEVICE(TOSHIBA, 0x010f), /* TOSHIBA NVMe found on Surface Book with Performance Base */
|
nvme_reset_ctrl(&ndev->ctrl);
|
||||||
+ .driver_data = NVME_QUIRK_NO_DISABLE, },
|
return 0;
|
||||||
{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
|
}
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
|
-#endif
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
|
|
||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
|
||||||
index 0f16acc323c6..b9ddb77586c7 100644
|
|
||||||
--- a/drivers/pci/quirks.c
|
|
||||||
+++ b/drivers/pci/quirks.c
|
|
||||||
@@ -1356,6 +1356,10 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID,
|
|
||||||
occur when mode detecting */
|
|
||||||
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_VIA, PCI_ANY_ID,
|
|
||||||
PCI_CLASS_STORAGE_IDE, 8, quirk_no_ata_d3);
|
|
||||||
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SK_HYNIX, 0x1527, quirk_no_ata_d3);
|
|
||||||
+/* TOSHIBA NVMe disk found on Surface Book with Performance Base
|
|
||||||
+ cannot wakeup from D3 state after s2idle */
|
|
||||||
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_TOSHIBA, 0x010f, quirk_no_ata_d3);
|
|
||||||
|
|
||||||
/*
|
-static SIMPLE_DEV_PM_OPS(nvme_dev_pm_ops, nvme_suspend, nvme_resume);
|
||||||
* This was originally an Alpha-specific thing, but it really fits here.
|
+const struct dev_pm_ops nvme_dev_pm_ops = {
|
||||||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
|
+ .suspend = nvme_suspend,
|
||||||
index 70e86148cb1e..44e07bd7e7ee 100644
|
+ .resume = nvme_resume,
|
||||||
--- a/include/linux/pci_ids.h
|
+ .freeze = nvme_simple_suspend,
|
||||||
+++ b/include/linux/pci_ids.h
|
+ .thaw = nvme_simple_resume,
|
||||||
@@ -3102,4 +3102,6 @@
|
+ .poweroff = nvme_simple_suspend,
|
||||||
|
+ .restore = nvme_simple_resume,
|
||||||
|
+};
|
||||||
|
+#endif /* CONFIG_PM_SLEEP */
|
||||||
|
|
||||||
#define PCI_VENDOR_ID_NCUBE 0x10ff
|
static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev,
|
||||||
|
pci_channel_state_t state)
|
||||||
+#define PCI_VENDOR_ID_SK_HYNIX 0x1c5c
|
@@ -2967,9 +3054,11 @@ static struct pci_driver nvme_driver = {
|
||||||
+
|
.probe = nvme_probe,
|
||||||
#endif /* _LINUX_PCI_IDS_H */
|
.remove = nvme_remove,
|
||||||
|
.shutdown = nvme_shutdown,
|
||||||
|
+#ifdef CONFIG_PM_SLEEP
|
||||||
|
.driver = {
|
||||||
|
.pm = &nvme_dev_pm_ops,
|
||||||
|
},
|
||||||
|
+#endif
|
||||||
|
.sriov_configure = pci_sriov_configure_simple,
|
||||||
|
.err_handler = &nvme_err_handler,
|
||||||
|
};
|
||||||
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
|
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
|
||||||
index 096211299c07..0cb0fe170977 100644
|
index 096211299..0cb0fe170 100644
|
||||||
--- a/kernel/power/suspend.c
|
--- a/kernel/power/suspend.c
|
||||||
+++ b/kernel/power/suspend.c
|
+++ b/kernel/power/suspend.c
|
||||||
@@ -533,6 +533,8 @@ int suspend_devices_and_enter(suspend_state_t state)
|
@@ -533,6 +533,8 @@ int suspend_devices_and_enter(suspend_state_t state)
|
||||||
|
@ -120,10 +257,10 @@ index 096211299c07..0cb0fe170977 100644
|
||||||
pm_notifier_call_chain(PM_POST_SUSPEND);
|
pm_notifier_call_chain(PM_POST_SUSPEND);
|
||||||
pm_restore_console();
|
pm_restore_console();
|
||||||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
||||||
index 1beca96fb625..4b98db9bbc88 100644
|
index fb9633b8b..a203942f8 100644
|
||||||
--- a/kernel/sysctl.c
|
--- a/kernel/sysctl.c
|
||||||
+++ b/kernel/sysctl.c
|
+++ b/kernel/sysctl.c
|
||||||
@@ -318,7 +318,16 @@ static int min_extfrag_threshold;
|
@@ -321,7 +321,16 @@ static int min_extfrag_threshold;
|
||||||
static int max_extfrag_threshold = 1000;
|
static int max_extfrag_threshold = 1000;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue