Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 363c9aac authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Jens Axboe
Browse files

nvme: Move nvme_freeze/unfreeze_queues to nvme core 



Nothing pci specific about them and We'll need them exported
in other transports too.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent c89e5b80

drivers/nvme/host/core.c

+28 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,34 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 
	return ret;

}



void nvme_freeze_queues(struct nvme_ctrl *ctrl)

{

	struct nvme_ns *ns;



	list_for_each_entry(ns, &ctrl->namespaces, list) {

		blk_mq_freeze_queue_start(ns->queue);



		spin_lock_irq(ns->queue->queue_lock);

		queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue);

		spin_unlock_irq(ns->queue->queue_lock);



		blk_mq_cancel_requeue_work(ns->queue);

		blk_mq_stop_hw_queues(ns->queue);

	}

}



void nvme_unfreeze_queues(struct nvme_ctrl *ctrl)

{

	struct nvme_ns *ns;



	list_for_each_entry(ns, &ctrl->namespaces, list) {

		queue_flag_clear_unlocked(QUEUE_FLAG_STOPPED, ns->queue);

		blk_mq_unfreeze_queue(ns->queue);

		blk_mq_start_stopped_hw_queues(ns->queue, true);

		blk_mq_kick_requeue_list(ns->queue);

	}

}



int __init nvme_core_init(void)

{

	int result;

drivers/nvme/host/nvme.h

+3 −0
Original line number Diff line number Diff line
@@ -237,6 +237,9 @@ int nvme_init_identify(struct nvme_ctrl *ctrl); 
void nvme_scan_namespaces(struct nvme_ctrl *ctrl);

void nvme_remove_namespaces(struct nvme_ctrl *ctrl);



void nvme_freeze_queues(struct nvme_ctrl *ctrl);

void nvme_unfreeze_queues(struct nvme_ctrl *ctrl);



struct request *nvme_alloc_request(struct request_queue *q,

		struct nvme_command *cmd, unsigned int flags);

void nvme_requeue_req(struct request *req);

drivers/nvme/host/pci.c

+2 −30
Original line number Diff line number Diff line
@@ -1903,34 +1903,6 @@ static void nvme_dev_list_remove(struct nvme_dev *dev) 
		kthread_stop(tmp);

}



static void nvme_freeze_queues(struct nvme_dev *dev)

{

	struct nvme_ns *ns;



	list_for_each_entry(ns, &dev->ctrl.namespaces, list) {

		blk_mq_freeze_queue_start(ns->queue);



		spin_lock_irq(ns->queue->queue_lock);

		queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue);

		spin_unlock_irq(ns->queue->queue_lock);



		blk_mq_cancel_requeue_work(ns->queue);

		blk_mq_stop_hw_queues(ns->queue);

	}

}



static void nvme_unfreeze_queues(struct nvme_dev *dev)

{

	struct nvme_ns *ns;



	list_for_each_entry(ns, &dev->ctrl.namespaces, list) {

		queue_flag_clear_unlocked(QUEUE_FLAG_STOPPED, ns->queue);

		blk_mq_unfreeze_queue(ns->queue);

		blk_mq_start_stopped_hw_queues(ns->queue, true);

		blk_mq_kick_requeue_list(ns->queue);

	}

}



static void nvme_dev_shutdown(struct nvme_dev *dev)

{

	int i;
@@ -1940,7 +1912,7 @@ static void nvme_dev_shutdown(struct nvme_dev *dev) 


	mutex_lock(&dev->shutdown_lock);

	if (dev->bar) {

		nvme_freeze_queues(dev);

		nvme_freeze_queues(&dev->ctrl);

		csts = readl(dev->bar + NVME_REG_CSTS);

	}

	if (csts & NVME_CSTS_CFS || !(csts & NVME_CSTS_RDY)) {
@@ -2049,7 +2021,7 @@ static void nvme_reset_work(struct work_struct *work) 
		dev_warn(dev->dev, "IO queues not created\n");

		nvme_remove_namespaces(&dev->ctrl);

	} else {

		nvme_unfreeze_queues(dev);

		nvme_unfreeze_queues(&dev->ctrl);

		nvme_dev_add(dev);

	}