sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Guard PCI using code appropriately in XHCI driver

Browse Source 
Make the XHCI driver compile on ARM again. The Panther Point
specific shutdown handler is certainly _not_ necessary there.

Change-Id: I470afd4d82d101902b119b3ead4381e2b36a94b0
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10091
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
This commit is contained in:
Patrick Georgi
2015-05-04 19:05:41 +02:00
committed by Patrick Georgi
parent 2436bda11d
commit 2204539329
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
payloads/libpayload/drivers/usb/xhci.c
View File

@ -112,6 +112,7 @@ xhci_switch_ppt_ports(pcidev_t addr)
} }
#endif #endif
#ifdef CONFIG_LP_USB_PCI
/* On Panther Point: switch all ports back to EHCI */ /* On Panther Point: switch all ports back to EHCI */
static void static void
xhci_switchback_ppt_ports(pcidev_t addr) xhci_switchback_ppt_ports(pcidev_t addr)
@ -124,6 +125,7 @@ xhci_switchback_ppt_ports(pcidev_t addr)
xhci_debug("Still switched to xHCI: 0x%"PRIx32"\n", reg32); xhci_debug("Still switched to xHCI: 0x%"PRIx32"\n", reg32);
} }
} }
#endif
static long static long
xhci_handshake(volatile u32 *const reg, u32 mask, u32 wait_for, long timeout_us) xhci_handshake(volatile u32 *const reg, u32 mask, u32 wait_for, long timeout_us)
@ -407,8 +409,10 @@ xhci_shutdown(hci_t *const controller)
xhci_t *const xhci = XHCI_INST(controller); xhci_t *const xhci = XHCI_INST(controller);
xhci_stop(controller); xhci_stop(controller);
#ifdef CONFIG_LP_USB_PCI
if (controller->pcidev) if (controller->pcidev)
xhci_switchback_ppt_ports(controller->pcidev); xhci_switchback_ppt_ports(controller->pcidev);
#endif
if (xhci->sp_ptrs) { if (xhci->sp_ptrs) {
const size_t max_sp_bufs = xhci->capreg->Max_Scratchpad_Bufs; const size_t max_sp_bufs = xhci->capreg->Max_Scratchpad_Bufs;