Commit 51f22461 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Greg Kroah-Hartman

usb: xhci: tegra: Check padctrl interrupt presence in device tree

Older device-trees don't specify padctrl interrupt and xhci-tegra driver
now fails to probe with -EINVAL using those device-trees. Check interrupt
presence and keep runtime PM disabled if it's missing to fix the trouble.

Fixes: 971ee247 ("usb: xhci: tegra: Enable ELPG for runtime/system PM")
Cc: <stable@vger.kernel.org> # 5.14+
Reported-by: default avatarNicolas Chauvet <kwizart@gmail.com>
Tested-by: Nicolas Chauvet <kwizart@gmail.com> # T124 TK1
Tested-by: Thomas Graichen <thomas.graichen@gmail.com> # T124 Nyan Big
Tested-by: Thierry Reding <treding@nvidia.com> # Tegra CI
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20211107224455.10359-1-digetx@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ad4a0b1
...@@ -1400,6 +1400,7 @@ static void tegra_xusb_deinit_usb_phy(struct tegra_xusb *tegra) ...@@ -1400,6 +1400,7 @@ static void tegra_xusb_deinit_usb_phy(struct tegra_xusb *tegra)
static int tegra_xusb_probe(struct platform_device *pdev) static int tegra_xusb_probe(struct platform_device *pdev)
{ {
struct of_phandle_args args;
struct tegra_xusb *tegra; struct tegra_xusb *tegra;
struct device_node *np; struct device_node *np;
struct resource *regs; struct resource *regs;
...@@ -1454,10 +1455,17 @@ static int tegra_xusb_probe(struct platform_device *pdev) ...@@ -1454,10 +1455,17 @@ static int tegra_xusb_probe(struct platform_device *pdev)
goto put_padctl; goto put_padctl;
} }
tegra->padctl_irq = of_irq_get(np, 0); /* Older device-trees don't have padctrl interrupt */
if (tegra->padctl_irq <= 0) { err = of_irq_parse_one(np, 0, &args);
err = (tegra->padctl_irq == 0) ? -ENODEV : tegra->padctl_irq; if (!err) {
goto put_padctl; tegra->padctl_irq = of_irq_get(np, 0);
if (tegra->padctl_irq <= 0) {
err = (tegra->padctl_irq == 0) ? -ENODEV : tegra->padctl_irq;
goto put_padctl;
}
} else {
dev_dbg(&pdev->dev,
"%pOF is missing an interrupt, disabling PM support\n", np);
} }
tegra->host_clk = devm_clk_get(&pdev->dev, "xusb_host"); tegra->host_clk = devm_clk_get(&pdev->dev, "xusb_host");
...@@ -1696,11 +1704,15 @@ static int tegra_xusb_probe(struct platform_device *pdev) ...@@ -1696,11 +1704,15 @@ static int tegra_xusb_probe(struct platform_device *pdev)
goto remove_usb3; goto remove_usb3;
} }
err = devm_request_threaded_irq(&pdev->dev, tegra->padctl_irq, NULL, tegra_xusb_padctl_irq, if (tegra->padctl_irq) {
IRQF_ONESHOT, dev_name(&pdev->dev), tegra); err = devm_request_threaded_irq(&pdev->dev, tegra->padctl_irq,
if (err < 0) { NULL, tegra_xusb_padctl_irq,
dev_err(&pdev->dev, "failed to request padctl IRQ: %d\n", err); IRQF_ONESHOT, dev_name(&pdev->dev),
goto remove_usb3; tegra);
if (err < 0) {
dev_err(&pdev->dev, "failed to request padctl IRQ: %d\n", err);
goto remove_usb3;
}
} }
err = tegra_xusb_enable_firmware_messages(tegra); err = tegra_xusb_enable_firmware_messages(tegra);
...@@ -1718,13 +1730,16 @@ static int tegra_xusb_probe(struct platform_device *pdev) ...@@ -1718,13 +1730,16 @@ static int tegra_xusb_probe(struct platform_device *pdev)
/* Enable wake for both USB 2.0 and USB 3.0 roothubs */ /* Enable wake for both USB 2.0 and USB 3.0 roothubs */
device_init_wakeup(&tegra->hcd->self.root_hub->dev, true); device_init_wakeup(&tegra->hcd->self.root_hub->dev, true);
device_init_wakeup(&xhci->shared_hcd->self.root_hub->dev, true); device_init_wakeup(&xhci->shared_hcd->self.root_hub->dev, true);
device_init_wakeup(tegra->dev, true);
pm_runtime_use_autosuspend(tegra->dev); pm_runtime_use_autosuspend(tegra->dev);
pm_runtime_set_autosuspend_delay(tegra->dev, 2000); pm_runtime_set_autosuspend_delay(tegra->dev, 2000);
pm_runtime_mark_last_busy(tegra->dev); pm_runtime_mark_last_busy(tegra->dev);
pm_runtime_set_active(tegra->dev); pm_runtime_set_active(tegra->dev);
pm_runtime_enable(tegra->dev);
if (tegra->padctl_irq) {
device_init_wakeup(tegra->dev, true);
pm_runtime_enable(tegra->dev);
}
return 0; return 0;
...@@ -1772,7 +1787,9 @@ static int tegra_xusb_remove(struct platform_device *pdev) ...@@ -1772,7 +1787,9 @@ static int tegra_xusb_remove(struct platform_device *pdev)
dma_free_coherent(&pdev->dev, tegra->fw.size, tegra->fw.virt, dma_free_coherent(&pdev->dev, tegra->fw.size, tegra->fw.virt,
tegra->fw.phys); tegra->fw.phys);
pm_runtime_disable(&pdev->dev); if (tegra->padctl_irq)
pm_runtime_disable(&pdev->dev);
pm_runtime_put(&pdev->dev); pm_runtime_put(&pdev->dev);
tegra_xusb_powergate_partitions(tegra); tegra_xusb_powergate_partitions(tegra);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment