mirror of
https://github.com/torvalds/linux.git
synced 2025-11-04 02:30:34 +02:00
9d5333c931
When usb 3.0 hub connect with one USB 2.0 device and NO USB 3.0 device, some usb hub reports endless port reset message. [ 190.324169] usb 2-1: new SuperSpeed USB device number 88 using xhci-hcd [ 190.352834] hub 2-1:1.0: USB hub found [ 190.356995] hub 2-1:1.0: 4 ports detected [ 190.700056] usb 2-1: USB disconnect, device number 88 [ 192.472139] usb 2-1: new SuperSpeed USB device number 89 using xhci-hcd [ 192.500820] hub 2-1:1.0: USB hub found [ 192.504977] hub 2-1:1.0: 4 ports detected [ 192.852066] usb 2-1: USB disconnect, device number 89 The reason is the runtime pm state of USB2.0 port is active and USB 3.0 port is suspend, so parent device is active state. cat /sys/bus/platform/devices/5b110000.usb/5b130000.usb/xhci-hcd.1.auto/usb2/power/runtime_status suspended cat /sys/bus/platform/devices/5b110000.usb/5b130000.usb/xhci-hcd.1.auto/usb1/power/runtime_status active cat /sys/bus/platform/devices/5b110000.usb/5b130000.usb/xhci-hcd.1.auto/power/runtime_status active cat /sys/bus/platform/devices/5b110000.usb/5b130000.usb/power/runtime_status active So xhci_cdns3_suspend_quirk() have not called. U3 configure is not applied. move U3 configure into host start. Reinit again in resume function in case controller power lost during suspend. Cc: stable@vger.kernel.org 5.10 Signed-off-by: Li Jun <jun.li@nxp.com> Signed-off-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Peter Chen <peter.chen@kernel.org> Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com> Link: https://lore.kernel.org/r/20221026190749.2280367-1-Frank.Li@nxp.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
143 lines
3.2 KiB
C
143 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Cadence USBSS and USBSSP DRD Driver - host side
|
|
*
|
|
* Copyright (C) 2018-2019 Cadence Design Systems.
|
|
* Copyright (C) 2017-2018 NXP
|
|
*
|
|
* Authors: Peter Chen <peter.chen@nxp.com>
|
|
* Pawel Laszczak <pawell@cadence.com>
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include "core.h"
|
|
#include "drd.h"
|
|
#include "host-export.h"
|
|
#include <linux/usb/hcd.h>
|
|
#include "../host/xhci.h"
|
|
#include "../host/xhci-plat.h"
|
|
|
|
#define XECP_PORT_CAP_REG 0x8000
|
|
#define XECP_AUX_CTRL_REG1 0x8120
|
|
|
|
#define CFG_RXDET_P3_EN BIT(15)
|
|
#define LPM_2_STB_SWITCH_EN BIT(25)
|
|
|
|
static void xhci_cdns3_plat_start(struct usb_hcd *hcd)
|
|
{
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
|
u32 value;
|
|
|
|
/* set usbcmd.EU3S */
|
|
value = readl(&xhci->op_regs->command);
|
|
value |= CMD_PM_INDEX;
|
|
writel(value, &xhci->op_regs->command);
|
|
|
|
if (hcd->regs) {
|
|
value = readl(hcd->regs + XECP_AUX_CTRL_REG1);
|
|
value |= CFG_RXDET_P3_EN;
|
|
writel(value, hcd->regs + XECP_AUX_CTRL_REG1);
|
|
|
|
value = readl(hcd->regs + XECP_PORT_CAP_REG);
|
|
value |= LPM_2_STB_SWITCH_EN;
|
|
writel(value, hcd->regs + XECP_PORT_CAP_REG);
|
|
}
|
|
}
|
|
|
|
static int xhci_cdns3_resume_quirk(struct usb_hcd *hcd)
|
|
{
|
|
xhci_cdns3_plat_start(hcd);
|
|
return 0;
|
|
}
|
|
|
|
static const struct xhci_plat_priv xhci_plat_cdns3_xhci = {
|
|
.quirks = XHCI_SKIP_PHY_INIT | XHCI_AVOID_BEI,
|
|
.plat_start = xhci_cdns3_plat_start,
|
|
.resume_quirk = xhci_cdns3_resume_quirk,
|
|
};
|
|
|
|
static int __cdns_host_init(struct cdns *cdns)
|
|
{
|
|
struct platform_device *xhci;
|
|
int ret;
|
|
struct usb_hcd *hcd;
|
|
|
|
cdns_drd_host_on(cdns);
|
|
|
|
xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);
|
|
if (!xhci) {
|
|
dev_err(cdns->dev, "couldn't allocate xHCI device\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
xhci->dev.parent = cdns->dev;
|
|
cdns->host_dev = xhci;
|
|
|
|
ret = platform_device_add_resources(xhci, cdns->xhci_res,
|
|
CDNS_XHCI_RESOURCES_NUM);
|
|
if (ret) {
|
|
dev_err(cdns->dev, "couldn't add resources to xHCI device\n");
|
|
goto err1;
|
|
}
|
|
|
|
cdns->xhci_plat_data = kmemdup(&xhci_plat_cdns3_xhci,
|
|
sizeof(struct xhci_plat_priv), GFP_KERNEL);
|
|
if (!cdns->xhci_plat_data) {
|
|
ret = -ENOMEM;
|
|
goto err1;
|
|
}
|
|
|
|
if (cdns->pdata && (cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALLOW))
|
|
cdns->xhci_plat_data->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
|
|
|
|
ret = platform_device_add_data(xhci, cdns->xhci_plat_data,
|
|
sizeof(struct xhci_plat_priv));
|
|
if (ret)
|
|
goto free_memory;
|
|
|
|
ret = platform_device_add(xhci);
|
|
if (ret) {
|
|
dev_err(cdns->dev, "failed to register xHCI device\n");
|
|
goto free_memory;
|
|
}
|
|
|
|
/* Glue needs to access xHCI region register for Power management */
|
|
hcd = platform_get_drvdata(xhci);
|
|
if (hcd)
|
|
cdns->xhci_regs = hcd->regs;
|
|
|
|
return 0;
|
|
|
|
free_memory:
|
|
kfree(cdns->xhci_plat_data);
|
|
err1:
|
|
platform_device_put(xhci);
|
|
return ret;
|
|
}
|
|
|
|
static void cdns_host_exit(struct cdns *cdns)
|
|
{
|
|
kfree(cdns->xhci_plat_data);
|
|
platform_device_unregister(cdns->host_dev);
|
|
cdns->host_dev = NULL;
|
|
cdns_drd_host_off(cdns);
|
|
}
|
|
|
|
int cdns_host_init(struct cdns *cdns)
|
|
{
|
|
struct cdns_role_driver *rdrv;
|
|
|
|
rdrv = devm_kzalloc(cdns->dev, sizeof(*rdrv), GFP_KERNEL);
|
|
if (!rdrv)
|
|
return -ENOMEM;
|
|
|
|
rdrv->start = __cdns_host_init;
|
|
rdrv->stop = cdns_host_exit;
|
|
rdrv->state = CDNS_ROLE_STATE_INACTIVE;
|
|
rdrv->name = "host";
|
|
|
|
cdns->roles[USB_ROLE_HOST] = rdrv;
|
|
|
|
return 0;
|
|
}
|