scsi: ufs: core: Defer adding host to SCSI if MCQ is supported

If MCQ support is present, enabling it after MCQ support has been
configured would require reallocating tags and memory.  It would also free
up the already allocated memory in Single Doorbell Mode. So defer invoking
scsi_add_host() until MCQ is configured.

Co-developed-by: Can Guo <quic_cang@quicinc.com>
Signed-off-by: Can Guo <quic_cang@quicinc.com>
Signed-off-by: Asutosh Das <quic_asutoshd@quicinc.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 64e0461..2cb05a6 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -95,6 +95,11 @@
 /* UFSHC 4.0 compliant HC support this mode, refer param_set_mcq_mode() */
 static bool use_mcq_mode = true;
 
+static bool is_mcq_supported(struct ufs_hba *hba)
+{
+       return hba->mcq_sup && use_mcq_mode;
+}
+
 static int param_set_mcq_mode(const char *val, const struct kernel_param *kp)
 {
        int ret;
@@ -8292,6 +8297,7 @@ out:
 static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params)
 {
        int ret;
+       struct Scsi_Host *host = hba->host;
 
        hba->ufshcd_state = UFSHCD_STATE_RESET;
 
@@ -8326,6 +8332,14 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params)
                ret = ufshcd_device_params_init(hba);
                if (ret)
                        return ret;
+               if (is_mcq_supported(hba) && !hba->scsi_host_added) {
+                       ret = scsi_add_host(host, hba->dev);
+                       if (ret) {
+                               dev_err(hba->dev, "scsi_add_host failed\n");
+                               return ret;
+                       }
+                       hba->scsi_host_added = true;
+               }
        }
 
        ufshcd_tune_unipro_params(hba);
@@ -9964,10 +9978,12 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
                hba->is_irq_enabled = true;
        }
 
-       err = scsi_add_host(host, hba->dev);
-       if (err) {
-               dev_err(hba->dev, "scsi_add_host failed\n");
-               goto out_disable;
+       if (!is_mcq_supported(hba)) {
+               err = scsi_add_host(host, hba->dev);
+               if (err) {
+                       dev_err(hba->dev, "scsi_add_host failed\n");
+                       goto out_disable;
+               }
        }
 
        hba->tmf_tag_set = (struct blk_mq_tag_set) {

diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 514687d..a343bd4 100644 (file)
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -996,6 +996,7 @@ struct ufs_hba {
        u32 luns_avail;
        bool complete_put;
        bool ext_iid_sup;
+       bool scsi_host_added;
        bool mcq_sup;
 };