Merge patch series "scsi: ufs: Bug fixes for ufs core and platform drivers"

martinkpetersen · martinkpetersen · commit 019880c08d05 · 2024-11-20T22:04:15.000-05:00
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> says: Hi, This series has several bug fixes that I encountered when the ufs-qcom driver was removed and inserted back. But the fixes are applicable to other platform glue drivers as well. This series is tested on Qcom RB5 development board based on SM8250 SoC. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Link: https://lore.kernel.org/r/20241111-ufs_bug_fix-v1-0-45ad8b62f02e@linaro.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
@@ -10231,6 +10231,7 @@ void ufshcd_remove(struct ufs_hba *hba)
 	ufs_hwmon_remove(hba);
 	ufs_bsg_remove(hba);
 	ufs_sysfs_remove_nodes(hba->dev);
+	cancel_delayed_work_sync(&hba->ufs_rtc_update_work);
 	blk_mq_destroy_queue(hba->tmf_queue);
 	blk_put_queue(hba->tmf_queue);
 	blk_mq_free_tag_set(&hba->tmf_tag_set);
diff --git a/drivers/ufs/host/cdns-pltfrm.c b/drivers/ufs/host/cdns-pltfrm.c
@@ -307,9 +307,7 @@ static int cdns_ufs_pltfrm_probe(struct platform_device *pdev)
  */
 static void cdns_ufs_pltfrm_remove(struct platform_device *pdev)
 {
-	struct ufs_hba *hba =  platform_get_drvdata(pdev);
-
-	ufshcd_remove(hba);
+	ufshcd_pltfrm_remove(pdev);
 }
 
 static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {
diff --git a/drivers/ufs/host/tc-dwc-g210-pltfrm.c b/drivers/ufs/host/tc-dwc-g210-pltfrm.c
@@ -76,10 +76,7 @@ static int tc_dwc_g210_pltfm_probe(struct platform_device *pdev)
  */
 static void tc_dwc_g210_pltfm_remove(struct platform_device *pdev)
 {
-	struct ufs_hba *hba =  platform_get_drvdata(pdev);
-
-	pm_runtime_get_sync(&(pdev)->dev);
-	ufshcd_remove(hba);
+	ufshcd_pltfrm_remove(pdev);
 }
 
 static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {
diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c
@@ -1992,8 +1992,7 @@ static void exynos_ufs_remove(struct platform_device *pdev)
 	struct ufs_hba *hba =  platform_get_drvdata(pdev);
 	struct exynos_ufs *ufs = ufshcd_get_variant(hba);
 
-	pm_runtime_get_sync(&(pdev)->dev);
-	ufshcd_remove(hba);
+	ufshcd_pltfrm_remove(pdev);
 
 	phy_power_off(ufs->phy);
 	phy_exit(ufs->phy);
diff --git a/drivers/ufs/host/ufs-hisi.c b/drivers/ufs/host/ufs-hisi.c
@@ -576,9 +576,7 @@ static int ufs_hisi_probe(struct platform_device *pdev)
 
 static void ufs_hisi_remove(struct platform_device *pdev)
 {
-	struct ufs_hba *hba =  platform_get_drvdata(pdev);
-
-	ufshcd_remove(hba);
+	ufshcd_pltfrm_remove(pdev);
 }
 
 static const struct dev_pm_ops ufs_hisi_pm_ops = {
diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
@@ -1879,10 +1879,7 @@ static int ufs_mtk_probe(struct platform_device *pdev)
  */
 static void ufs_mtk_remove(struct platform_device *pdev)
 {
-	struct ufs_hba *hba =  platform_get_drvdata(pdev);
-
-	pm_runtime_get_sync(&(pdev)->dev);
-	ufshcd_remove(hba);
+	ufshcd_pltfrm_remove(pdev);
 }
 
 #ifdef CONFIG_PM_SLEEP
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
@@ -1861,10 +1861,11 @@ static int ufs_qcom_probe(struct platform_device *pdev)
 static void ufs_qcom_remove(struct platform_device *pdev)
 {
 	struct ufs_hba *hba =  platform_get_drvdata(pdev);
+	struct ufs_qcom_host *host = ufshcd_get_variant(hba);
 
-	pm_runtime_get_sync(&(pdev)->dev);
-	ufshcd_remove(hba);
-	platform_device_msi_free_irqs_all(hba->dev);
+	ufshcd_pltfrm_remove(pdev);
+	if (host->esi_enabled)
+		platform_device_msi_free_irqs_all(hba->dev);
 }
 
 static const struct of_device_id ufs_qcom_of_match[] __maybe_unused = {
diff --git a/drivers/ufs/host/ufs-renesas.c b/drivers/ufs/host/ufs-renesas.c
@@ -397,9 +397,7 @@ static int ufs_renesas_probe(struct platform_device *pdev)
 
 static void ufs_renesas_remove(struct platform_device *pdev)
 {
-	struct ufs_hba *hba = platform_get_drvdata(pdev);
-
-	ufshcd_remove(hba);
+	ufshcd_pltfrm_remove(pdev);
 }
 
 static struct platform_driver ufs_renesas_platform = {
diff --git a/drivers/ufs/host/ufs-sprd.c b/drivers/ufs/host/ufs-sprd.c
@@ -427,10 +427,7 @@ static int ufs_sprd_probe(struct platform_device *pdev)
 
 static void ufs_sprd_remove(struct platform_device *pdev)
 {
-	struct ufs_hba *hba =  platform_get_drvdata(pdev);
-
-	pm_runtime_get_sync(&(pdev)->dev);
-	ufshcd_remove(hba);
+	ufshcd_pltfrm_remove(pdev);
 }
 
 static const struct dev_pm_ops ufs_sprd_pm_ops = {
diff --git a/drivers/ufs/host/ufshcd-pltfrm.c b/drivers/ufs/host/ufshcd-pltfrm.c
@@ -524,6 +524,22 @@ int ufshcd_pltfrm_init(struct platform_device *pdev,
 }
 EXPORT_SYMBOL_GPL(ufshcd_pltfrm_init);
 
+/**
+ * ufshcd_pltfrm_remove - Remove ufshcd platform
+ * @pdev: pointer to Platform device handle
+ */
+void ufshcd_pltfrm_remove(struct platform_device *pdev)
+{
+	struct ufs_hba *hba =  platform_get_drvdata(pdev);
+
+	pm_runtime_get_sync(&pdev->dev);
+	ufshcd_remove(hba);
+	ufshcd_dealloc_host(hba);
+	pm_runtime_disable(&pdev->dev);
+	pm_runtime_put_noidle(&pdev->dev);
+}
+EXPORT_SYMBOL_GPL(ufshcd_pltfrm_remove);
+
 MODULE_AUTHOR("Santosh Yaragnavi <santosh.sy@samsung.com>");
 MODULE_AUTHOR("Vinayak Holikatti <h.vinayak@samsung.com>");
 MODULE_DESCRIPTION("UFS host controller Platform bus based glue driver");
diff --git a/drivers/ufs/host/ufshcd-pltfrm.h b/drivers/ufs/host/ufshcd-pltfrm.h
@@ -31,6 +31,7 @@ int ufshcd_negotiate_pwr_params(const struct ufs_host_params *host_params,
 void ufshcd_init_host_params(struct ufs_host_params *host_params);
 int ufshcd_pltfrm_init(struct platform_device *pdev,
 		       const struct ufs_hba_variant_ops *vops);
+void ufshcd_pltfrm_remove(struct platform_device *pdev);
 int ufshcd_populate_vreg(struct device *dev, const char *name,
 			 struct ufs_vreg **out_vreg, bool skip_current);
 

Original file line number	Diff line number	Diff line change
`@@ -307,9 +307,7 @@ static int cdns_ufs_pltfrm_probe(struct platform_device *pdev)`
`307`	`307`	`*/`
`308`	`308`	`static void cdns_ufs_pltfrm_remove(struct platform_device *pdev)`
`309`	`309`	`{`
`310`		`- struct ufs_hba *hba = platform_get_drvdata(pdev);`
`311`		`-`
`312`		`- ufshcd_remove(hba);`
	`310`	`+ ufshcd_pltfrm_remove(pdev);`
`313`	`311`	`}`
`314`	`312`
`315`	`313`	`static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,7 @@ static int tc_dwc_g210_pltfm_probe(struct platform_device *pdev)`
`76`	`76`	`*/`
`77`	`77`	`static void tc_dwc_g210_pltfm_remove(struct platform_device *pdev)`
`78`	`78`	`{`
`79`		`- struct ufs_hba *hba = platform_get_drvdata(pdev);`
`80`		`-`
`81`		`- pm_runtime_get_sync(&(pdev)->dev);`
`82`		`- ufshcd_remove(hba);`
	`79`	`+ ufshcd_pltfrm_remove(pdev);`
`83`	`80`	`}`
`84`	`81`
`85`	`82`	`static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {`
Original file line number	Diff line number	Diff line change
`@@ -576,9 +576,7 @@ static int ufs_hisi_probe(struct platform_device *pdev)`
`576`	`576`
`577`	`577`	`static void ufs_hisi_remove(struct platform_device *pdev)`
`578`	`578`	`{`
`579`		`- struct ufs_hba *hba = platform_get_drvdata(pdev);`
`580`		`-`
`581`		`- ufshcd_remove(hba);`
	`579`	`+ ufshcd_pltfrm_remove(pdev);`
`582`	`580`	`}`
`583`	`581`
`584`	`582`	`static const struct dev_pm_ops ufs_hisi_pm_ops = {`
Original file line number	Diff line number	Diff line change
`@@ -1879,10 +1879,7 @@ static int ufs_mtk_probe(struct platform_device *pdev)`
`1879`	`1879`	`*/`
`1880`	`1880`	`static void ufs_mtk_remove(struct platform_device *pdev)`
`1881`	`1881`	`{`
`1882`		`- struct ufs_hba *hba = platform_get_drvdata(pdev);`
`1883`		`-`
`1884`		`- pm_runtime_get_sync(&(pdev)->dev);`
`1885`		`- ufshcd_remove(hba);`
	`1882`	`+ ufshcd_pltfrm_remove(pdev);`
`1886`	`1883`	`}`
`1887`	`1884`
`1888`	`1885`	`#ifdef CONFIG_PM_SLEEP`
Original file line number	Diff line number	Diff line change
`@@ -1861,10 +1861,11 @@ static int ufs_qcom_probe(struct platform_device *pdev)`
`1861`	`1861`	`static void ufs_qcom_remove(struct platform_device *pdev)`
`1862`	`1862`	`{`
`1863`	`1863`	`struct ufs_hba *hba = platform_get_drvdata(pdev);`
	`1864`	`+ struct ufs_qcom_host *host = ufshcd_get_variant(hba);`
`1864`	`1865`
`1865`		`- pm_runtime_get_sync(&(pdev)->dev);`
`1866`		`- ufshcd_remove(hba);`
`1867`		`- platform_device_msi_free_irqs_all(hba->dev);`
	`1866`	`+ ufshcd_pltfrm_remove(pdev);`
	`1867`	`+ if (host->esi_enabled)`
	`1868`	`+ platform_device_msi_free_irqs_all(hba->dev);`
`1868`	`1869`	`}`
`1869`	`1870`
`1870`	`1871`	`static const struct of_device_id ufs_qcom_of_match[] __maybe_unused = {`
Original file line number	Diff line number	Diff line change
`@@ -397,9 +397,7 @@ static int ufs_renesas_probe(struct platform_device *pdev)`
`397`	`397`
`398`	`398`	`static void ufs_renesas_remove(struct platform_device *pdev)`
`399`	`399`	`{`
`400`		`- struct ufs_hba *hba = platform_get_drvdata(pdev);`
`401`		`-`
`402`		`- ufshcd_remove(hba);`
	`400`	`+ ufshcd_pltfrm_remove(pdev);`
`403`	`401`	`}`
`404`	`402`
`405`	`403`	`static struct platform_driver ufs_renesas_platform = {`
Original file line number	Diff line number	Diff line change
`@@ -427,10 +427,7 @@ static int ufs_sprd_probe(struct platform_device *pdev)`
`427`	`427`
`428`	`428`	`static void ufs_sprd_remove(struct platform_device *pdev)`
`429`	`429`	`{`
`430`		`- struct ufs_hba *hba = platform_get_drvdata(pdev);`
`431`		`-`
`432`		`- pm_runtime_get_sync(&(pdev)->dev);`
`433`		`- ufshcd_remove(hba);`
	`430`	`+ ufshcd_pltfrm_remove(pdev);`
`434`	`431`	`}`
`435`	`432`
`436`	`433`	`static const struct dev_pm_ops ufs_sprd_pm_ops = {`