Skip to contentSkip to conversation

usb: dwc3: qcom: Add shutdown callback for dwc3

PATCH In review Sandeep Maheswaram 2 participants 4 messages Nov 12, 2020 – Jan 18, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: dwc3: qcom: Add shutdown callback for dwc3

This patch adds a shutdown callback to USB DWC QCOM driver to ensure that it is properly shutdown in reboot/shutdown path. This is required where SMMU address translation is enabled like on SC7180
SoC and few others. If the hardware is still accessing memory after SMMU translation is disabled as part of SMMU shutdown callback in system reboot or shutdown path, then IOVAs(I/O virtual address) which it was using will go on the bus as the physical addresses which might result in unknown crashes (NoC/interconnect errors).

---
 drivers/usb/dwc3/dwc3-qcom.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +20 -6
index c703d55..a930e06 100644
@@ -790,13 +790,11 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int dwc3_qcom_remove(struct platform_device *pdev)
+static void __dwc3_qcom_teardown(struct dwc3_qcom *qcom)
 {
-	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
-	struct device *dev = &pdev->dev;
 	int i;
 
-	of_platform_depopulate(dev);
+	of_platform_depopulate(qcom->dev);
 
 	for (i = qcom->num_clocks - 1; i >= 0; i--) {
 		clk_disable_unprepare(qcom->clks[i]);
@@ -807,12 +805,27 @@ static int dwc3_qcom_remove(struct platform_device *pdev)
 	dwc3_qcom_interconnect_exit(qcom);
 	reset_control_assert(qcom->resets);
 
-	pm_runtime_allow(dev);
-	pm_runtime_disable(dev);
+	pm_runtime_allow(qcom->dev);
+	pm_runtime_disable(qcom->dev);
+}
+
+static int dwc3_qcom_remove(struct platform_device *pdev)
+{
+	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
+
+	__dwc3_qcom_teardown(qcom);
 
 	return 0;
 }
 
+static void dwc3_qcom_shutdown(struct platform_device *pdev)
+{
+	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
+
+	__dwc3_qcom_teardown(qcom);
+
+}
+
 static int __maybe_unused dwc3_qcom_pm_suspend(struct device *dev)
 {
 	struct dwc3_qcom *qcom = dev_get_drvdata(dev);
@@ -887,6 +900,7 @@ MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match);
 static struct platform_driver dwc3_qcom_driver = {
 	.probe		= dwc3_qcom_probe,
 	.remove		= dwc3_qcom_remove,
+	.shutdown	= dwc3_qcom_shutdown,
 	.driver		= {
 		.name	= "dwc3-qcom",
 		.pm	= &dwc3_qcom_dev_pm_ops,
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
#1 lore raw
Quoted 67 lines · Sandeep Maheswaram

This patch adds a shutdown callback to USB DWC QCOM driver to ensure that it is properly shutdown in reboot/shutdown path. This is required where SMMU address translation is enabled like on SC7180
SoC and few others. If the hardware is still accessing memory after SMMU translation is disabled as part of SMMU shutdown callback in system reboot or shutdown path, then IOVAs(I/O virtual address) which it was using will go on the bus as the physical addresses which might result in unknown crashes (NoC/interconnect errors).

---
 drivers/usb/dwc3/dwc3-qcom.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +2 -4
index c703d55..a930e06 100644
@@ -790,13 +790,11 @@ static int dwc3_qcom_probe(struct platform_device 
 *pdev)
 	return ret;
 }
 
-static int dwc3_qcom_remove(struct platform_device *pdev)
+static void __dwc3_qcom_teardown(struct dwc3_qcom *qcom)
 {
-	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
-	struct device *dev = &pdev->dev;
 	int i;
 
-	of_platform_depopulate(dev);
+	of_platform_depopulate(qcom->dev);
 
 	for (i = qcom->num_clocks - 1; i >= 0; i--) {
drivers/usb/dwc3/dwc3-qcom.c +17 -2
 		clk_disable_unprepare(qcom->clks[i]);
@@ -807,12 +805,27 @@ static int dwc3_qcom_remove(struct 
 platform_device *pdev)
 	dwc3_qcom_interconnect_exit(qcom);
 	reset_control_assert(qcom->resets);
 
-	pm_runtime_allow(dev);
-	pm_runtime_disable(dev);
+	pm_runtime_allow(qcom->dev);
+	pm_runtime_disable(qcom->dev);
+}
+
+static int dwc3_qcom_remove(struct platform_device *pdev)
+{
+	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
+
+	__dwc3_qcom_teardown(qcom);
 
 	return 0;
 }
 
+static void dwc3_qcom_shutdown(struct platform_device *pdev)
+{
+	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
+
+	__dwc3_qcom_teardown(qcom);
+
+}
+
 static int __maybe_unused dwc3_qcom_pm_suspend(struct device *dev)
 {
drivers/usb/dwc3/dwc3-qcom.c +0 -0
 	struct dwc3_qcom *qcom = dev_get_drvdata(dev);

drivers/usb/dwc3/dwc3-qcom.c MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match); · line 906

Quoted 7 lines
drivers/usb/dwc3/dwc3-qcom.c +1 -0
@@ -887,6 +900,7 @@ MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match);
 static struct platform_driver dwc3_qcom_driver = {
 	.probe		= dwc3_qcom_probe,
 	.remove		= dwc3_qcom_remove,
+	.shutdown	= dwc3_qcom_shutdown,
 	.driver		= {
 		.name	= "dwc3-qcom",
 		.pm	= &dwc3_qcom_dev_pm_ops,

Hi Felipe,

Can you please review this patch.

Regards
Sandeep

#2 lore raw
In reply to Sandeep Maheswaram

Hi,

Quoted 10 lines · Sandeep Maheswaram

This patch adds a shutdown callback to USB DWC QCOM driver to ensure that it is properly shutdown in reboot/shutdown path. This is required where SMMU address translation is enabled like on SC7180
SoC and few others. If the hardware is still accessing memory after SMMU translation is disabled as part of SMMU shutdown callback in system reboot or shutdown path, then IOVAs(I/O virtual address) which it was using will go on the bus as the physical addresses which might result in unknown crashes (NoC/interconnect errors).

sounds like this is fixing a bug. Do you have a Fixes tag for it? Should this go to stable?

Quoted 21 lines
drivers/usb/dwc3/dwc3-qcom.c +2 -4
index c703d55..a930e06 100644
@@ -790,13 +790,11 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int dwc3_qcom_remove(struct platform_device *pdev)
+static void __dwc3_qcom_teardown(struct dwc3_qcom *qcom)
 {
-	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
-	struct device *dev = &pdev->dev;
 	int i;
 
-	of_platform_depopulate(dev);
+	of_platform_depopulate(qcom->dev);
 
 	for (i = qcom->num_clocks - 1; i >= 0; i--) {
 		clk_disable_unprepare(qcom->clks[i]);

drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_remove(struct platform_device *pdev) · line 810

Quoted 8 lines
drivers/usb/dwc3/dwc3-qcom.c +3 -2
@@ -807,12 +805,27 @@ static int dwc3_qcom_remove(struct platform_device *pdev)
 	dwc3_qcom_interconnect_exit(qcom);
 	reset_control_assert(qcom->resets);
 
-	pm_runtime_allow(dev);
-	pm_runtime_disable(dev);
+	pm_runtime_allow(qcom->dev);
+	pm_runtime_disable(qcom->dev);
+}

you can make the changes smaller by adding:

	struct device *dev = qcom->dev;

The nothing else needs to change in this function ;-)

Signature · 1 line
balbi
#3 lore raw
Quoted 12 lines · Felipe Balbi

Hi,

Quoted 9 lines · Sandeep Maheswaram

This patch adds a shutdown callback to USB DWC QCOM driver to ensure that it is properly shutdown in reboot/shutdown path. This is required where SMMU address translation is enabled like on SC7180
SoC and few others. If the hardware is still accessing memory after SMMU translation is disabled as part of SMMU shutdown callback in system reboot or shutdown path, then IOVAs(I/O virtual address) which it was using will go on the bus as the physical addresses which might result in unknown crashes (NoC/interconnect errors).

Quoted 5 lines
Quoted 1 line

sounds like this is fixing a bug. Do you have a Fixes tag for it? Should this go to stable?

Didn't encounter any bug till now but made this change to prevent issue.

Quoted 34 lines
Quoted 22 lines
drivers/usb/dwc3/dwc3-qcom.c +2 -4
index c703d55..a930e06 100644
@@ -790,13 +790,11 @@ static int dwc3_qcom_probe(struct 
 platform_device *pdev)
 	return ret;
 }
 
-static int dwc3_qcom_remove(struct platform_device *pdev)
+static void __dwc3_qcom_teardown(struct dwc3_qcom *qcom)
 {
-	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
-	struct device *dev = &pdev->dev;
 	int i;
 
-	of_platform_depopulate(dev);
+	of_platform_depopulate(qcom->dev);
 
 	for (i = qcom->num_clocks - 1; i >= 0; i--) {
drivers/usb/dwc3/dwc3-qcom.c +0 -0
 		clk_disable_unprepare(qcom->clks[i]);

drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_remove(struct · line 811

Quoted 9 lines
drivers/usb/dwc3/dwc3-qcom.c +3 -2
@@ -807,12 +805,27 @@ static int dwc3_qcom_remove(struct 
 platform_device *pdev)
 	dwc3_qcom_interconnect_exit(qcom);
 	reset_control_assert(qcom->resets);
 
-	pm_runtime_allow(dev);
-	pm_runtime_disable(dev);
+	pm_runtime_allow(qcom->dev);
+	pm_runtime_disable(qcom->dev);
+}

you can make the changes smaller by adding:

Quoted 3 lines
	struct device *dev = qcom->dev;

The nothing else needs to change in this function ;-)

I will do this in next version