GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] libpayload: Implement EHCI reset function 

Added ehci_reset() function to do a full reset of
the host controller

Change-Id: Ia48db8462ebbb8f260813eb6ba8349d002c4678b
Signed-off-by: Anton Kochkov <a.kochkov@securitycode.ru>
Reviewed-on: http://review.coreboot.org/1814
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Anton Kochkov 2012-11-09 14:06:05 +01:00 committed by Stefan Reinauer
parent a1ea82283d
commit 2fef58eaba
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
payloads/libpayload/drivers/usb/ehci.c
View File

@ -51,7 +51,21 @@ static void ehci_stop (hci_t *controller)
static void ehci_reset (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) static int ehci_set_periodic_schedule(ehci_t *ehcic, int enable)

3
payloads/libpayload/drivers/usb/ehci_private.h
View File

@ -61,6 +61,7 @@ typedef volatile struct {
typedef volatile struct { typedef volatile struct {
u32 usbcmd; u32 usbcmd;
#define HC_OP_RS 1 #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_SHIFT 4
#define HC_OP_PERIODIC_SCHED_EN (1 << HC_OP_PERIODIC_SCHED_EN_SHIFT) #define HC_OP_PERIODIC_SCHED_EN (1 << HC_OP_PERIODIC_SCHED_EN_SHIFT)
#define HC_OP_ASYNC_SCHED_EN_SHIFT 5 #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_PERIODIC_SCHED_STAT (1 << HC_OP_PERIODIC_SCHED_STAT_SHIFT)
#define HC_OP_ASYNC_SCHED_STAT_SHIFT 15 #define HC_OP_ASYNC_SCHED_STAT_SHIFT 15
#define HC_OP_ASYNC_SCHED_STAT (1 << HC_OP_ASYNC_SCHED_STAT_SHIFT) #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 usbintr;
u32 frindex; u32 frindex;
u32 ctrldssegment; u32 ctrldssegment;