xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme-pci: refactor nvme_disable_io_queues

Browse Source 
Pass the opcode for the delete SQ/CQ command as an argument instead of
the somewhat confusing pass loop.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig
2018-12-02 17:46:21 +01:00
committed by Jens Axboe
parent 0b2a8a9f4b
commit 5271edd41d
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/nvme/host/pci.c
View File

@@ -2244,31 +2244,29 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode)
return 0; return 0;
} }
static void nvme_disable_io_queues(struct nvme_dev *dev) static bool nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode)
{ {
int pass, queues = dev->online_queues - 1; int nr_queues = dev->online_queues - 1, sent = 0;
unsigned long timeout; unsigned long timeout;
u8 opcode = nvme_admin_delete_sq;
for (pass = 0; pass < 2; pass++) { reinit_completion(&dev->ioq_wait);
int sent = 0, i = queues;
reinit_completion(&dev->ioq_wait);
retry: retry:
timeout = ADMIN_TIMEOUT; timeout = ADMIN_TIMEOUT;
for (; i > 0; i--, sent++) while (nr_queues > 0) {
if (nvme_delete_queue(&dev->queues[i], opcode)) if (nvme_delete_queue(&dev->queues[nr_queues], opcode))
break; break;
nr_queues--;
while (sent--) { sent++;
timeout = wait_for_completion_io_timeout(&dev->ioq_wait, timeout);
if (timeout == 0)
return;
if (i)
goto retry;
}
opcode = nvme_admin_delete_cq;
} }
while (sent--) {
timeout = wait_for_completion_io_timeout(&dev->ioq_wait,
timeout);
if (timeout == 0)
return false;
if (nr_queues)
goto retry;
}
return true;
} }
/* /*
@@ -2428,7 +2426,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
nvme_stop_queues(&dev->ctrl); nvme_stop_queues(&dev->ctrl);
if (!dead && dev->ctrl.queue_count > 0) { if (!dead && dev->ctrl.queue_count > 0) {
nvme_disable_io_queues(dev); if (nvme_disable_io_queues(dev, nvme_admin_delete_sq))
nvme_disable_io_queues(dev, nvme_admin_delete_cq);
nvme_disable_admin_queue(dev, shutdown); nvme_disable_admin_queue(dev, shutdown);
} }
for (i = dev->ctrl.queue_count - 1; i >= 0; i--) for (i = dev->ctrl.queue_count - 1; i >= 0; i--)