| Message ID | 20241211-ufs-qcom-suspend-fix-v1-2-83ebbde76b1c@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | scsi: ufs: qcom: Suspend fixes | expand |
> From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > 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. > > Signed-off-by: Manivannan Sadhasivam > <manivannan.sadhasivam@linaro.org> A nit below. Reviewed-by: Avri Altman <avri.altman@wdc.com> > --- > drivers/ufs/host/ufs-qcom.c | 13 +++++++++---- drivers/ufs/host/ufs-qcom.h > | 4 ++++ > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index > 32b0c74437de..35ae8c8fc301 100644 > --- 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) @@ - > 1864,9 +1864,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 > b9de170983c9..e85cc6fc072e 100644 > --- 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 { > + unsigned int quirks; Maybe enum ufshcd_quirks ? Thanks, Avri > +}; > + > static inline u32 > ufs_qcom_get_debug_reg_offset(struct ufs_qcom_host *host, u32 reg) { > > -- > 2.25.1 >
On 11/12/2024 18:40, Manivannan Sadhasivam via B4 Relay wrote: > From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > 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. > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > drivers/ufs/host/ufs-qcom.c | 13 +++++++++---- > drivers/ufs/host/ufs-qcom.h | 4 ++++ > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c > index 32b0c74437de..35ae8c8fc301 100644 > --- 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) > @@ -1864,9 +1864,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 b9de170983c9..e85cc6fc072e 100644 > --- 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 { > + unsigned int quirks; > +}; > + > static inline u32 > ufs_qcom_get_debug_reg_offset(struct ufs_qcom_host *host, u32 reg) > { > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 32b0c74437de..35ae8c8fc301 100644 --- 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) @@ -1864,9 +1864,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 b9de170983c9..e85cc6fc072e 100644 --- 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 { + unsigned int quirks; +}; + static inline u32 ufs_qcom_get_debug_reg_offset(struct ufs_qcom_host *host, u32 reg) {