scsi: ufs-mediatek: Add fixup_dev_quirks vops

Add fixup_dev_quirk vops in MediaTek UFS platforms and provide an initial
vendor-specific device quirk table.

Link: https://lore.kernel.org/r/20200508080115.24233-5-stanley.chu@mediatek.com
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 673c16596fb245fde320c04fb79c78a85c683a03..1898f1269ac59b8d364ba974bac8b9d68c65119b 100644 (file)
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -30,6 +30,12 @@
 #define ufs_mtk_device_reset_ctrl(high, res) \
        ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res)
 
+static struct ufs_dev_fix ufs_mtk_dev_fixups[] = {
+       UFS_FIX(UFS_VENDOR_SKHYNIX, "H9HQ21AFAMZDAR",
+               UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES),
+       END_FIX
+};
+
 static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable)
 {
        u32 tmp;
@@ -555,10 +561,8 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)
        struct ufs_dev_info *dev_info = &hba->dev_info;
        u16 mid = dev_info->wmanufacturerid;
 
-       if (mid == UFS_VENDOR_SAMSUNG) {
-               hba->dev_quirks &= ~UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE;
+       if (mid == UFS_VENDOR_SAMSUNG)
                ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TACTIVATE), 6);
-       }
 
        /*
         * Decide waiting time before gating reference clock and
@@ -575,6 +579,17 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)
        return 0;
 }
 
+void ufs_mtk_fixup_dev_quirks(struct ufs_hba *hba)
+{
+       struct ufs_dev_info *dev_info = &hba->dev_info;
+       u16 mid = dev_info->wmanufacturerid;
+
+       ufshcd_fixup_dev_quirks(hba, ufs_mtk_dev_fixups);
+
+       if (mid == UFS_VENDOR_SAMSUNG)
+               hba->dev_quirks &= ~UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE;
+}
+
 /**
  * struct ufs_hba_mtk_vops - UFS MTK specific variant operations
  *
@@ -589,6 +604,7 @@ static struct ufs_hba_variant_ops ufs_hba_mtk_vops = {
        .link_startup_notify = ufs_mtk_link_startup_notify,
        .pwr_change_notify   = ufs_mtk_pwr_change_notify,
        .apply_dev_quirks    = ufs_mtk_apply_dev_quirks,
+       .fixup_dev_quirks    = ufs_mtk_fixup_dev_quirks,
        .suspend             = ufs_mtk_suspend,
        .resume              = ufs_mtk_resume,
        .dbg_register_dump   = ufs_mtk_dbg_register_dump,