Skip to content

Commit

Permalink
MLK-16735 usb: host: add XHCI_CDNS_HOST flag
Browse files Browse the repository at this point in the history
The NXP Cadence XHCI host has the same issue with Intel's,
it is triggered by reboot test, the test case is described
at this jira ticket.

BuildInfo:
- SCFW 8dcff26, IMX-MKIMAGE ea027c4b, ATF
- U-Boot 2017.03-imx_v2017.03_4.9.51_imx8_beta1+g6dc7b0f

Acked-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
  • Loading branch information
Peter Chen authored and Jason Liu committed Feb 12, 2019
1 parent bcd0e35 commit 5e35313
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/cdns3/host.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static void xhci_cdns3_quirks(struct device *dev, struct xhci_hcd *xhci)
* here that the generic code does not try to make a pci_dev from our
* dev struct in order to setup MSI
*/
xhci->quirks |= XHCI_PLAT;
xhci->quirks |= (XHCI_PLAT | XHCI_CDNS_HOST);
}

static int xhci_cdns3_setup(struct usb_hcd *hcd)
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/xhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ int xhci_reset(struct xhci_hcd *xhci)
* Without this delay, the subsequent HC register access,
* may result in a system hang very rarely.
*/
if (xhci->quirks & XHCI_INTEL_HOST)
if (xhci->quirks & (XHCI_INTEL_HOST | XHCI_CDNS_HOST))
udelay(1000);

ret = xhci_handshake(&xhci->op_regs->command,
Expand Down
1 change: 1 addition & 0 deletions drivers/usb/host/xhci.h
Original file line number Diff line number Diff line change
Expand Up @@ -1841,6 +1841,7 @@ struct xhci_hcd {
#define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34)
#define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35)
#define XHCI_SKIP_ACCESS_RESERVED_REG (1 << 29)
#define XHCI_CDNS_HOST (1 << 31)

unsigned int num_active_eps;
unsigned int limit_active_eps;
Expand Down

0 comments on commit 5e35313

Please sign in to comment.