Commit b9d1ec53 authored by Caleb Sander Mateos's avatar Caleb Sander Mateos Committed by Christoph Hellwig
Browse files

nvme-pci: factor out a nvme_init_hctx_common() helper 



nvme_init_hctx() and nvme_admin_init_hctx() are very similar. In
preparation for adding more logic, factor out a nvme_init_hctx-common()
helper.

Signed-off-by: default avatarCaleb Sander Mateos <csander@purestorage.com>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1c9a93bf

drivers/nvme/host/pci.c

+15 −13
Original line number Diff line number Diff line
@@ -397,28 +397,30 @@ static int nvme_pci_npages_prp(void) 
	return DIV_ROUND_UP(8 * nprps, NVME_CTRL_PAGE_SIZE - 8);

}



static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,

				unsigned int hctx_idx)

static int nvme_init_hctx_common(struct blk_mq_hw_ctx *hctx, void *data,

		unsigned qid)

{

	struct nvme_dev *dev = to_nvme_dev(data);

	struct nvme_queue *nvmeq = &dev->queues[0];



	WARN_ON(hctx_idx != 0);

	WARN_ON(dev->admin_tagset.tags[0] != hctx->tags);

	struct nvme_queue *nvmeq = &dev->queues[qid];

	struct blk_mq_tags *tags;



	tags = qid ? dev->tagset.tags[qid - 1] : dev->admin_tagset.tags[0];

	WARN_ON(tags != hctx->tags);

	hctx->driver_data = nvmeq;

	return 0;

}



static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,

static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,

				unsigned int hctx_idx)

{

	struct nvme_dev *dev = to_nvme_dev(data);

	struct nvme_queue *nvmeq = &dev->queues[hctx_idx + 1];

	WARN_ON(hctx_idx != 0);

	return nvme_init_hctx_common(hctx, data, 0);

}



	WARN_ON(dev->tagset.tags[hctx_idx] != hctx->tags);

	hctx->driver_data = nvmeq;

	return 0;

static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,

			     unsigned int hctx_idx)

{

	return nvme_init_hctx_common(hctx, data, hctx_idx + 1);

}



static int nvme_pci_init_request(struct blk_mq_tag_set *set,