Skip to content

nvme-apple: Fix suspend-resume regression

Hector Martin asahi linux-arm-kernel linux-nvme lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 6 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2nvme-apple: Do not try to shut down the controller twicedrivers/nvme/host/apple.c+2 -15 replies
2/2nvme: Handle shut down controllers during initializationdrivers/nvme/host/core.c+13 -01 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] nvme-apple: Fix suspend-resume regression

Commit c76b8308e4c9 introduced a behavior change in the way nvme-apple disables controllers, avoiding a disable in the shutdown path. Unfortunately, the NVMe core does not know how to actually start up controllers in the shutdown state, and this broke suspend/resume since we use the shutdown command for device suspend in nvme-apple.

Additionally, nvme-apple was also checking only for the disable state in the reset path to decide whether to disable the controller again, and just having the controller shut down was triggering an unnecessary code path that broke things further.

This short series fixes those issues and makes suspend/resume work on nvme-apple again.

nvme-pci is, to my knowledge, not affected since it only issues a shutdown when the whole system is actually shutting down, never to come back.

Hector Martin (2):
nvme-apple: Do not try to shut down the controller twice
nvme: Handle shut down controllers during initialization

 drivers/nvme/host/apple.c |  3 ++-
 drivers/nvme/host/core.c  | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
Signature · 1 line
2.35.1