On Thu, 2019-10-03 at 15:13 -0400, Tyler Ramer wrote: > Always shutdown the controller when nvme_remove_dead_controller is > reached. > > It's possible for nvme_remove_dead_controller to be called as part of a > failed reset, when there is a bad NVME_CSTS. The controller won't > be comming back online, so we should shut it down rather than just > disabling. >
I would add that nvme_timeout() would go through the nvme_should_reset() path where we don't shutdown the device during nvme_dev_disable, it makes sense to do a full shutdown during nvme_remove_deal_ctrl work() when reset fails. > Signed-off-by: Tyler Ramer <tyara...@gmail.com> > --- Reviewed-by: Balbir Singh <sbl...@amazon.com> > drivers/nvme/host/pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index c0808f9eb8ab..c3f5ba22c625 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -2509,7 +2509,7 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl) > static void nvme_remove_dead_ctrl(struct nvme_dev *dev) > { > nvme_get_ctrl(&dev->ctrl); > - nvme_dev_disable(dev, false); > + nvme_dev_disable(dev, true); > nvme_kill_queues(&dev->ctrl); > if (!queue_work(nvme_wq, &dev->remove_work)) > nvme_put_ctrl(&dev->ctrl);