scsi: ufs: ufs-mediatek: Configure individual LU queue flags

Previously, ufs vops config_scsi_dev was removed because there were no
users. ufs-mediatek needs it to configure the queue flags for each LU
individually. Therefore, bring it back and customize the queue flag as
required.

[mkp: fixed typo]

Signed-off-by: Ed Tsai <ed.tsai@mediatek.com>
Link: https://lore.kernel.org/r/20241008065950.23431-1-ed.tsai@mediatek.com
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 5607aad42469a6a04cc0206b0a0882b17e448f9f..e338867bc96caf41678b0c7a7adf4ac4f4184395 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -5235,6 +5235,9 @@ static int ufshcd_device_configure(struct scsi_device *sdev,
         */
        sdev->silence_suspend = 1;
 
+       if (hba->vops && hba->vops->config_scsi_dev)
+               hba->vops->config_scsi_dev(sdev);
+
        ufshcd_crypto_register(hba, q);
 
        return 0;

diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
index 9a5919434c4e0d1b4c04c105d08b1a7a9e55f2a6..06ab1e5e8b6fbc2dd67d18cd7832f5e4d6c87b29 100644 (file)
--- a/drivers/ufs/host/ufs-mediatek.c
+++ b/drivers/ufs/host/ufs-mediatek.c
@@ -1780,6 +1780,15 @@ static int ufs_mtk_config_esi(struct ufs_hba *hba)
        return ufs_mtk_config_mcq(hba, true);
 }
 
+static void ufs_mtk_config_scsi_dev(struct scsi_device *sdev)
+{
+       struct ufs_hba *hba = shost_priv(sdev->host);
+
+       dev_dbg(hba->dev, "lu %llu scsi device configured", sdev->lun);
+       if (sdev->lun == 2)
+               blk_queue_flag_set(QUEUE_FLAG_SAME_FORCE, sdev->request_queue);
+}
+
 /*
  * struct ufs_hba_mtk_vops - UFS MTK specific variant operations
  *
@@ -1809,6 +1818,7 @@ static const struct ufs_hba_variant_ops ufs_hba_mtk_vops = {
        .op_runtime_config   = ufs_mtk_op_runtime_config,
        .mcq_config_resource = ufs_mtk_mcq_config_resource,
        .config_esi          = ufs_mtk_config_esi,
+       .config_scsi_dev     = ufs_mtk_config_scsi_dev,
 };
 
 /**

diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 9ea2a7411bb58e465251aeccce03082736e2b73f..d7aca9e61684f9208f58126ff5c85b2934028361 100644 (file)
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -386,6 +386,7 @@ struct ufs_hba_variant_ops {
        int     (*get_outstanding_cqs)(struct ufs_hba *hba,
                                       unsigned long *ocqs);
        int     (*config_esi)(struct ufs_hba *hba);
+       void    (*config_scsi_dev)(struct scsi_device *sdev);
 };
 
 /* clock gating state  */