summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers/usb/xhci.c
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2013-12-21 11:41:22 +0100
committerPatrick Georgi <patrick@georgi-clan.de>2014-01-08 13:24:39 +0100
commitfdb348a1d12965b8f6566b217466d50b8c015020 (patch)
tree37bae05efc580f563c3408726bbfc9cc0236d48e /payloads/libpayload/drivers/usb/xhci.c
parent4dba06a827af7962c9441a5f6a08f8f9b95224e0 (diff)
downloadcoreboot-fdb348a1d12965b8f6566b217466d50b8c015020.tar.xz
libpayload: reintroduce optional PCI in XHCI driver
being a good citizen on the box, libpayload tries to return to EHCI mode on shutdown, so a non-XHCI capable USB driver after it (eg. in the OS) finds something to work with. Change-Id: Id227d646e08a258b841c644263112f0815dd486c Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/4547 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'payloads/libpayload/drivers/usb/xhci.c')
-rw-r--r--payloads/libpayload/drivers/usb/xhci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c
index aa2fe579a2..6106342e58 100644
--- a/payloads/libpayload/drivers/usb/xhci.c
+++ b/payloads/libpayload/drivers/usb/xhci.c
@@ -303,16 +303,15 @@ hci_t *
xhci_pci_init (pcidev_t addr)
{
u32 reg_addr;
- hci_t controller;
+ hci_t *controller;
reg_addr = (u32)phys_to_virt(pci_read_config32 (addr, 0x10) & ~0xf);
- //controller->reg_base = pci_read_config32 (addr, 0x14) & ~0xf;
if (pci_read_config32 (addr, 0x14) > 0) {
fatal("We don't do 64bit addressing.\n");
}
controller = xhci_init((void *)(unsigned long)reg_addr);
- controller->bus_address = addr;
+ controller->pcidev = addr;
xhci_switch_ppt_ports(addr);
@@ -414,7 +413,8 @@ xhci_shutdown(hci_t *const controller)
xhci_stop(controller);
- xhci_switchback_ppt_ports(controller->bus_address);
+ if (controller->pcidev)
+ xhci_switchback_ppt_ports(controller->pcidev);
if (xhci->sp_ptrs) {
const size_t max_sp_bufs = xhci->capreg->Max_Scratchpad_Bufs;