nvme: move sqsize setting to the core (c0f2f45b) · Commits · 戴 / test

drivers/nvme/host/core.c

+11 −9

Original line number	Diff line number	Diff line
		@@ -1968,16 +1968,23 @@ int nvme_disable_ctrl(struct nvme_ctrl *ctrl, u64 cap)
		}
		EXPORT_SYMBOL_GPL(nvme_disable_ctrl);

		int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap)
		int nvme_enable_ctrl(struct nvme_ctrl *ctrl)
		{
		/*
		* Default to a 4K page size, with the intention to update this
		* path in the future to accomodate architectures with differing
		* kernel and IO page sizes.
		*/
		unsigned dev_page_min = NVME_CAP_MPSMIN(cap) + 12, page_shift = 12;
		unsigned dev_page_min, page_shift = 12;
		int ret;

		ret = ctrl->ops->reg_read64(ctrl, NVME_REG_CAP, &ctrl->cap);
		if (ret) {
		dev_err(ctrl->device, "Reading CAP failed (%d)\n", ret);
		return ret;
		}
		dev_page_min = NVME_CAP_MPSMIN(ctrl->cap) + 12;

		if (page_shift < dev_page_min) {
		dev_err(ctrl->device,
		"Minimum device page size %u too large for host (%u)\n",
		@@ -1996,7 +2003,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap)
		ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config);
		if (ret)
		return ret;
		return nvme_wait_ready(ctrl, cap, true);
		return nvme_wait_ready(ctrl, ctrl->cap, true);
		}
		EXPORT_SYMBOL_GPL(nvme_enable_ctrl);

		@@ -2571,13 +2578,8 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
		dev_err(ctrl->device, "Reading VS failed (%d)\n", ret);
		return ret;
		}

		ret = ctrl->ops->reg_read64(ctrl, NVME_REG_CAP, &ctrl->cap);
		if (ret) {
		dev_err(ctrl->device, "Reading CAP failed (%d)\n", ret);
		return ret;
		}
		page_shift = NVME_CAP_MPSMIN(ctrl->cap) + 12;
		ctrl->sqsize = min_t(int, NVME_CAP_MQES(ctrl->cap), ctrl->sqsize);

		if (ctrl->vs >= NVME_VS(1, 1, 0))
		ctrl->subsystem = NVME_CAP_NSSRC(ctrl->cap);

drivers/nvme/host/fc.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -2648,17 +2648,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
		* prior connection values
		*/

		ret = nvmf_reg_read64(&ctrl->ctrl, NVME_REG_CAP, &ctrl->ctrl.cap);
		if (ret) {
		dev_err(ctrl->ctrl.device,
		"prop_get NVME_REG_CAP failed\n");
		goto out_disconnect_admin_queue;
		}

		ctrl->ctrl.sqsize =
		min_t(int, NVME_CAP_MQES(ctrl->ctrl.cap), ctrl->ctrl.sqsize);

		ret = nvme_enable_ctrl(&ctrl->ctrl, ctrl->ctrl.cap);
		ret = nvme_enable_ctrl(&ctrl->ctrl);
		if (ret)
		goto out_disconnect_admin_queue;

drivers/nvme/host/nvme.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ bool nvme_cancel_request(struct request req, void data, bool reserved);
		bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
		enum nvme_ctrl_state new_state);
		int nvme_disable_ctrl(struct nvme_ctrl *ctrl, u64 cap);
		int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap);
		int nvme_enable_ctrl(struct nvme_ctrl *ctrl);
		int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl);
		int nvme_init_ctrl(struct nvme_ctrl ctrl, struct device dev,
		const struct nvme_ctrl_ops *ops, unsigned long quirks);

drivers/nvme/host/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1695,7 +1695,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev)
		lo_hi_writeq(nvmeq->sq_dma_addr, dev->bar + NVME_REG_ASQ);
		lo_hi_writeq(nvmeq->cq_dma_addr, dev->bar + NVME_REG_ACQ);

		result = nvme_enable_ctrl(&dev->ctrl, dev->ctrl.cap);
		result = nvme_enable_ctrl(&dev->ctrl);
		if (result)
		return result;

drivers/nvme/host/rdma.c

+1 −12

Original line number	Diff line number	Diff line
		@@ -803,18 +803,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
		if (error)
		goto out_cleanup_queue;

		error = ctrl->ctrl.ops->reg_read64(&ctrl->ctrl, NVME_REG_CAP,
		&ctrl->ctrl.cap);
		if (error) {
		dev_err(ctrl->ctrl.device,
		"prop_get NVME_REG_CAP failed\n");
		goto out_stop_queue;
		}

		ctrl->ctrl.sqsize =
		min_t(int, NVME_CAP_MQES(ctrl->ctrl.cap), ctrl->ctrl.sqsize);

		error = nvme_enable_ctrl(&ctrl->ctrl, ctrl->ctrl.cap);
		error = nvme_enable_ctrl(&ctrl->ctrl);
		if (error)
		goto out_stop_queue;

Admin message