mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-18 03:06:43 +00:00
5c294de36e
This reverts commit 6000b8d900cd5f52fbcd0776d0cc396e88c8c2ea.
The offending commit disabled the USB core PHY management as the dwc3
already manages the PHYs in question.
Unfortunately some platforms have started relying on having USB core
also controlling the PHY and this is specifically currently needed on
some Exynos platforms for PHY calibration or connected device may fail
to enumerate.
The PHY calibration was previously handled in the dwc3 driver, but to
work around some issues related to how the dwc3 driver interacts with
xhci (e.g. using multiple drivers) this was moved to USB core by commits
34c7ed72f4f0 ("usb: core: phy: add support for PHY calibration") and
a0a465569b45 ("usb: dwc3: remove generic PHY calibrate() calls").
The same PHY obviously should not be controlled from two different
places, which for example do no agree on the PHY mode or power state
during suspend, but as the offending patch was backported to stable,
let's revert it for now.
Reported-by: Stefan Agner <stefan@agner.ch>
Link: https://lore.kernel.org/lkml/808bdba846bb60456adf10a3016911ee@agner.ch/
Fixes: 6000b8d900cd ("usb: dwc3: disable USB core PHY management")
Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/20221103144648.14197-1-johan+linaro@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
140 lines
3.1 KiB
C
140 lines
3.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* host.c - DesignWare USB3 DRD Controller Host Glue
|
|
*
|
|
* Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com
|
|
*
|
|
* Authors: Felipe Balbi <balbi@ti.com>,
|
|
*/
|
|
|
|
#include <linux/irq.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include "core.h"
|
|
|
|
static void dwc3_host_fill_xhci_irq_res(struct dwc3 *dwc,
|
|
int irq, char *name)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(dwc->dev);
|
|
struct device_node *np = dev_of_node(&pdev->dev);
|
|
|
|
dwc->xhci_resources[1].start = irq;
|
|
dwc->xhci_resources[1].end = irq;
|
|
dwc->xhci_resources[1].flags = IORESOURCE_IRQ | irq_get_trigger_type(irq);
|
|
if (!name && np)
|
|
dwc->xhci_resources[1].name = of_node_full_name(pdev->dev.of_node);
|
|
else
|
|
dwc->xhci_resources[1].name = name;
|
|
}
|
|
|
|
static int dwc3_host_get_irq(struct dwc3 *dwc)
|
|
{
|
|
struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
|
|
int irq;
|
|
|
|
irq = platform_get_irq_byname_optional(dwc3_pdev, "host");
|
|
if (irq > 0) {
|
|
dwc3_host_fill_xhci_irq_res(dwc, irq, "host");
|
|
goto out;
|
|
}
|
|
|
|
if (irq == -EPROBE_DEFER)
|
|
goto out;
|
|
|
|
irq = platform_get_irq_byname_optional(dwc3_pdev, "dwc_usb3");
|
|
if (irq > 0) {
|
|
dwc3_host_fill_xhci_irq_res(dwc, irq, "dwc_usb3");
|
|
goto out;
|
|
}
|
|
|
|
if (irq == -EPROBE_DEFER)
|
|
goto out;
|
|
|
|
irq = platform_get_irq(dwc3_pdev, 0);
|
|
if (irq > 0) {
|
|
dwc3_host_fill_xhci_irq_res(dwc, irq, NULL);
|
|
goto out;
|
|
}
|
|
|
|
if (!irq)
|
|
irq = -EINVAL;
|
|
|
|
out:
|
|
return irq;
|
|
}
|
|
|
|
int dwc3_host_init(struct dwc3 *dwc)
|
|
{
|
|
struct property_entry props[4];
|
|
struct platform_device *xhci;
|
|
int ret, irq;
|
|
int prop_idx = 0;
|
|
|
|
irq = dwc3_host_get_irq(dwc);
|
|
if (irq < 0)
|
|
return irq;
|
|
|
|
xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);
|
|
if (!xhci) {
|
|
dev_err(dwc->dev, "couldn't allocate xHCI device\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
xhci->dev.parent = dwc->dev;
|
|
|
|
dwc->xhci = xhci;
|
|
|
|
ret = platform_device_add_resources(xhci, dwc->xhci_resources,
|
|
DWC3_XHCI_RESOURCES_NUM);
|
|
if (ret) {
|
|
dev_err(dwc->dev, "couldn't add resources to xHCI device\n");
|
|
goto err;
|
|
}
|
|
|
|
memset(props, 0, sizeof(struct property_entry) * ARRAY_SIZE(props));
|
|
|
|
if (dwc->usb3_lpm_capable)
|
|
props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb3-lpm-capable");
|
|
|
|
if (dwc->usb2_lpm_disable)
|
|
props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb2-lpm-disable");
|
|
|
|
/**
|
|
* WORKAROUND: dwc3 revisions <=3.00a have a limitation
|
|
* where Port Disable command doesn't work.
|
|
*
|
|
* The suggested workaround is that we avoid Port Disable
|
|
* completely.
|
|
*
|
|
* This following flag tells XHCI to do just that.
|
|
*/
|
|
if (DWC3_VER_IS_WITHIN(DWC3, ANY, 300A))
|
|
props[prop_idx++] = PROPERTY_ENTRY_BOOL("quirk-broken-port-ped");
|
|
|
|
if (prop_idx) {
|
|
ret = device_create_managed_software_node(&xhci->dev, props, NULL);
|
|
if (ret) {
|
|
dev_err(dwc->dev, "failed to add properties to xHCI\n");
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
ret = platform_device_add(xhci);
|
|
if (ret) {
|
|
dev_err(dwc->dev, "failed to register xHCI device\n");
|
|
goto err;
|
|
}
|
|
|
|
return 0;
|
|
err:
|
|
platform_device_put(xhci);
|
|
return ret;
|
|
}
|
|
|
|
void dwc3_host_exit(struct dwc3 *dwc)
|
|
{
|
|
platform_device_unregister(dwc->xhci);
|
|
dwc->xhci = NULL;
|
|
}
|