iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: do not try to reconfigure APST when the controller is not live

Browse Source 
commit 53fe2a30bc 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>
This commit is contained in:
Christoph Hellwig
2021-04-09 11:46:12 +02:00
committed by Greg Kroah-Hartman
parent aa9d659856
commit 7f6a9044ff
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/nvme/host/core.c
View File

@ -2414,7 +2414,8 @@ static void nvme_set_latency_tolerance(struct device *dev, s32 val)
if (ctrl->ps_max_latency_us != latency) { if (ctrl->ps_max_latency_us != latency) {
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);
} }
} }