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

Commit 8e5d31eb authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.10' of git://git.infradead.org/nvme into for-linus 

Christoph writes:

The most significant one is that we've agreed on shared maintaince and
a common repository for the PCIe NVMe driver and NVMe over Fabrics.  The
target code still only has a subset of the maintainers but goes through
the same tree as well.  Keith, Sagi and me will take turns at collecting
patches and sending you pull requests.
parents 72c5296f 7c3a23b8

MAINTAINERS

+7 −2
Original line number Diff line number Diff line
@@ -8852,17 +8852,22 @@ F: drivers/video/fbdev/nvidia/ 
NVM EXPRESS DRIVER

M:	Keith Busch <keith.busch@intel.com>

M:	Jens Axboe <axboe@fb.com>

M:	Christoph Hellwig <hch@lst.de>

M:	Sagi Grimberg <sagi@grimberg.me>

L:	linux-nvme@lists.infradead.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git

W:	https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/

T:	git://git.infradead.org/nvme.git

W:	http://git.infradead.org/nvme.git

S:	Supported

F:	drivers/nvme/host/

F:	include/linux/nvme.h

F:	include/uapi/linux/nvme_ioctl.h



NVM EXPRESS TARGET DRIVER

M:	Christoph Hellwig <hch@lst.de>

M:	Sagi Grimberg <sagi@grimberg.me>

L:	linux-nvme@lists.infradead.org

T:	git://git.infradead.org/nvme.git

W:	http://git.infradead.org/nvme.git

S:	Supported

F:	drivers/nvme/target/

drivers/nvme/host/core.c

+2 −15
Original line number Diff line number Diff line
@@ -1193,8 +1193,8 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, 
		blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);

		blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));

	}

	if (ctrl->stripe_size)

		blk_queue_chunk_sectors(q, ctrl->stripe_size >> 9);

	if (ctrl->quirks & NVME_QUIRK_STRIPE_SIZE)

		blk_queue_chunk_sectors(q, ctrl->max_hw_sectors);

	blk_queue_virt_boundary(q, ctrl->page_size - 1);

	if (ctrl->vwc & NVME_CTRL_VWC_PRESENT)

		vwc = true;
@@ -1250,19 +1250,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 
	ctrl->max_hw_sectors =

		min_not_zero(ctrl->max_hw_sectors, max_hw_sectors);



	if ((ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) && id->vs[3]) {

		unsigned int max_hw_sectors;



		ctrl->stripe_size = 1 << (id->vs[3] + page_shift);

		max_hw_sectors = ctrl->stripe_size >> (page_shift - 9);

		if (ctrl->max_hw_sectors) {

			ctrl->max_hw_sectors = min(max_hw_sectors,

							ctrl->max_hw_sectors);

		} else {

			ctrl->max_hw_sectors = max_hw_sectors;

		}

	}



	nvme_set_queue_limits(ctrl, ctrl->admin_q);

	ctrl->sgls = le32_to_cpu(id->sgls);

	ctrl->kas = le16_to_cpu(id->kas);

drivers/nvme/host/fc.c

+10 −9
Original line number Diff line number Diff line
@@ -1491,19 +1491,20 @@ static int 
nvme_fc_create_hw_io_queues(struct nvme_fc_ctrl *ctrl, u16 qsize)

{

	struct nvme_fc_queue *queue = &ctrl->queues[1];

	int i, j, ret;

	int i, ret;



	for (i = 1; i < ctrl->queue_count; i++, queue++) {

		ret = __nvme_fc_create_hw_queue(ctrl, queue, i, qsize);

		if (ret) {

			for (j = i-1; j >= 0; j--)

				__nvme_fc_delete_hw_queue(ctrl,

						&ctrl->queues[j], j);

			return ret;

		}

		if (ret)

			goto delete_queues;

	}



	return 0;



delete_queues:

	for (; i >= 0; i--)

		__nvme_fc_delete_hw_queue(ctrl, &ctrl->queues[i], i);

	return ret;

}



static int
@@ -2401,8 +2402,8 @@ __nvme_fc_create_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	WARN_ON_ONCE(!changed);



	dev_info(ctrl->ctrl.device,

		"NVME-FC{%d}: new ctrl: NQN \"%s\" (%p)\n",

		ctrl->cnum, ctrl->ctrl.opts->subsysnqn, &ctrl);

		"NVME-FC{%d}: new ctrl: NQN \"%s\"\n",

		ctrl->cnum, ctrl->ctrl.opts->subsysnqn);



	kref_get(&ctrl->ctrl.kref);

drivers/nvme/host/nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ struct nvme_ctrl { 


	u32 page_size;

	u32 max_hw_sectors;

	u32 stripe_size;

	u16 oncs;

	u16 vid;

	atomic_t abort_limit;

drivers/nvme/host/pci.c

+3 −10
Original line number Diff line number Diff line
@@ -712,15 +712,8 @@ static void __nvme_process_cq(struct nvme_queue *nvmeq, unsigned int *tag) 
		req = blk_mq_tag_to_rq(*nvmeq->tags, cqe.command_id);

		nvme_req(req)->result = cqe.result;

		blk_mq_complete_request(req, le16_to_cpu(cqe.status) >> 1);



	}



	/* If the controller ignores the cq head doorbell and continuously

	 * writes to the queue, it is theoretically possible to wrap around

	 * the queue twice and mistakenly return IRQ_NONE.  Linux only

	 * requires that 0.1% of your interrupts are handled, so this isn't

	 * a big problem.

	 */

	if (head == nvmeq->cq_head && phase == nvmeq->cq_phase)

		return;