Detect whether the OXPCIE card is really present while in the ROM stage.

Use an int in CAR global data to store whether or not the OXPCIE serial card
is actually there. Also, time out if the card doesn't show up quickly enough,
don't continue initialization if it's not there, and don't make the
initialization routine default to a card if none is found.

Change-Id: I9c72d3abc6ee2867b77ab2f2180e6f01f647af8c
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://review.coreboot.org/728
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c
index 0f2272709bc14445ac9373158795ee079dfbfcb1..25eda9b22e94c7c1f8088fddb95646ba309cb4c0 100644 (file)
--- a/src/arch/x86/lib/romstage_console.c
+++ b/src/arch/x86/lib/romstage_console.c
@@ -35,7 +35,10 @@ static void console_tx_byte(unsigned char byte)
                console_tx_byte('\r');
 
 #if CONFIG_CONSOLE_SERIAL8250MEM
-       uart8250_mem_tx_byte(CONFIG_OXFORD_OXPCIE_BASE_ADDRESS + 0x1000, byte);
+       if (oxford_oxpcie_present) {
+               uart8250_mem_tx_byte(
+                       CONFIG_OXFORD_OXPCIE_BASE_ADDRESS + 0x1000, byte);
+       }
 #endif
 #if CONFIG_CONSOLE_SERIAL8250
        uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);

diff --git a/src/drivers/oxford/oxpcie/oxpcie_early.c b/src/drivers/oxford/oxpcie/oxpcie_early.c
index 2c7767e50dd35c091e152e23c5af48ffde8e5ae3..4f7a3cb105b525135a2690c98c142aadf9334cec 100644 (file)
--- a/src/drivers/oxford/oxpcie/oxpcie_early.c
+++ b/src/drivers/oxford/oxpcie/oxpcie_early.c
@@ -20,6 +20,8 @@
 #include <stdint.h>
 #include <arch/io.h>
 #include <arch/romcc_io.h>
+#include <cpu/x86/car.h>
+#include <delay.h>
 #include <uart8250.h>
 #include <device/pci_def.h>
 
@@ -34,9 +36,13 @@
 #define OXPCIE_DEVICE_3 \
        PCI_DEV(CONFIG_OXFORD_OXPCIE_BRIDGE_SUBORDINATE, 0, 3)
 
+#if defined(__PRE_RAM__)
+int oxford_oxpcie_present CAR_GLOBAL;
+
 void oxford_init(void)
 {
        u16 reg16;
+       oxford_oxpcie_present = 1;
 
        /* First we reset the secondary bus */
        reg16 = pci_read_config16(PCIE_BRIDGE, PCI_BRIDGE_CONTROL);
@@ -69,11 +75,14 @@ void oxford_init(void)
        reg16 |= PCI_COMMAND_MEMORY;
        pci_write_config16(PCIE_BRIDGE, PCI_COMMAND, reg16);
 
-       // FIXME Add a timeout or this will hang forever if
-       // no device is in the slot.
+       u32 timeout = 20000; // Timeout in 10s of microseconds.
        u32 id = 0;
-       while ((id == 0) || (id == 0xffffffff))
+       for (;;) {
                id = pci_read_config32(OXPCIE_DEVICE, PCI_VENDOR_ID);
+               if (!timeout-- || (id != 0 && id != 0xffffffff))
+                       break;
+               udelay(10);
+       }
 
        u32 device = OXPCIE_DEVICE; /* unknown default */
        switch (id) {
@@ -90,6 +99,10 @@ void oxford_init(void)
        case 0xc1581415: /* e.g. Startech MPEX2S952 */
                device = OXPCIE_DEVICE;
                break;
+       default:
+               /* No UART here. */
+               oxford_oxpcie_present = 0;
+               return;
        }
 
        /* Setup base address on device */
@@ -107,3 +120,4 @@ void oxford_init(void)
        uart8250_mem_init(uart0_base, (4000000 / CONFIG_TTYS0_BAUD));
 }
 
+#endif

diff --git a/src/include/uart8250.h b/src/include/uart8250.h
index aa510e56f8f4c5f056d6e37c3ff312977fad3670..71b9a5f3109b232abcaa5b9248aea4804b247990 100644 (file)
--- a/src/include/uart8250.h
+++ b/src/include/uart8250.h
@@ -135,8 +135,13 @@ void uart8250_mem_init(unsigned base_port, unsigned divisor);
 u32 uart_mem_init(void);
 u32 uartmem_getbaseaddr(void);
 
+#if defined(__PRE_RAM__) && CONFIG_DRIVERS_OXFORD_OXPCIE && \
+       CONFIG_CONSOLE_SERIAL8250MEM
 /* and special init for OXPCIe based cards */
+extern int oxford_oxpcie_present;
+
 void oxford_init(void);
+#endif
 
 #endif /* __ROMCC__ */