Re: [PATCH 2/9] nvme: use nvme_wait_ready in nvme_shutdown_ctrl

Pankaj Raghav
2022-11-29T16:28:19Z

On Tue, Nov 29, 2022 at 02:22:01PM +0100, Christoph Hellwig wrote:
> Refactor the code to wait for CSTS state changes so that it can be reused
> by nvme_shutdown_ctrl.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/nvme/host/core.c | 36 +++++++++++-------------------------
> 1 file changed, 11 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 02cc8dfc9f0b59..9f20af2406dcc8 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -2260,16 +2260,17 @@ static const struct block_device_operations nvme_bdev_ops = {
> .pr_ops = &nvme_pr_ops,
> };
>
> -static int nvme_wait_ready(struct nvme_ctrl *ctrl, u32 timeout, bool enabled)
> +static int nvme_wait_ready(struct nvme_ctrl *ctrl, u32 mask, u32 val,
> + u32 timeout, const char *op)
> {
> unsigned long timeout_jiffies = ((timeout + 1) * HZ / 2) + jiffies;
The timeout_jiffies calculation in nvme_shutdown_ctrl is:
unsigned long timeout = jiffies + (ctrl->shutdown_timeout * HZ);

Aren't we changing the timeout with this change to something
different compared to what it was before for shutdown?

> - u32 csts, bit = enabled ? NVME_CSTS_RDY : 0;
> + u32 csts;
> int ret;
>
> while ((ret = ctrl->ops->reg_read32(ctrl, NVME_REG_CSTS, &csts)) == 0) {
> if (csts == ~0)
> return -ENODEV;
> - if ((csts & NVME_CSTS_RDY) == bit)
> + if ((csts & mask) == val)
> break;
>
> usleep_range(1000, 2000);
> @@ -2278,7 +2279,7 @@ static int nvme_wait_ready(struct nvme_ctrl *ctrl, u32 timeout, bool enabled)
> if (time_after(jiffies, timeout_jiffies)) {
> dev_err(ctrl->device,
> "Device not ready; aborting %s, CSTS=0x%x\n",
> - enabled ? "initialisation" : "reset", csts);
> + op, csts);
> return -ENODEV;
> }
> }