nvmet: pci-epf: clear CC and CSTS when disabling the controller

When a host shuts down the controller when shutting down but does so
without first disabling the controller, the enable bit remains set in
the controller configuration register. When the host restarts and
attempts to enable the controller again, the
nvmet_pci_epf_poll_cc_work() function is unable to detect the change
from 0 to 1 of the enable bit, and thus the controller is not enabled
again, which result in a device scan timeout on the host. This problem
also occurs if the host shuts down uncleanly or if the PCIe link goes
down: as the CC.EN value is not reset, the controller is not enabled
again when the host restarts.

Fix this by introducing the function nvmet_pci_epf_clear_ctrl_config()
to clear the CC and CSTS registers of the controller when the PCIe link
is lost (nvmet_pci_epf_stop_ctrl() function), or when starting the
controller fails (nvmet_pci_epf_enable_ctrl() fails). Also use this
function in nvmet_pci_epf_init_bar() to simplify the initialization of
the CC and CSTS registers.

Furthermore, modify the function nvmet_pci_epf_disable_ctrl() to clear
the CC.EN bit and write this updated value to the BAR register when the
controller is shutdown by the host, to ensure that upon restart, we can
detect the host setting CC.EN.

Fixes: 0faa0fe6f90e ("nvmet: New NVMe PCI endpoint function target driver")
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/target/pci-epf.c b/drivers/nvme/target/pci-epf.c
index 43296c05319c35c31d09878df09e92259ccc59af..c3d30d34f8cedcf0dc2de23922856267993f479d 100644 (file)
--- a/drivers/nvme/target/pci-epf.c
+++ b/drivers/nvme/target/pci-epf.c
@@ -1811,6 +1811,21 @@ static void nvmet_pci_epf_cq_work(struct work_struct *work)
                                   NVMET_PCI_EPF_CQ_RETRY_INTERVAL);
 }
 
+static void nvmet_pci_epf_clear_ctrl_config(struct nvmet_pci_epf_ctrl *ctrl)
+{
+       struct nvmet_ctrl *tctrl = ctrl->tctrl;
+
+       /* Initialize controller status. */
+       tctrl->csts = 0;
+       ctrl->csts = 0;
+       nvmet_pci_epf_bar_write32(ctrl, NVME_REG_CSTS, ctrl->csts);
+
+       /* Initialize controller configuration and start polling. */
+       tctrl->cc = 0;
+       ctrl->cc = 0;
+       nvmet_pci_epf_bar_write32(ctrl, NVME_REG_CC, ctrl->cc);
+}
+
 static int nvmet_pci_epf_enable_ctrl(struct nvmet_pci_epf_ctrl *ctrl)
 {
        u64 pci_addr, asq, acq;
@@ -1876,18 +1891,20 @@ static int nvmet_pci_epf_enable_ctrl(struct nvmet_pci_epf_ctrl *ctrl)
        return 0;
 
 err:
-       ctrl->csts = 0;
+       nvmet_pci_epf_clear_ctrl_config(ctrl);
        return -EINVAL;
 }
 
-static void nvmet_pci_epf_disable_ctrl(struct nvmet_pci_epf_ctrl *ctrl)
+static void nvmet_pci_epf_disable_ctrl(struct nvmet_pci_epf_ctrl *ctrl,
+                                      bool shutdown)
 {
        int qid;
 
        if (!ctrl->enabled)
                return;
 
-       dev_info(ctrl->dev, "Disabling controller\n");
+       dev_info(ctrl->dev, "%s controller\n",
+                shutdown ? "Shutting down" : "Disabling");
 
        ctrl->enabled = false;
        cancel_delayed_work_sync(&ctrl->poll_sqs);
@@ -1904,6 +1921,11 @@ static void nvmet_pci_epf_disable_ctrl(struct nvmet_pci_epf_ctrl *ctrl)
        nvmet_pci_epf_delete_cq(ctrl->tctrl, 0);
 
        ctrl->csts &= ~NVME_CSTS_RDY;
+       if (shutdown) {
+               ctrl->csts |= NVME_CSTS_SHST_CMPLT;
+               ctrl->cc &= ~NVME_CC_ENABLE;
+               nvmet_pci_epf_bar_write32(ctrl, NVME_REG_CC, ctrl->cc);
+       }
 }
 
 static void nvmet_pci_epf_poll_cc_work(struct work_struct *work)
@@ -1930,12 +1952,10 @@ static void nvmet_pci_epf_poll_cc_work(struct work_struct *work)
        }
 
        if (!nvmet_cc_en(new_cc) && nvmet_cc_en(old_cc))
-               nvmet_pci_epf_disable_ctrl(ctrl);
+               nvmet_pci_epf_disable_ctrl(ctrl, false);
 
-       if (nvmet_cc_shn(new_cc) && !nvmet_cc_shn(old_cc)) {
-               nvmet_pci_epf_disable_ctrl(ctrl);
-               ctrl->csts |= NVME_CSTS_SHST_CMPLT;
-       }
+       if (nvmet_cc_shn(new_cc) && !nvmet_cc_shn(old_cc))
+               nvmet_pci_epf_disable_ctrl(ctrl, true);
 
        if (!nvmet_cc_shn(new_cc) && nvmet_cc_shn(old_cc))
                ctrl->csts &= ~NVME_CSTS_SHST_CMPLT;
@@ -1974,16 +1994,10 @@ static void nvmet_pci_epf_init_bar(struct nvmet_pci_epf_ctrl *ctrl)
        /* Clear Controller Memory Buffer Supported (CMBS). */
        ctrl->cap &= ~(0x1ULL << 57);
 
-       /* Controller configuration. */
-       ctrl->cc = tctrl->cc & (~NVME_CC_ENABLE);
-
-       /* Controller status. */
-       ctrl->csts = ctrl->tctrl->csts;
-
        nvmet_pci_epf_bar_write64(ctrl, NVME_REG_CAP, ctrl->cap);
        nvmet_pci_epf_bar_write32(ctrl, NVME_REG_VS, tctrl->subsys->ver);
-       nvmet_pci_epf_bar_write32(ctrl, NVME_REG_CSTS, ctrl->csts);
-       nvmet_pci_epf_bar_write32(ctrl, NVME_REG_CC, ctrl->cc);
+
+       nvmet_pci_epf_clear_ctrl_config(ctrl);
 }
 
 static int nvmet_pci_epf_create_ctrl(struct nvmet_pci_epf *nvme_epf,
@@ -2088,7 +2102,8 @@ static void nvmet_pci_epf_stop_ctrl(struct nvmet_pci_epf_ctrl *ctrl)
 {
        cancel_delayed_work_sync(&ctrl->poll_cc);
 
-       nvmet_pci_epf_disable_ctrl(ctrl);
+       nvmet_pci_epf_disable_ctrl(ctrl, false);
+       nvmet_pci_epf_clear_ctrl_config(ctrl);
 }
 
 static void nvmet_pci_epf_destroy_ctrl(struct nvmet_pci_epf_ctrl *ctrl)