Skip to content
Commit c06ba7b8 authored by Janne Grunau's avatar Janne Grunau Committed by Christoph Hellwig
Browse files

nvme-apple: reset controller during shutdown



This is a functional revert of c76b8308 ("nvme-apple: fix controller
shutdown in apple_nvme_disable").

The commit broke suspend/resume since apple_nvme_reset_work() tries to
disable the controller on resume. This does not work for the apple NVMe
controller since register access only works while the co-processor
firmware is running.

Disabling the NVMe controller in the shutdown path is also required
for shutting the co-processor down. The original code was appropriate
for this hardware. Add a comment to prevent a similar breaking changes
in the future.

Fixes: c76b8308 ("nvme-apple: fix controller shutdown in apple_nvme_disable")
Reported-by: default avatarJanne Grunau <j@jannau.net>
Link: https://lore.kernel.org/all/20230110174745.GA3576@jannau.net/


Signed-off-by: default avatarJanne Grunau <j@jannau.net>
[hch: updated with a more descriptive comment from Hector Martin]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 77465647
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment