From afaedc96c838e4115b2a5a53f3aa5ad4e6103aa3 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Fri, 12 Oct 2018 10:22:33 -0600 Subject: [PATCH] soc/amd/stoneyridge: Remove hudson EHCI debug controllers Remove nonpreset controllers from the PCI device identifier function (ignoring any CONFIG_USBDEBUG_HCD_INDEX). The extra devices appear to be holdovers from the original sb/hudson source. TEST=Jam Makefile.inc to unconditionally build enable_usbdebug.c and verify proper BDF is returned in romstage and ramstage. Change-Id: I2e819d5e998922ad427c4a094c29a590f249a0d3 Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/29074 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/amd/stoneyridge/enable_usbdebug.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/soc/amd/stoneyridge/enable_usbdebug.c b/src/soc/amd/stoneyridge/enable_usbdebug.c index 5220457e45..0a0c3ec66d 100644 --- a/src/soc/amd/stoneyridge/enable_usbdebug.c +++ b/src/soc/amd/stoneyridge/enable_usbdebug.c @@ -20,6 +20,7 @@ #include #include #include +#include #include pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx) @@ -28,12 +29,7 @@ pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx) outb(0xef, PM_INDEX); outb(0x7f, PM_DATA); - if (hcd_idx == 3) - return PCI_DEV(0, 0x16, 0); - else if (hcd_idx == 2) - return PCI_DEV(0, 0x13, 0); - else - return PCI_DEV(0, 0x12, 0); + return SOC_EHCI1_DEV; } void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port)