scsi: ufs: qcom: Allow passing platform specific OF data

In order to allow platform specific flags and configurations, introduce the
platform specific OF data and move the existing quirk
UFSHCD_QUIRK_BROKEN_LSDBS_CAP for SM8550 and SM8650 SoCs.

Reviewed-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Tested-by: Amit Pundir <amit.pundir@linaro.org> # on SM8550-HDK
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20241219-ufs-qcom-suspend-fix-v3-3-63c4b95a70b9@linaro.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index e770e7b9d2392c339ff84f9617d88f31baa8e91f..7042322d55e98b1206f8c55a46e02dc2283aa3d2 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -871,6 +871,7 @@ static u32 ufs_qcom_get_ufs_hci_version(struct ufs_hba *hba)
  */
 static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)
 {
+       const struct ufs_qcom_drvdata *drvdata = of_device_get_match_data(hba->dev);
        struct ufs_qcom_host *host = ufshcd_get_variant(hba);
 
        if (host->hw_ver.major == 0x2)
@@ -879,9 +880,8 @@ static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)
        if (host->hw_ver.major > 0x3)
                hba->quirks |= UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH;
 
-       if (of_device_is_compatible(hba->dev->of_node, "qcom,sm8550-ufshc") ||
-           of_device_is_compatible(hba->dev->of_node, "qcom,sm8650-ufshc"))
-               hba->quirks |= UFSHCD_QUIRK_BROKEN_LSDBS_CAP;
+       if (drvdata && drvdata->quirks)
+               hba->quirks |= drvdata->quirks;
 }
 
 static void ufs_qcom_set_phy_gear(struct ufs_qcom_host *host)
@@ -1865,9 +1865,14 @@ static void ufs_qcom_remove(struct platform_device *pdev)
                platform_device_msi_free_irqs_all(hba->dev);
 }
 
+static const struct ufs_qcom_drvdata ufs_qcom_sm8550_drvdata = {
+       .quirks = UFSHCD_QUIRK_BROKEN_LSDBS_CAP,
+};
+
 static const struct of_device_id ufs_qcom_of_match[] __maybe_unused = {
        { .compatible = "qcom,ufshc" },
-       { .compatible = "qcom,sm8550-ufshc" },
+       { .compatible = "qcom,sm8550-ufshc", .data = &ufs_qcom_sm8550_drvdata },
+       { .compatible = "qcom,sm8650-ufshc", .data = &ufs_qcom_sm8550_drvdata },
        {},
 };
 MODULE_DEVICE_TABLE(of, ufs_qcom_of_match);

diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h
index b9de170983c9e13e9687de46cb5bd30331d96eb5..15f6dad8b27fbba528d8697f7235c1827a965e19 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.h
+++ b/drivers/ufs/host/ufs-qcom.h
@@ -217,6 +217,10 @@ struct ufs_qcom_host {
        bool esi_enabled;
 };
 
+struct ufs_qcom_drvdata {
+       enum ufshcd_quirks quirks;
+};
+
 static inline u32
 ufs_qcom_get_debug_reg_offset(struct ufs_qcom_host *host, u32 reg)
 {