Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

usb: ehci: remember init mode

Browse source 
When an EHCI device is registered in device mode, the HW isn't actually
initialized at all, and hence isn't left in a running state. Consequently,
when the device is deregistered, ehci_shutdown() will fail, since the HW
bits it expects to see set in response to its shutdown requests will not
be sent, and the message "EHCI failed to shut down host controller." will
be printed.

Fix ehci-hcd.c to remember whether the device was registered in host or
device mode, and only call ehci_shutdown() for host mode registrations.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Stephen Warren 2015-08-20 17:38:05 -06:00 committed by Marek Vasut
parent 542e02ad41
commit 49b4c5c700
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/usb/host/ehci-hcd.c
View file

@ -1645,8 +1645,10 @@ int ehci_register(struct udevice *dev, struct ehci_hccr *hccr,
ctrl->hcor = hcor;
ctrl->priv = ctrl;
if (init == USB_INIT_DEVICE)
ctrl->init = init;
if (ctrl->init == USB_INIT_DEVICE)
goto done;
ret = ehci_reset(ctrl);
if (ret)
goto err;
@ -1666,6 +1668,9 @@ int ehci_deregister(struct udevice *dev)
{
struct ehci_ctrl *ctrl = dev_get_priv(dev);
if (ctrl->init == USB_INIT_DEVICE)
return 0;
ehci_shutdown(ctrl);
return 0;

1
drivers/usb/host/ehci.h
View file

@ -242,6 +242,7 @@ struct ehci_ops {
};
struct ehci_ctrl {
enum usb_init_type init;
struct ehci_hccr *hccr; /* R/O registers, not need for volatile */
struct ehci_hcor *hcor;
int rootdev;