Commit 285b6e9b authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: merge nvme_shutdown_ctrl into nvme_disable_ctrl 



Many of the callers decide which one to use based on a bool argument and
there is at least some code to be shared, so merge these two.  Also
move a comment specific to a single callsite to that callsite.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarHector Martin <marcan@marcan.st>
parent e6d275de

drivers/nvme/host/apple.c

+1 −4
Original line number Diff line number Diff line
@@ -829,10 +829,7 @@ static void apple_nvme_disable(struct apple_nvme *anv, bool shutdown) 
			apple_nvme_remove_cq(anv);

		}



		if (shutdown)

			nvme_shutdown_ctrl(&anv->ctrl);

		else

			nvme_disable_ctrl(&anv->ctrl);

		nvme_disable_ctrl(&anv->ctrl, shutdown);

	}



	WRITE_ONCE(anv->ioq.enabled, false);

drivers/nvme/host/core.c

+10 −23
Original line number Diff line number Diff line
@@ -2279,23 +2279,25 @@ static int nvme_wait_ready(struct nvme_ctrl *ctrl, u32 mask, u32 val, 
	return ret;

}



/*

 * If the device has been passed off to us in an enabled state, just clear

 * the enabled bit.  The spec says we should set the 'shutdown notification

 * bits', but doing so may cause the device to complete commands to the

 * admin queue ... and we don't know what memory that might be pointing at!

 */

int nvme_disable_ctrl(struct nvme_ctrl *ctrl)

int nvme_disable_ctrl(struct nvme_ctrl *ctrl, bool shutdown)

{

	int ret;



	ctrl->ctrl_config &= ~NVME_CC_SHN_MASK;

	if (shutdown)

		ctrl->ctrl_config |= NVME_CC_SHN_NORMAL;

	else

		ctrl->ctrl_config &= ~NVME_CC_ENABLE;



	ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config);

	if (ret)

		return ret;



	if (shutdown) {

		return nvme_wait_ready(ctrl, NVME_CSTS_SHST_MASK,

				       NVME_CSTS_SHST_CMPLT,

				       ctrl->shutdown_timeout, "shutdown");

	}

	if (ctrl->quirks & NVME_QUIRK_DELAY_BEFORE_CHK_RDY)

		msleep(NVME_QUIRK_DELAY_AMOUNT);

	return nvme_wait_ready(ctrl, NVME_CSTS_RDY, 0,
@@ -2369,21 +2371,6 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) 
}

EXPORT_SYMBOL_GPL(nvme_enable_ctrl);



int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl)

{

	int ret;



	ctrl->ctrl_config &= ~NVME_CC_SHN_MASK;

	ctrl->ctrl_config |= NVME_CC_SHN_NORMAL;



	ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config);

	if (ret)

		return ret;

	return nvme_wait_ready(ctrl, NVME_CSTS_SHST_MASK, NVME_CSTS_SHST_CMPLT,

			       ctrl->shutdown_timeout, "shutdown");

}

EXPORT_SYMBOL_GPL(nvme_shutdown_ctrl);



static int nvme_configure_timestamp(struct nvme_ctrl *ctrl)

{

	__le64 ts;

drivers/nvme/host/fc.c

+1 −1
Original line number Diff line number Diff line
@@ -2518,7 +2518,7 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) 
	 * Other transports, which don't have link-level contexts bound

	 * to sqe's, would try to gracefully shutdown the controller by

	 * writing the registers for shutdown and polling (call

	 * nvme_shutdown_ctrl()). Given a bunch of i/o was potentially

	 * nvme_disable_ctrl()). Given a bunch of i/o was potentially

	 * just aborted and we will wait on those contexts, and given

	 * there was no indication of how live the controlelr is on the

	 * link, don't send more io to create more contexts for the

drivers/nvme/host/nvme.h

+1 −2
Original line number Diff line number Diff line
@@ -733,9 +733,8 @@ void nvme_cancel_tagset(struct nvme_ctrl *ctrl); 
void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl);

bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,

		enum nvme_ctrl_state new_state);

int nvme_disable_ctrl(struct nvme_ctrl *ctrl);

int nvme_disable_ctrl(struct nvme_ctrl *ctrl, bool shutdown);

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);

void nvme_uninit_ctrl(struct nvme_ctrl *ctrl);

drivers/nvme/host/pci.c

+9 −6
Original line number Diff line number Diff line
@@ -1500,11 +1500,7 @@ static void nvme_disable_admin_queue(struct nvme_dev *dev, bool shutdown) 
{

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



	if (shutdown)

		nvme_shutdown_ctrl(&dev->ctrl);

	else

		nvme_disable_ctrl(&dev->ctrl);



	nvme_disable_ctrl(&dev->ctrl, shutdown);

	nvme_poll_irqdisable(nvmeq);

}
@@ -1819,7 +1815,14 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev) 
	    (readl(dev->bar + NVME_REG_CSTS) & NVME_CSTS_NSSRO))

		writel(NVME_CSTS_NSSRO, dev->bar + NVME_REG_CSTS);



	result = nvme_disable_ctrl(&dev->ctrl);

	/*

	 * If the device has been passed off to us in an enabled state, just

	 * clear the enabled bit.  The spec says we should set the 'shutdown

	 * notification bits', but doing so may cause the device to complete

	 * commands to the admin queue ... and we don't know what memory that

	 * might be pointing at!

	 */

	result = nvme_disable_ctrl(&dev->ctrl, false);

	if (result < 0)

		return result;