2023-11-17 17:38:23

by Johan Hovold

Subject: [PATCH 3/3] USB: dwc3: qcom: fix ACPI platform device leak

Make sure to free the "urs" platform device, which is created for some
ACPI platforms, on probe errors and on driver unbind.

Compile-tested only.

Fixes: c25c210f590e ("usb: dwc3: qcom: add URS Host support for sdm845 ACPI boot")
Cc: Shawn Guo <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
---
drivers/usb/dwc3/dwc3-qcom.c | 37 +++++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 0703f9b85cda..10fb481d943b 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -767,9 +767,9 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)
return ret;
}

-static struct platform_device *
-dwc3_qcom_create_urs_usb_platdev(struct device *dev)
+static struct platform_device *dwc3_qcom_create_urs_usb_platdev(struct device *dev)
{
+ struct platform_device *urs_usb = NULL;
struct fwnode_handle *fwh;
struct acpi_device *adev;
char name[8];
@@ -789,9 +789,26 @@ dwc3_qcom_create_urs_usb_platdev(struct device *dev)

adev = to_acpi_device_node(fwh);
if (!adev)
- return NULL;
+ goto err_put_handle;
+
+ urs_usb = acpi_create_platform_device(adev, NULL);
+ if (IS_ERR_OR_NULL(urs_usb))
+ goto err_put_handle;
+
+ return urs_usb;

- return acpi_create_platform_device(adev, NULL);
+err_put_handle:
+ fwnode_handle_put(fwh);
+
+ return urs_usb;
+}
+
+static void dwc3_qcom_destroy_urs_usb_platdev(struct platform_device *urs_usb)
+{
+ struct fwnode_handle *fwh = urs_usb->dev.fwnode;
+
+ platform_device_unregister(urs_usb);
+ fwnode_handle_put(fwh);
}

static int dwc3_qcom_probe(struct platform_device *pdev)
@@ -875,13 +892,13 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
qcom->qscratch_base = devm_ioremap_resource(dev, parent_res);
if (IS_ERR(qcom->qscratch_base)) {
ret = PTR_ERR(qcom->qscratch_base);
- goto clk_disable;
+ goto free_urs;
}

ret = dwc3_qcom_setup_irq(pdev);
if (ret) {
dev_err(dev, "failed to setup IRQs, err=%d\n", ret);
- goto clk_disable;
+ goto free_urs;
}

/*
@@ -900,7 +917,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)

if (ret) {
dev_err(dev, "failed to register DWC3 Core, err=%d\n", ret);
- goto clk_disable;
+ goto free_urs;
}

ret = dwc3_qcom_interconnect_init(qcom);
@@ -939,6 +956,9 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
platform_device_del(qcom->dwc3);
}
platform_device_put(qcom->dwc3);
+free_urs:
+ if (qcom->urs_usb)
+ dwc3_qcom_destroy_urs_usb_platdev(qcom->urs_usb);
clk_disable:
for (i = qcom->num_clocks - 1; i >= 0; i--) {
clk_disable_unprepare(qcom->clks[i]);
@@ -965,6 +985,9 @@ static void dwc3_qcom_remove(struct platform_device *pdev)
}
platform_device_put(qcom->dwc3);

+ if (qcom->urs_usb)
+ dwc3_qcom_destroy_urs_usb_platdev(qcom->urs_usb);
+
for (i = qcom->num_clocks - 1; i >= 0; i--) {
clk_disable_unprepare(qcom->clks[i]);
clk_put(qcom->clks[i]);
--
2.41.0

2023-11-17 19:18:25

by Andrew Halaney

Subject: Re: [PATCH 3/3] USB: dwc3: qcom: fix ACPI platform device leak

On Fri, Nov 17, 2023 at 06:36:50PM +0100, Johan Hovold wrote:
> Make sure to free the "urs" platform device, which is created for some
> ACPI platforms, on probe errors and on driver unbind.
>
> Compile-tested only.
>
> Fixes: c25c210f590e ("usb: dwc3: qcom: add URS Host support for sdm845 ACPI boot")
> Cc: Shawn Guo <[email protected]>
> Signed-off-by: Johan Hovold <[email protected]>

Acked-by: Andrew Halaney <[email protected]>

> ---
> drivers/usb/dwc3/dwc3-qcom.c | 37 +++++++++++++++++++++++++++++-------
> 1 file changed, 30 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 0703f9b85cda..10fb481d943b 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -767,9 +767,9 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)
> return ret;
> }
>
> -static struct platform_device *
> -dwc3_qcom_create_urs_usb_platdev(struct device *dev)
> +static struct platform_device *dwc3_qcom_create_urs_usb_platdev(struct device *dev)
> {
> + struct platform_device *urs_usb = NULL;
> struct fwnode_handle *fwh;
> struct acpi_device *adev;
> char name[8];
> @@ -789,9 +789,26 @@ dwc3_qcom_create_urs_usb_platdev(struct device *dev)
>
> adev = to_acpi_device_node(fwh);
> if (!adev)
> - return NULL;
> + goto err_put_handle;
> +
> + urs_usb = acpi_create_platform_device(adev, NULL);
> + if (IS_ERR_OR_NULL(urs_usb))
> + goto err_put_handle;
> +
> + return urs_usb;
>
> - return acpi_create_platform_device(adev, NULL);
> +err_put_handle:
> + fwnode_handle_put(fwh);
> +
> + return urs_usb;
> +}
> +
> +static void dwc3_qcom_destroy_urs_usb_platdev(struct platform_device *urs_usb)
> +{
> + struct fwnode_handle *fwh = urs_usb->dev.fwnode;
> +
> + platform_device_unregister(urs_usb);
> + fwnode_handle_put(fwh);
> }
>
> static int dwc3_qcom_probe(struct platform_device *pdev)
> @@ -875,13 +892,13 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
> qcom->qscratch_base = devm_ioremap_resource(dev, parent_res);
> if (IS_ERR(qcom->qscratch_base)) {
> ret = PTR_ERR(qcom->qscratch_base);
> - goto clk_disable;
> + goto free_urs;
> }
>
> ret = dwc3_qcom_setup_irq(pdev);
> if (ret) {
> dev_err(dev, "failed to setup IRQs, err=%d\n", ret);
> - goto clk_disable;
> + goto free_urs;
> }
>
> /*
> @@ -900,7 +917,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
>
> if (ret) {
> dev_err(dev, "failed to register DWC3 Core, err=%d\n", ret);
> - goto clk_disable;
> + goto free_urs;
> }
>
> ret = dwc3_qcom_interconnect_init(qcom);
> @@ -939,6 +956,9 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
> platform_device_del(qcom->dwc3);
> }
> platform_device_put(qcom->dwc3);
> +free_urs:
> + if (qcom->urs_usb)
> + dwc3_qcom_destroy_urs_usb_platdev(qcom->urs_usb);
> clk_disable:
> for (i = qcom->num_clocks - 1; i >= 0; i--) {
> clk_disable_unprepare(qcom->clks[i]);
> @@ -965,6 +985,9 @@ static void dwc3_qcom_remove(struct platform_device *pdev)
> }
> platform_device_put(qcom->dwc3);
>
> + if (qcom->urs_usb)
> + dwc3_qcom_destroy_urs_usb_platdev(qcom->urs_usb);
> +
> for (i = qcom->num_clocks - 1; i >= 0; i--) {
> clk_disable_unprepare(qcom->clks[i]);
> clk_put(qcom->clks[i]);
> --
> 2.41.0
>
>

2023-11-20 09:42:32

by Shawn Guo

Subject: Re: [PATCH 3/3] USB: dwc3: qcom: fix ACPI platform device leak

On Sat, Nov 18, 2023 at 1:38 AM Johan Hovold <[email protected]> wrote:
>
> Make sure to free the "urs" platform device, which is created for some
> ACPI platforms, on probe errors and on driver unbind.
>
> Compile-tested only.
>
> Fixes: c25c210f590e ("usb: dwc3: qcom: add URS Host support for sdm845 ACPI boot")
> Cc: Shawn Guo <[email protected]>
> Signed-off-by: Johan Hovold <[email protected]>

Acked-by: Shawn Guo <[email protected]>