aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-04-09 11:46:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-19 10:08:33 +0200
commit7f6a9044ff241ba45b3842c36212efe7a09b1443 (patch)
treedba39d775b8edcc48e58a1379fcea3f43340cea3
parentaa9d659856b170e042ab428c08e2bd5e6c232181 (diff)
downloadlinux-yocto-7f6a9044ff241ba45b3842c36212efe7a09b1443.tar.gz
linux-yocto-7f6a9044ff241ba45b3842c36212efe7a09b1443.tar.bz2
linux-yocto-7f6a9044ff241ba45b3842c36212efe7a09b1443.zip
nvme: do not try to reconfigure APST when the controller is not live
commit 53fe2a30bc168db9700e00206d991ff934973cf1 upstream. Do not call nvme_configure_apst when the controller is not live, given that nvme_configure_apst will fail due the lack of an admin queue when the controller is being torn down and nvme_set_latency_tolerance is called from dev_pm_qos_hide_latency_tolerance. Fixes: 510a405d945b("nvme: fix memory leak for power latency tolerance") Reported-by: Peng Liu <liupeng17@lenovo.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/nvme/host/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 67ea531e8b34..6041511b8b76 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2414,7 +2414,8 @@ static void nvme_set_latency_tolerance(struct device *dev, s32 val)
if (ctrl->ps_max_latency_us != latency) {
ctrl->ps_max_latency_us = latency;
- nvme_configure_apst(ctrl);
+ if (ctrl->state == NVME_CTRL_LIVE)
+ nvme_configure_apst(ctrl);
}
}