nvme-apple: reset controller during shutdown
authorJanne Grunau <j@jannau.net>
Tue, 17 Jan 2023 18:25:00 +0000 (19:25 +0100)
committerChristoph Hellwig <hch@lst.de>
Thu, 19 Jan 2023 08:07:35 +0000 (09:07 +0100)
commitc06ba7b892a50b48522ad441a40053f483dfee9e
tree3cf4ee041ffcab317c14daa58020a37291b82373
parent7746564793978fe2f43b18a302b22dca0ad3a0e8
nvme-apple: reset controller during shutdown

This is a functional revert of c76b8308e4c9 ("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: c76b8308e4c9 ("nvme-apple: fix controller shutdown in apple_nvme_disable")
Reported-by: Janne Grunau <j@jannau.net>
Link: https://lore.kernel.org/all/20230110174745.GA3576@jannau.net/
Signed-off-by: Janne Grunau <j@jannau.net>
[hch: updated with a more descriptive comment from Hector Martin]
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/apple.c