Idwer Vollering ([email protected]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1814
-gerrit commit 066220f124cc88d4e94f893d610826f31ae2dd5f Author: Anton Kochkov <[email protected]> Date: Fri Nov 9 14:06:05 2012 +0100 [PATCH] libpayload: Implement EHCI reset function Added ehci_reset() function to to full reset of host controller Change-Id: Ia48db8462ebbb8f260813eb6ba8349d002c4678b Signed-off-by: Anton Kochkov <[email protected]> --- payloads/libpayload/drivers/usb/ehci.c | 16 +++++++++++++++- payloads/libpayload/drivers/usb/ehci_private.h | 3 +++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index 29b399a..2ac1480 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -51,7 +51,21 @@ static void ehci_stop (hci_t *controller) static void ehci_reset (hci_t *controller) { - + short count = 0; + ehci_stop(controller); + /* wait 10 ms just to be shure */ + mdelay(10); + if (EHCI_INST(controller)->operation->usbsts & HC_OP_HC_HALTED) { + EHCI_INST(controller)->operation->usbcmd = HC_OP_HC_RESET; + /* wait 100 ms */ + for (count = 0; count < 10; count++) { + mdelay(10); + if (!(EHCI_INST(controller)->operation->usbcmd & HC_OP_HC_RESET)) { + return; + } + } + } + usb_debug("ehci_reset(): reset failed!\n"); } static int ehci_set_periodic_schedule(ehci_t *ehcic, int enable) diff --git a/payloads/libpayload/drivers/usb/ehci_private.h b/payloads/libpayload/drivers/usb/ehci_private.h index 3276e23..3b9faf6 100644 --- a/payloads/libpayload/drivers/usb/ehci_private.h +++ b/payloads/libpayload/drivers/usb/ehci_private.h @@ -61,6 +61,7 @@ typedef volatile struct { typedef volatile struct { u32 usbcmd; #define HC_OP_RS 1 +#define HC_OP_HC_RESET (1 << 1) #define HC_OP_PERIODIC_SCHED_EN_SHIFT 4 #define HC_OP_PERIODIC_SCHED_EN (1 << HC_OP_PERIODIC_SCHED_EN_SHIFT) #define HC_OP_ASYNC_SCHED_EN_SHIFT 5 @@ -70,6 +71,8 @@ typedef volatile struct { #define HC_OP_PERIODIC_SCHED_STAT (1 << HC_OP_PERIODIC_SCHED_STAT_SHIFT) #define HC_OP_ASYNC_SCHED_STAT_SHIFT 15 #define HC_OP_ASYNC_SCHED_STAT (1 << HC_OP_ASYNC_SCHED_STAT_SHIFT) +#define HC_OP_HC_HALTED_SHIFT 12 +#define HC_OP_HC_HALTED (1 << HC_OP_HC_HALTED_SHIFT) u32 usbintr; u32 frindex; u32 ctrldssegment; -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
