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

usbdebug: Halt host controller before resetting it 

Resetting an EHCI controller when it is not halted can have
undefined behaviour. This mostly fixes a case where calling
usbdebug_init() twice would fail to reset the USB dongle device
properly.

On amd/persimmon it still requires one extra retry, but at least it
is now possible to have usbdebug enabled for both romstage and
ramstage.

Change-Id: Ib0e6e5a0167404f68af2edf112306fdb8def0be9
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3862
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Kyösti Mälkki 2013-08-12 15:32:25 +03:00
parent 1cf85774da
commit 16c014578b
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/usbdebug.c
View File

@ -448,6 +448,23 @@ try_next_port:
return -1; return -1;
} }
/* Wait until the controller is halted */
status = read32((unsigned long)&ehci_regs->status);
if (!(status & STS_HALT)) {
cmd = read32((unsigned long)&ehci_regs->command);
cmd &= ~CMD_RUN;
write32((unsigned long)&ehci_regs->command, cmd);
loop = 100;
do {
dbgp_mdelay(10);
status = read32((unsigned long)&ehci_regs->status);
} while (!(status & STS_HALT) && (--loop > 0));
if (status & STS_HALT)
dprintk(BIOS_INFO, "EHCI controller halted successfully.\n");
else
dprintk(BIOS_INFO, "EHCI controller is not halted. Reset may fail.\n");
}
loop = 100; loop = 100;
/* Reset the EHCI controller */ /* Reset the EHCI controller */
cmd = read32((unsigned long)&ehci_regs->command); cmd = read32((unsigned long)&ehci_regs->command);