[PATCH] usb: dwc3: qcom: skip interconnect init for ACPI probe

[PATCH] usb: dwc3: qcom: skip interconnect init for ACPI probe

[Shawn Guo]

The ACPI probe starts failing since commit bea46b981515 ("usb: dwc3:
qcom: Add interconnect support in dwc3 driver"), because there is no
interconnect support for ACPI, and of_icc_get() call in
dwc3_qcom_interconnect_init() will just return -EINVAL.

Fix the problem by skipping interconnect init for ACPI probe, and then
the NULL icc_path_ddr will simply just scheild all ICC calls.

Fixes: bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver")
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 drivers/usb/dwc3/dwc3-qcom.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 175a609cd0af..7dc74885a635 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -244,6 +244,9 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)
 	struct device *dev = qcom->dev;
 	int ret;
 
+	if (has_acpi_companion(dev))
+		return 0;
+
 	qcom->icc_path_ddr = of_icc_get(dev, "usb-ddr");
 	if (IS_ERR(qcom->icc_path_ddr)) {
 		dev_err(dev, "failed to get usb-ddr path: %ld\n",
-- 
2.17.1

Re: [PATCH] usb: dwc3: qcom: skip interconnect init for ACPI probe

[Sergei Shtylyov]

Hello!

On 11.03.2021 9:03, Shawn Guo wrote:

> The ACPI probe starts failing since commit bea46b981515 ("usb: dwc3:
> qcom: Add interconnect support in dwc3 driver"), because there is no
> interconnect support for ACPI, and of_icc_get() call in
> dwc3_qcom_interconnect_init() will just return -EINVAL.
> 
> Fix the problem by skipping interconnect init for ACPI probe, and then
> the NULL icc_path_ddr will simply just scheild all ICC calls.

    Scheild?

> Fixes: bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver")
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
[...]

MBR, Sergei

Re: [PATCH] usb: dwc3: qcom: skip interconnect init for ACPI probe

[Shawn Guo]

On Thu, Mar 11, 2021 at 11:32:01AM +0300, Sergei Shtylyov wrote:
> Hello!
> 
> On 11.03.2021 9:03, Shawn Guo wrote:
> 
> > The ACPI probe starts failing since commit bea46b981515 ("usb: dwc3:
> > qcom: Add interconnect support in dwc3 driver"), because there is no
> > interconnect support for ACPI, and of_icc_get() call in
> > dwc3_qcom_interconnect_init() will just return -EINVAL.
> > 
> > Fix the problem by skipping interconnect init for ACPI probe, and then
> > the NULL icc_path_ddr will simply just scheild all ICC calls.
> 
>    Scheild?

s/scheild/shield

Shawn

Re: [PATCH] usb: dwc3: qcom: skip interconnect init for ACPI probe

[patchwork-bot+linux-arm-msm]

Hello:

This patch was applied to qcom/linux.git (refs/heads/for-next):

On Thu, 11 Mar 2021 14:03:18 +0800 you wrote:
> The ACPI probe starts failing since commit bea46b981515 ("usb: dwc3:
> qcom: Add interconnect support in dwc3 driver"), because there is no
> interconnect support for ACPI, and of_icc_get() call in
> dwc3_qcom_interconnect_init() will just return -EINVAL.
> 
> Fix the problem by skipping interconnect init for ACPI probe, and then
> the NULL icc_path_ddr will simply just scheild all ICC calls.
> 
> [...]

Here is the summary with links:
  - usb: dwc3: qcom: skip interconnect init for ACPI probe
    https://git.kernel.org/qcom/c/5e4010e36a58

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html