[U-Boot] [PATCH] usb: ehci: remember init mode
From: Stephen Warren swarren@nvidia.com
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 --- drivers/usb/host/ehci-hcd.c | 7 ++++++- drivers/usb/host/ehci.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 3a0d32ee2ba1..88b670b7f8a7 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -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; diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 3379c293c4df..b41c04a8b30a 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -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;
On Friday, August 21, 2015 at 01:38:05 AM, Stephen Warren wrote:
From: Stephen Warren swarren@nvidia.com
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.
Hi,
Shouldn't you instead check if the controller is running or not and shut it down based on that ?
Best regards, Marek Vasut
On 08/20/2015 11:34 PM, Marek Vasut wrote:
On Friday, August 21, 2015 at 01:38:05 AM, Stephen Warren wrote:
From: Stephen Warren swarren@nvidia.com
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.
Hi,
Shouldn't you instead check if the controller is running or not and shut it down based on that ?
Why would the two states be different? How can the code check if the controller is running; is there some HW bit that should be checked for that?
On Friday, August 21, 2015 at 11:58:55 PM, Stephen Warren wrote:
On 08/20/2015 11:34 PM, Marek Vasut wrote:
On Friday, August 21, 2015 at 01:38:05 AM, Stephen Warren wrote:
From: Stephen Warren swarren@nvidia.com
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.
Hi,
Shouldn't you instead check if the controller is running or not and shut it down based on that ?
Why would the two states be different? How can the code check if the controller is running; is there some HW bit that should be checked for that?
Hi,
Hrm, I am not aware of any, sorry :-( But the driver can track whether the controller was previously inited or not, right ? I mean, this is DM, so we should be able to have a private data bit for that, no ?
Does it make sense to track this sort of thing in private data please ?
Best regards, Marek Vasut
On 08/23/2015 09:47 PM, Marek Vasut wrote:
On Friday, August 21, 2015 at 11:58:55 PM, Stephen Warren wrote:
On 08/20/2015 11:34 PM, Marek Vasut wrote:
On Friday, August 21, 2015 at 01:38:05 AM, Stephen Warren wrote:
From: Stephen Warren swarren@nvidia.com
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.
Hi,
Shouldn't you instead check if the controller is running or not and shut it down based on that ?
Why would the two states be different? How can the code check if the controller is running; is there some HW bit that should be checked for that?
Hi,
Hrm, I am not aware of any, sorry :-( But the driver can track whether the controller was previously inited or not, right ? I mean, this is DM, so we should be able to have a private data bit for that, no ?
I believe that's exactly what this patch is doing. I added a variable to the driver's data structure indicating whether the last initialization call was for host mode (-> EHCI is running, and should be shut down in remove()) or device mode (-> EHCI is not running, so should not be shut down in remove()).
Does it make sense to track this sort of thing in private data please ?
Best regards, Marek Vasut
On Monday, August 24, 2015 at 08:57:02 PM, Stephen Warren wrote:
On 08/23/2015 09:47 PM, Marek Vasut wrote:
On Friday, August 21, 2015 at 11:58:55 PM, Stephen Warren wrote:
On 08/20/2015 11:34 PM, Marek Vasut wrote:
On Friday, August 21, 2015 at 01:38:05 AM, Stephen Warren wrote:
From: Stephen Warren swarren@nvidia.com
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.
Hi,
Shouldn't you instead check if the controller is running or not and shut it down based on that ?
Why would the two states be different? How can the code check if the controller is running; is there some HW bit that should be checked for that?
Hi,
Hrm, I am not aware of any, sorry :-( But the driver can track whether the controller was previously inited or not, right ? I mean, this is DM, so we should be able to have a private data bit for that, no ?
I believe that's exactly what this patch is doing. I added a variable to the driver's data structure indicating whether the last initialization call was for host mode (-> EHCI is running, and should be shut down in remove()) or device mode (-> EHCI is not running, so should not be shut down in remove()).
Uh, right, sorry. Applied.
Best regards, Marek Vasut
participants (2)
-
Marek Vasut -
Stephen Warren