GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usbdebug: Drop temporary disables of log output 

With this patch, output on usbdebug also includes the section of
MTRR setups for every CPU. This makes usbdebug output almost identical
with that of serial port and CBMEM console.

Tested with model_206ax. Also tested previously on model_f2x which does
not have these disable/enable calls in model_f2x_init() without detected issues.

Change-Id: Idfd0e93439907b17255633658195d698feab3895
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3423
Reviewed-by: Aaron Durbin <adurbin@google.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Kyösti Mälkki 2013-06-08 15:48:14 +03:00 committed by Nico Huber
parent f55a54257a
commit e49679d5a1
10 changed files with 0 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpu/amd/model_fxx/model_fxx_init.c
View File

@ -456,31 +456,17 @@ static inline void k8_errata(void)
} }
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
static void model_fxx_init(device_t dev) static void model_fxx_init(device_t dev)
{ {
unsigned long i; unsigned long i;
msr_t msr; msr_t msr;
struct node_core_id id; struct node_core_id id;
#if CONFIG_USBDEBUG
if (!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
x86_enable_cache(); x86_enable_cache();
amd_setup_mtrrs(); amd_setup_mtrrs();
x86_mtrr_check(); x86_mtrr_check();
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Update the microcode */ /* Update the microcode */
model_fxx_update_microcode(dev->device); model_fxx_update_microcode(dev->device);

15
src/cpu/intel/haswell/haswell_init.c
View File

@ -438,10 +438,6 @@ static void configure_mca(void)
wrmsr(IA32_MC0_STATUS + (i * 4), msr); wrmsr(IA32_MC0_STATUS + (i * 4), msr);
} }
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
static void bsp_init_before_ap_bringup(struct bus *cpu_bus) static void bsp_init_before_ap_bringup(struct bus *cpu_bus)
{ {
struct device_path cpu_path; struct device_path cpu_path;
@ -466,22 +462,11 @@ static void bsp_init_before_ap_bringup(struct bus *cpu_bus)
if (info->index != 0) if (info->index != 0)
printk(BIOS_CRIT, "BSP index(%d) != 0!\n", info->index); printk(BIOS_CRIT, "BSP index(%d) != 0!\n", info->index);
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs based on physical address size. */ /* Setup MTRRs based on physical address size. */
x86_setup_fixed_mtrrs(); x86_setup_fixed_mtrrs();
x86_setup_var_mtrrs(cpuid_eax(0x80000008) & 0xff, 2); x86_setup_var_mtrrs(cpuid_eax(0x80000008) & 0xff, 2);
x86_mtrr_check(); x86_mtrr_check();
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Call through the cpu driver's initialization. */ /* Call through the cpu driver's initialization. */
cpu_initialize(0); cpu_initialize(0);
} }

15
src/cpu/intel/model_1067x/model_1067x_init.c
View File

@ -303,10 +303,6 @@ static void configure_pic_thermal_sensors(const int tm2, const int quad)
wrmsr(PIC_SENS_CFG, msr); wrmsr(PIC_SENS_CFG, msr);
} }
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
static void model_1067x_init(device_t cpu) static void model_1067x_init(device_t cpu)
{ {
char processor_name[49]; char processor_name[49];
@ -345,21 +341,10 @@ static void model_1067x_init(device_t cpu)
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs */ /* Setup MTRRs */
x86_setup_mtrrs(); x86_setup_mtrrs();
x86_mtrr_check(); x86_mtrr_check();
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Enable the local cpu apics */ /* Enable the local cpu apics */
setup_lapic(); setup_lapic();

15
src/cpu/intel/model_106cx/model_106cx_init.c
View File

@ -128,10 +128,6 @@ static void configure_misc(void)
wrmsr(IA32_MISC_ENABLE, msr); wrmsr(IA32_MISC_ENABLE, msr);
} }
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
static void model_106cx_init(device_t cpu) static void model_106cx_init(device_t cpu)
{ {
char processor_name[49]; char processor_name[49];
@ -146,21 +142,10 @@ static void model_106cx_init(device_t cpu)
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs */ /* Setup MTRRs */
x86_setup_mtrrs(); x86_setup_mtrrs();
x86_mtrr_check(); x86_mtrr_check();
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Enable the local cpu apics */ /* Enable the local cpu apics */
setup_lapic(); setup_lapic();

14
src/cpu/intel/model_2065x/model_2065x_init.c
View File

@ -342,10 +342,6 @@ static void configure_mca(void)
wrmsr(IA32_MC0_STATUS + (i * 4), msr); wrmsr(IA32_MC0_STATUS + (i * 4), msr);
} }
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
/* /*
* Initialize any extra cores/threads in this package. * Initialize any extra cores/threads in this package.
*/ */
@ -420,12 +416,6 @@ static void model_2065x_init(device_t cpu)
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
printk(BIOS_INFO, "CPU:lapic=%ld, boot_cpu=%d\n", lapicid (), boot_cpu ()); printk(BIOS_INFO, "CPU:lapic=%ld, boot_cpu=%d\n", lapicid (), boot_cpu ());
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs based on physical address size */ /* Setup MTRRs based on physical address size */
cpuid_regs = cpuid(0x80000008); cpuid_regs = cpuid(0x80000008);
@ -436,10 +426,6 @@ static void model_2065x_init(device_t cpu)
/* Setup Page Attribute Tables (PAT) */ /* Setup Page Attribute Tables (PAT) */
// TODO set up PAT // TODO set up PAT
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Enable the local cpu apics */ /* Enable the local cpu apics */
enable_lapic_tpr(); enable_lapic_tpr();
setup_lapic(); setup_lapic();

15
src/cpu/intel/model_206ax/model_206ax_init.c
View File

@ -476,10 +476,6 @@ static void configure_mca(void)
wrmsr(IA32_MC0_STATUS + (i * 4), msr); wrmsr(IA32_MC0_STATUS + (i * 4), msr);
} }
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
/* /*
* Initialize any extra cores/threads in this package. * Initialize any extra cores/threads in this package.
*/ */
@ -554,13 +550,6 @@ static void model_206ax_init(device_t cpu)
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs based on physical address size */ /* Setup MTRRs based on physical address size */
cpuid_regs = cpuid(0x80000008); cpuid_regs = cpuid(0x80000008);
x86_setup_fixed_mtrrs(); x86_setup_fixed_mtrrs();
@ -570,10 +559,6 @@ static void model_206ax_init(device_t cpu)
/* Setup Page Attribute Tables (PAT) */ /* Setup Page Attribute Tables (PAT) */
// TODO set up PAT // TODO set up PAT
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Enable the local cpu apics */ /* Enable the local cpu apics */
enable_lapic_tpr(); enable_lapic_tpr();
setup_lapic(); setup_lapic();

15
src/cpu/intel/model_68x/model_68x_init.c
View File

@ -59,10 +59,6 @@ static const uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
static void model_68x_init(device_t cpu) static void model_68x_init(device_t cpu)
{ {
char processor_name[49]; char processor_name[49];
@ -77,21 +73,10 @@ static void model_68x_init(device_t cpu)
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs */ /* Setup MTRRs */
x86_setup_mtrrs(); x86_setup_mtrrs();
x86_mtrr_check(); x86_mtrr_check();
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Enable the local cpu apics */ /* Enable the local cpu apics */
setup_lapic(); setup_lapic();
} }

15
src/cpu/intel/model_6bx/model_6bx_init.c
View File

@ -45,10 +45,6 @@ static const uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
static void model_6bx_init(device_t cpu) static void model_6bx_init(device_t cpu)
{ {
char processor_name[49]; char processor_name[49];
@ -63,21 +59,10 @@ static void model_6bx_init(device_t cpu)
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs */ /* Setup MTRRs */
x86_setup_mtrrs(); x86_setup_mtrrs();
x86_mtrr_check(); x86_mtrr_check();
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Enable the local cpu apics */ /* Enable the local cpu apics */
setup_lapic(); setup_lapic();
} }

15
src/cpu/intel/model_6ex/model_6ex_init.c
View File

@ -153,10 +153,6 @@ static void configure_pic_thermal_sensors(void)
wrmsr(PIC_SENS_CFG, msr); wrmsr(PIC_SENS_CFG, msr);
} }
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
static void model_6ex_init(device_t cpu) static void model_6ex_init(device_t cpu)
{ {
char processor_name[49]; char processor_name[49];
@ -171,21 +167,10 @@ static void model_6ex_init(device_t cpu)
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs */ /* Setup MTRRs */
x86_setup_mtrrs(); x86_setup_mtrrs();
x86_mtrr_check(); x86_mtrr_check();
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Enable the local cpu apics */ /* Enable the local cpu apics */
setup_lapic(); setup_lapic();

15
src/cpu/intel/model_6fx/model_6fx_init.c
View File

@ -190,10 +190,6 @@ static void configure_pic_thermal_sensors(void)
wrmsr(PIC_SENS_CFG, msr); wrmsr(PIC_SENS_CFG, msr);
} }
#if CONFIG_USBDEBUG
static unsigned ehci_debug_addr;
#endif
static void model_6fx_init(device_t cpu) static void model_6fx_init(device_t cpu)
{ {
char processor_name[49]; char processor_name[49];
@ -208,13 +204,6 @@ static void model_6fx_init(device_t cpu)
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
#if CONFIG_USBDEBUG
// Is this caution really needed?
if(!ehci_debug_addr)
ehci_debug_addr = get_ehci_debug();
set_ehci_debug(0);
#endif
/* Setup MTRRs */ /* Setup MTRRs */
x86_setup_mtrrs(); x86_setup_mtrrs();
x86_mtrr_check(); x86_mtrr_check();
@ -222,10 +211,6 @@ static void model_6fx_init(device_t cpu)
/* Setup Page Attribute Tables (PAT) */ /* Setup Page Attribute Tables (PAT) */
// TODO set up PAT // TODO set up PAT
#if CONFIG_USBDEBUG
set_ehci_debug(ehci_debug_addr);
#endif
/* Enable the local cpu apics */ /* Enable the local cpu apics */
setup_lapic(); setup_lapic();