* Set USBDEBUG_DEFAULT_PORT in all southbridges and use that value
to unify calls to *_enable_usbdebug()
* rename *_enable_usbdebug() to enable_usbdebug()
* move enable_usbdebug() to generic romstage console init code
and drop it from the individual romstage.c files.
Something similar should happen to the uart init:
* uart_init() can go into console.c right now
* superio init should go into a function local_uart_init() defined in
romstage.c and be called from console_init, too.
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
===================================================================
@@ -36,6 +36,10 @@
hex
default 0xe0
+config USBDEBUG_DEFAULT_PORT
+ int
+ default 0
+
choice
prompt "SATA Mode"
default SATA_MODE_IDE
===================================================================
@@ -40,5 +40,5 @@
void sb600_lpc_port80(void);
void sb600_pci_port80(void);
-void sb600_enable_usbdebug(unsigned int port);
+void enable_usbdebug(unsigned int port);
#endif /* SB600_H */
===================================================================
@@ -30,7 +30,7 @@
/* TODO: Allow changing the physical USB port used as Debug Port. */
}
-void sb600_enable_usbdebug(unsigned int port)
+void enable_usbdebug(unsigned int port)
{
device_t dev = PCI_DEV(0, 0x13, 5); /* USB EHCI, D19:F5 */
===================================================================
@@ -75,5 +75,5 @@
int s3_save_nvram_early(u32 dword, int size, int nvram_pos);
int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
-void sb7xx_51xx_enable_usbdebug(unsigned int port);
+void enable_usbdebug(unsigned int port);
#endif /* SB700_H */
===================================================================
@@ -45,7 +45,7 @@
* This code currently only supports the first one, i.e., USB Debug devices
* attached to physical USB ports belonging to the first EHCI device.
*/
-void sb7xx_51xx_enable_usbdebug(unsigned int port)
+void enable_usbdebug(unsigned int port)
{
device_t dev = PCI_DEV(0, 0x12, 2); /* USB EHCI, D18:F2 */
===================================================================
@@ -58,7 +58,7 @@
int s3_save_nvram_early(u32 dword, int size, int nvram_pos);
int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
-void sb800_enable_usbdebug(unsigned int port);
+void enable_usbdebug(unsigned int port);
#else
void sb800_enable(device_t dev);
void __attribute__((weak)) sb800_setup_sata_phys(struct device *dev);
===================================================================
@@ -43,7 +43,7 @@
}
-void sb800_enable_usbdebug(unsigned int port)
+void enable_usbdebug(unsigned int port)
{
pci_write_config32(PCI_DEV(0, SB800_DEVN_BASE + 0x13, 5),
EHCI_BAR_INDEX, CONFIG_EHCI_BAR);
===================================================================
@@ -24,7 +24,7 @@
#include "chip.h"
void ck804_enable(device_t dev);
-void ck804_enable_usbdebug(unsigned int port);
+void enable_usbdebug(unsigned int port);
extern struct pci_operations ck804_pci_ops;
===================================================================
@@ -46,7 +46,7 @@
pci_write_config32(dev, 0x74, dword);
}
-void ck804_enable_usbdebug(unsigned int port)
+void enable_usbdebug(unsigned int port)
{
device_t dev = PCI_DEV(0, CK804_DEVN_BASE + 2, 1); /* USB EHCI */
===================================================================
@@ -35,7 +35,7 @@
#else
#if !defined(__ROMCC__)
void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn);
-void mcp55_enable_usbdebug(unsigned int port);
+void enable_usbdebug(unsigned int port);
#endif
#endif
===================================================================
@@ -40,7 +40,7 @@
pci_write_config32(dev, 0x74, dword);
}
-void mcp55_enable_usbdebug(unsigned int port)
+void enable_usbdebug(unsigned int port)
{
device_t dev = PCI_DEV(0, MCP55_DEVN_BASE + 2, 1); /* USB EHCI */
===================================================================
@@ -46,7 +46,7 @@
void enable_smbus(void);
int smbus_read_byte(unsigned device, unsigned address);
#endif
-void i82801gx_enable_usbdebug(unsigned int port);
+void enable_usbdebug(unsigned int port);
#endif
#define MAINBOARD_POWER_OFF 0
===================================================================
@@ -31,7 +31,7 @@
/* Not needed, the ICH* southbridges hardcode physical USB port 1. */
}
-void i82801gx_enable_usbdebug(unsigned int port)
+void enable_usbdebug(unsigned int port)
{
u32 dbgctl;
device_t dev = PCI_DEV(0, 0x1d, 7); /* USB EHCI, D29:F7 */
===================================================================
@@ -24,11 +24,19 @@
select HAVE_USBDEBUG
select USE_WATCHDOG_ON_BOOT
+if SOUTHBRIDGE_INTEL_I82801GX
+
config EHCI_BAR
hex
- default 0xfef00000 if SOUTHBRIDGE_INTEL_I82801GX
+ default 0xfef00000
config EHCI_DEBUG_OFFSET
hex
- default 0xa0 if SOUTHBRIDGE_INTEL_I82801GX
+ default 0xa0
+config USBDEBUG_DEFAULT_PORT
+ int
+ default 1
+
+endif
+
===================================================================
@@ -30,7 +30,7 @@
/* Not needed, the southbridges hardcode physical USB port 1. */
}
-void sch_enable_usbdebug(unsigned int port)
+void enable_usbdebug(unsigned int port)
{
u32 dbgctl;
device_t dev = PCI_DEV(0, 0x1d, 7); /* USB EHCI, D29:F7 */
===================================================================
@@ -42,7 +42,7 @@
pci_write_config32(dev, 0x74, dword);
}
-void sis966_enable_usbdebug(unsigned int port)
+void enable_usbdebug(unsigned int port)
{
device_t dev = PCI_DEV(0, SIS966_DEVN_BASE + 2, 1); /* USB EHCI */
===================================================================
@@ -40,7 +40,7 @@
#endif
#if defined(__PRE_RAM__) && !defined(__ROMCC__)
-void sis966_enable_usbdebug(unsigned int port);
+void enable_usbdebug(unsigned int port);
#endif
#endif /* SIS966_H */
===================================================================
@@ -160,11 +160,6 @@
w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -288,10 +288,6 @@
/* Set up the console */
uart_init();
-#if CONFIG_USBDEBUG
- i82801gx_enable_usbdebug(1);
- early_usbdebug_init();
-#endif
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -125,12 +125,7 @@
sb7xx_51xx_disable_wideio(0);
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
console_init();
- printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
===================================================================
@@ -337,11 +337,6 @@
/* Set up the console */
uart_init();
-#if CONFIG_USBDEBUG
- i82801gx_enable_usbdebug(1);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -96,11 +96,6 @@
w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
uart_init();
-#if CONFIG_USBDEBUG
- sb600_enable_usbdebug(0);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -150,10 +150,6 @@
/* Halt if there was a built in self test failure */
report_bist_failure(bist);
-#if CONFIG_USBDEBUG
- mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
console_init();
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
===================================================================
@@ -106,13 +106,7 @@
it8718f_disable_reboot();
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
- printk(BIOS_DEBUG, "\n");
/* Halt if there was a built in self test failure */
report_bist_failure(bist);
===================================================================
@@ -147,10 +147,6 @@
/* Halt if there was a built in self test failure */
report_bist_failure(bist);
-#if CONFIG_USBDEBUG
- sis966_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
console_init();
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
===================================================================
@@ -102,11 +102,6 @@
it8718f_disable_reboot();
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
printk(BIOS_DEBUG, "\n");
===================================================================
@@ -93,11 +93,6 @@
it8718f_enable_serial(0, CONFIG_TTYS0_BASE);
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -91,11 +91,6 @@
* and it doesn't require any special setup. */
uart_init();
-#if CONFIG_USBDEBUG
- sb600_enable_usbdebug(0);
- early_usbdebug_init();
-#endif
-
console_init();
post_code(0x03);
===================================================================
@@ -94,11 +94,6 @@
it8712f_enable_serial(0, CONFIG_TTYS0_BASE);
uart_init();
-#if CONFIG_USBDEBUG
- sb600_enable_usbdebug(0);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -106,13 +106,7 @@
it8718f_enable_serial(0, CONFIG_TTYS0_BASE);
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
- printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
===================================================================
@@ -105,13 +105,7 @@
it8718f_enable_serial(0, CONFIG_TTYS0_BASE);
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
- printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
===================================================================
@@ -110,12 +110,7 @@
sb800_lpc_init();
uart_init();
-#if CONFIG_USBDEBUG
- sb800_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
console_init();
- printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
===================================================================
@@ -242,11 +242,6 @@
uart_init();
}
-#if CONFIG_USBDEBUG
- i82801gx_enable_usbdebug(1);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -107,13 +107,7 @@
f71859_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
- printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
===================================================================
@@ -136,10 +136,6 @@
/* Halt if there was a built in self test failure */
report_bist_failure(bist);
-#if CONFIG_USBDEBUG
- mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
console_init();
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
===================================================================
@@ -138,16 +138,10 @@
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
uart_init();
console_init();
- printk(BIOS_DEBUG, "\n");
/* Halt if there was a built in self test failure */
report_bist_failure(bist);
-#if CONFIG_USBDEBUG
- mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
val = cpuid_eax(1);
printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
===================================================================
@@ -239,11 +239,6 @@
/* Set up the console */
uart_init();
-#if CONFIG_USBDEBUG
- i82801gx_enable_usbdebug(1);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -272,11 +272,6 @@
/* Set up the console */
uart_init();
-#if CONFIG_USBDEBUG
- i82801gx_enable_usbdebug(1);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -138,16 +138,10 @@
w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
uart_init();
console_init();
- printk(BIOS_DEBUG, "\n");
/* Halt if there was a built in self test failure */
report_bist_failure(bist);
-#if CONFIG_USBDEBUG
- mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
val = cpuid_eax(1);
printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
===================================================================
@@ -139,10 +139,6 @@
setup_mb_resource_map();
uart_init();
report_bist_failure(bist); /* Halt upon BIST failure. */
-#if CONFIG_USBDEBUG
- mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
console_init();
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
===================================================================
@@ -112,13 +112,7 @@
f71863fg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
- printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
===================================================================
@@ -95,11 +95,6 @@
it8712f_kill_watchdog();
uart_init();
-#if CONFIG_USBDEBUG
- sb600_enable_usbdebug(0);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -100,11 +100,6 @@
it8712f_kill_watchdog();
uart_init();
-#if CONFIG_USBDEBUG
- sb600_enable_usbdebug(0);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -140,10 +140,6 @@
/* Halt if there was a built in self test failure */
report_bist_failure(bist);
-#if CONFIG_USBDEBUG
- mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
console_init();
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
===================================================================
@@ -200,11 +200,6 @@
/* Set up the console */
uart_init();
-#if CONFIG_USBDEBUG
- i82801gx_enable_usbdebug(1);
- early_usbdebug_init();
-#endif
-
console_init();
/* Halt if there was a built in self test failure */
===================================================================
@@ -106,13 +106,7 @@
it8712f_kill_watchdog();
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
- printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
===================================================================
@@ -106,13 +106,7 @@
it8712f_kill_watchdog();
uart_init();
-#if CONFIG_USBDEBUG
- sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
-
console_init();
- printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
===================================================================
@@ -123,10 +123,6 @@
setup_mb_resource_map();
uart_init();
report_bist_failure(bist);
-#if CONFIG_USBDEBUG
- mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
- early_usbdebug_init();
-#endif
console_init();
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo, sysinfo + 1);
===================================================================
@@ -95,6 +95,10 @@
void console_init(void)
{
+#if CONFIG_USBDEBUG
+ enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
+ early_usbdebug_init();
+#endif
#if CONFIG_CONSOLE_NE2K
ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
#endif