coreboot-gerrit February 2014

coreboot-gerrit@coreboot.org

1 participants
1135 discussions

Patch set updated for coreboot: 452390b SMP: Add arch-agnostic boot_cpu()
by Kyösti Mälkki 06 Feb '14

06 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5156 -gerrit commit 452390b0fe6452fbfa0beaff65dce3ff81f130ea Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jan 26 14:41:54 2014 +0200 SMP: Add arch-agnostic boot_cpu() We should not have x86 specific includes in lib/. Change-Id: I18fa9c8017d65c166ffd465038d71f35b30d6f3d Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/arch/armv7/bootblock_simple.c | 11 +---------- src/arch/x86/init/bootblock_normal.c | 1 + src/arch/x86/init/bootblock_simple.c | 1 + src/arch/x86/lib/romstage_console.c | 5 ++--- src/cpu/x86/lapic/boot_cpu.c | 2 +- src/include/cpu/x86/lapic.h | 7 +------ src/include/smp/node.h | 10 ++++++++++ src/lib/timestamp.c | 2 +- 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index 6ed63ce..2c8e053 100644 --- a/src/arch/armv7/bootblock_simple.c +++ b/src/arch/armv7/bootblock_simple.c @@ -25,19 +25,10 @@ #include <arch/stages.h> #include <cbfs.h> #include <console/console.h> +#include <smp/node.h> #include "stages.c" -static int boot_cpu(void) -{ - /* - * FIXME: This is a stub for now. All non-boot CPUs should be - * waiting for an interrupt. We could move the chunk of assembly - * which puts them to sleep in here... - */ - return 1; -} - void main(void) { const char *stage_name = "fallback/romstage"; diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c index 82bad53..f227e8e 100644 --- a/src/arch/x86/init/bootblock_normal.c +++ b/src/arch/x86/init/bootblock_normal.c @@ -1,3 +1,4 @@ +#include <smp/node.h> #include <bootblock_common.h> #include <pc80/mc146818rtc.h> diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c index 204636e..34f55ca 100644 --- a/src/arch/x86/init/bootblock_simple.c +++ b/src/arch/x86/init/bootblock_simple.c @@ -1,3 +1,4 @@ +#include <smp/node.h> #include <bootblock_common.h> static void main(unsigned long bist) diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c index 0eb3dc2..68b10eb 100644 --- a/src/arch/x86/lib/romstage_console.c +++ b/src/arch/x86/lib/romstage_console.c @@ -17,8 +17,10 @@ * MA 02110-1301 USA */ +#include <smp/node.h> #include <console/console.h> #include <console/vtxprintf.h> + #if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM #include <uart8250.h> #endif @@ -31,9 +33,6 @@ #if CONFIG_SPKMODEM #include <console/spkmodem.h> #endif -#if CONFIG_SQUELCH_EARLY_SMP -#include <cpu/x86/lapic.h> -#endif void console_tx_byte(unsigned char byte) { diff --git a/src/cpu/x86/lapic/boot_cpu.c b/src/cpu/x86/lapic/boot_cpu.c index 308b087..5643bd9 100644 --- a/src/cpu/x86/lapic/boot_cpu.c +++ b/src/cpu/x86/lapic/boot_cpu.c @@ -1,4 +1,4 @@ -#include <cpu/x86/lapic.h> +#include <smp/node.h> #include <cpu/x86/msr.h> #if CONFIG_SMP diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 96b5891..3d5046e 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -4,6 +4,7 @@ #include <cpu/x86/lapic_def.h> #include <cpu/x86/msr.h> #include <arch/hlt.h> +#include <smp/node.h> /* See if I need to initialize the local apic */ #if CONFIG_SMP || CONFIG_IOAPIC @@ -153,10 +154,4 @@ int start_cpu(struct device *cpu); #endif /* !__PRE_RAM__ */ -#if CONFIG_SMP -int boot_cpu(void); -#else -#define boot_cpu(x) 1 -#endif - #endif /* CPU_X86_LAPIC_H */ diff --git a/src/include/smp/node.h b/src/include/smp/node.h new file mode 100644 index 0000000..4e45c46 --- /dev/null +++ b/src/include/smp/node.h @@ -0,0 +1,10 @@ +#ifndef _SMP_NODE_H_ +#define _SMP_NODE_H_ + +#if CONFIG_SMP +int boot_cpu(void); +#else +#define boot_cpu(x) 1 +#endif + +#endif /* _SMP_NODE_H_ */ diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index 678f38e..f0ee48d 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -23,7 +23,7 @@ #include <cbmem.h> #include <timestamp.h> #include <arch/early_variables.h> -#include <cpu/x86/lapic.h> +#include <smp/node.h> #define MAX_TIMESTAMPS 30

1 0

Patch set updated for coreboot: e1edcb9 nvram: Add arch-agnostic get_option()
by Kyösti Mälkki 06 Feb '14

06 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5157 -gerrit commit e1edcb92987eb6b966b9d1e460fab8f3ed738f9a Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Jan 28 10:02:53 2014 +0200 nvram: Add arch-agnostic get_option() We should not have pc80/ includes in UARTs or generally in lib/. Change-Id: Id7da732b1ea094be01f45f9dbb49142f4e78f095 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/console/console.c | 13 +------------ src/console/uart8250_console.c | 1 - src/console/uart8250mem_console.c | 1 - src/include/nvram.h | 19 +++++++++++++++++++ src/lib/uart8250.c | 2 +- src/lib/uart8250mem.c | 2 +- src/mainboard/intel/jarrell/watchdog.c | 1 + 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/console/console.c b/src/console/console.c index 38ac3e7..9d8f924 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -25,18 +25,7 @@ #ifndef __PRE_RAM__ #include <string.h> #include <types.h> - -/* - * FIXME: get_option() needs to be abstracted better so that other non-volatile - * storage can be used. This will benefit machines without CMOS as well as those - * without a battery-backed CMOS (e.g. some laptops). - */ -#if CONFIG_USE_OPTION_TABLE -#include <pc80/mc146818rtc.h> -#else -static inline enum cb_err get_option(void *dest, const char *name) - { return CB_CMOS_OTABLE_DISABLED; } -#endif +#include <nvram.h> /* initialize the console */ void console_init(void) diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c index 330ed68..196412c 100644 --- a/src/console/uart8250_console.c +++ b/src/console/uart8250_console.c @@ -19,7 +19,6 @@ #include <console/console.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> static void ttyS0_init(void) { diff --git a/src/console/uart8250mem_console.c b/src/console/uart8250mem_console.c index ed77237..3833e47 100644 --- a/src/console/uart8250mem_console.c +++ b/src/console/uart8250mem_console.c @@ -19,7 +19,6 @@ #include <console/console.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> static u32 uart_bar = 0; diff --git a/src/include/nvram.h b/src/include/nvram.h new file mode 100644 index 0000000..6b1bfe8 --- /dev/null +++ b/src/include/nvram.h @@ -0,0 +1,19 @@ +#ifndef _NVRAM_H_ +#define _NVRAM_H_ + +/* + * FIXME: get_option() needs to be abstracted better so that other non-volatile + * storage can be used. This will benefit machines without CMOS as well as those + * without a battery-backed CMOS (e.g. some laptops). + */ +#if CONFIG_USE_OPTION_TABLE +#include <pc80/mc146818rtc.h> +#else +#include <types.h> +static inline enum cb_err get_option(void *dest, const char *name) +{ + return CB_CMOS_OTABLE_DISABLED; +} +#endif + +#endif /* _NVRAM_H_ */ diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c index aa18d2a..19acf7d 100644 --- a/src/lib/uart8250.c +++ b/src/lib/uart8250.c @@ -20,7 +20,7 @@ #include <arch/io.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> +#include <nvram.h> #include <trace.h> #if CONFIG_USE_OPTION_TABLE diff --git a/src/lib/uart8250mem.c b/src/lib/uart8250mem.c index 1482142..2cb8ee8 100644 --- a/src/lib/uart8250mem.c +++ b/src/lib/uart8250mem.c @@ -20,7 +20,7 @@ #include <arch/io.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> +#include <nvram.h> #if CONFIG_USE_OPTION_TABLE #include "option_table.h" #endif diff --git a/src/mainboard/intel/jarrell/watchdog.c b/src/mainboard/intel/jarrell/watchdog.c index f7c42ca..7f7a039 100644 --- a/src/mainboard/intel/jarrell/watchdog.c +++ b/src/mainboard/intel/jarrell/watchdog.c @@ -1,4 +1,5 @@ #include <device/pnp_def.h> +#include <pc80/mc146818rtc.h> #define NSC_WD_DEV PNP_DEV(0x2e, 0xa) #define NSC_WDBASE 0x600

1 0

Patch set updated for coreboot: d812488 SMP: Add arch-agnostic boot_cpu()
by Kyösti Mälkki 06 Feb '14

06 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5156 -gerrit commit d812488ac29e713ca83960ec05f959b26e0e326c Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jan 26 14:41:54 2014 +0200 SMP: Add arch-agnostic boot_cpu() We should not have x86 specific includes in lib/. Change-Id: I18fa9c8017d65c166ffd465038d71f35b30d6f3d Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/arch/armv7/bootblock_simple.c | 11 +---------- src/arch/x86/init/bootblock_normal.c | 1 + src/arch/x86/init/bootblock_simple.c | 1 + src/arch/x86/lib/romstage_console.c | 5 ++--- src/cpu/x86/lapic/boot_cpu.c | 2 +- src/include/cpu/x86/lapic.h | 7 +------ src/include/smp/node.h | 10 ++++++++++ src/lib/timestamp.c | 2 +- 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index 6ed63ce..2c8e053 100644 --- a/src/arch/armv7/bootblock_simple.c +++ b/src/arch/armv7/bootblock_simple.c @@ -25,19 +25,10 @@ #include <arch/stages.h> #include <cbfs.h> #include <console/console.h> +#include <smp/node.h> #include "stages.c" -static int boot_cpu(void) -{ - /* - * FIXME: This is a stub for now. All non-boot CPUs should be - * waiting for an interrupt. We could move the chunk of assembly - * which puts them to sleep in here... - */ - return 1; -} - void main(void) { const char *stage_name = "fallback/romstage"; diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c index 82bad53..f227e8e 100644 --- a/src/arch/x86/init/bootblock_normal.c +++ b/src/arch/x86/init/bootblock_normal.c @@ -1,3 +1,4 @@ +#include <smp/node.h> #include <bootblock_common.h> #include <pc80/mc146818rtc.h> diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c index 204636e..34f55ca 100644 --- a/src/arch/x86/init/bootblock_simple.c +++ b/src/arch/x86/init/bootblock_simple.c @@ -1,3 +1,4 @@ +#include <smp/node.h> #include <bootblock_common.h> static void main(unsigned long bist) diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c index 0eb3dc2..68b10eb 100644 --- a/src/arch/x86/lib/romstage_console.c +++ b/src/arch/x86/lib/romstage_console.c @@ -17,8 +17,10 @@ * MA 02110-1301 USA */ +#include <smp/node.h> #include <console/console.h> #include <console/vtxprintf.h> + #if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM #include <uart8250.h> #endif @@ -31,9 +33,6 @@ #if CONFIG_SPKMODEM #include <console/spkmodem.h> #endif -#if CONFIG_SQUELCH_EARLY_SMP -#include <cpu/x86/lapic.h> -#endif void console_tx_byte(unsigned char byte) { diff --git a/src/cpu/x86/lapic/boot_cpu.c b/src/cpu/x86/lapic/boot_cpu.c index 308b087..5643bd9 100644 --- a/src/cpu/x86/lapic/boot_cpu.c +++ b/src/cpu/x86/lapic/boot_cpu.c @@ -1,4 +1,4 @@ -#include <cpu/x86/lapic.h> +#include <smp/node.h> #include <cpu/x86/msr.h> #if CONFIG_SMP diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 96b5891..3d5046e 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -4,6 +4,7 @@ #include <cpu/x86/lapic_def.h> #include <cpu/x86/msr.h> #include <arch/hlt.h> +#include <smp/node.h> /* See if I need to initialize the local apic */ #if CONFIG_SMP || CONFIG_IOAPIC @@ -153,10 +154,4 @@ int start_cpu(struct device *cpu); #endif /* !__PRE_RAM__ */ -#if CONFIG_SMP -int boot_cpu(void); -#else -#define boot_cpu(x) 1 -#endif - #endif /* CPU_X86_LAPIC_H */ diff --git a/src/include/smp/node.h b/src/include/smp/node.h new file mode 100644 index 0000000..4e45c46 --- /dev/null +++ b/src/include/smp/node.h @@ -0,0 +1,10 @@ +#ifndef _SMP_NODE_H_ +#define _SMP_NODE_H_ + +#if CONFIG_SMP +int boot_cpu(void); +#else +#define boot_cpu(x) 1 +#endif + +#endif /* _SMP_NODE_H_ */ diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index 678f38e..f0ee48d 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -23,7 +23,7 @@ #include <cbmem.h> #include <timestamp.h> #include <arch/early_variables.h> -#include <cpu/x86/lapic.h> +#include <smp/node.h> #define MAX_TIMESTAMPS 30

1 0

Patch set updated for coreboot: ec996b4 nvram: Add arch-agnostic get_option()
by Kyösti Mälkki 06 Feb '14

06 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5157 -gerrit commit ec996b4742a95459e5e61e466808857abc63b540 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Jan 28 10:02:53 2014 +0200 nvram: Add arch-agnostic get_option() We should not have pc80/ includes in UARTs or generally in lib/. Change-Id: Id7da732b1ea094be01f45f9dbb49142f4e78f095 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/console/console.c | 13 +------------ src/console/uart8250_console.c | 1 - src/console/uart8250mem_console.c | 1 - src/include/nvram.h | 19 +++++++++++++++++++ src/lib/uart8250.c | 2 +- src/lib/uart8250mem.c | 2 +- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/console/console.c b/src/console/console.c index 38ac3e7..9d8f924 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -25,18 +25,7 @@ #ifndef __PRE_RAM__ #include <string.h> #include <types.h> - -/* - * FIXME: get_option() needs to be abstracted better so that other non-volatile - * storage can be used. This will benefit machines without CMOS as well as those - * without a battery-backed CMOS (e.g. some laptops). - */ -#if CONFIG_USE_OPTION_TABLE -#include <pc80/mc146818rtc.h> -#else -static inline enum cb_err get_option(void *dest, const char *name) - { return CB_CMOS_OTABLE_DISABLED; } -#endif +#include <nvram.h> /* initialize the console */ void console_init(void) diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c index 330ed68..196412c 100644 --- a/src/console/uart8250_console.c +++ b/src/console/uart8250_console.c @@ -19,7 +19,6 @@ #include <console/console.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> static void ttyS0_init(void) { diff --git a/src/console/uart8250mem_console.c b/src/console/uart8250mem_console.c index ed77237..3833e47 100644 --- a/src/console/uart8250mem_console.c +++ b/src/console/uart8250mem_console.c @@ -19,7 +19,6 @@ #include <console/console.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> static u32 uart_bar = 0; diff --git a/src/include/nvram.h b/src/include/nvram.h new file mode 100644 index 0000000..6b1bfe8 --- /dev/null +++ b/src/include/nvram.h @@ -0,0 +1,19 @@ +#ifndef _NVRAM_H_ +#define _NVRAM_H_ + +/* + * FIXME: get_option() needs to be abstracted better so that other non-volatile + * storage can be used. This will benefit machines without CMOS as well as those + * without a battery-backed CMOS (e.g. some laptops). + */ +#if CONFIG_USE_OPTION_TABLE +#include <pc80/mc146818rtc.h> +#else +#include <types.h> +static inline enum cb_err get_option(void *dest, const char *name) +{ + return CB_CMOS_OTABLE_DISABLED; +} +#endif + +#endif /* _NVRAM_H_ */ diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c index aa18d2a..19acf7d 100644 --- a/src/lib/uart8250.c +++ b/src/lib/uart8250.c @@ -20,7 +20,7 @@ #include <arch/io.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> +#include <nvram.h> #include <trace.h> #if CONFIG_USE_OPTION_TABLE diff --git a/src/lib/uart8250mem.c b/src/lib/uart8250mem.c index 1482142..2cb8ee8 100644 --- a/src/lib/uart8250mem.c +++ b/src/lib/uart8250mem.c @@ -20,7 +20,7 @@ #include <arch/io.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> +#include <nvram.h> #if CONFIG_USE_OPTION_TABLE #include "option_table.h" #endif

1 0

New patch to review for coreboot: b059e7a nvram: Add arch-agnostic get_option()
by Kyösti Mälkki 06 Feb '14

06 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5157 -gerrit commit b059e7a116250bb8ad9a6914a4f3362300fd634e Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Jan 28 10:02:53 2014 +0200 nvram: Add arch-agnostic get_option() We should not have pc80/ includes in UARTs or generally in lib/. Change-Id: Id7da732b1ea094be01f45f9dbb49142f4e78f095 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/console/console.c | 13 +------------ src/console/uart8250_console.c | 1 - src/console/uart8250mem_console.c | 1 - src/include/nvram.h | 17 +++++++++++++++++ src/lib/uart8250.c | 2 +- src/lib/uart8250mem.c | 2 +- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/console/console.c b/src/console/console.c index 38ac3e7..9d8f924 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -25,18 +25,7 @@ #ifndef __PRE_RAM__ #include <string.h> #include <types.h> - -/* - * FIXME: get_option() needs to be abstracted better so that other non-volatile - * storage can be used. This will benefit machines without CMOS as well as those - * without a battery-backed CMOS (e.g. some laptops). - */ -#if CONFIG_USE_OPTION_TABLE -#include <pc80/mc146818rtc.h> -#else -static inline enum cb_err get_option(void *dest, const char *name) - { return CB_CMOS_OTABLE_DISABLED; } -#endif +#include <nvram.h> /* initialize the console */ void console_init(void) diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c index 330ed68..196412c 100644 --- a/src/console/uart8250_console.c +++ b/src/console/uart8250_console.c @@ -19,7 +19,6 @@ #include <console/console.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> static void ttyS0_init(void) { diff --git a/src/console/uart8250mem_console.c b/src/console/uart8250mem_console.c index ed77237..3833e47 100644 --- a/src/console/uart8250mem_console.c +++ b/src/console/uart8250mem_console.c @@ -19,7 +19,6 @@ #include <console/console.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> static u32 uart_bar = 0; diff --git a/src/include/nvram.h b/src/include/nvram.h new file mode 100644 index 0000000..106344f --- /dev/null +++ b/src/include/nvram.h @@ -0,0 +1,17 @@ +#ifndef _NVRAM_H_ +#define _NVRAM_H_ + +/* + * FIXME: get_option() needs to be abstracted better so that other non-volatile + * storage can be used. This will benefit machines without CMOS as well as those + * without a battery-backed CMOS (e.g. some laptops). + */ +#if CONFIG_USE_OPTION_TABLE +#include <pc80/mc146818rtc.h> +#else +#include <types.h> +static inline enum cb_err get_option(void *dest, const char *name) + { return CB_CMOS_OTABLE_DISABLED; } +#endif + +#endif /* _NVRAM_H_ */ diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c index aa18d2a..19acf7d 100644 --- a/src/lib/uart8250.c +++ b/src/lib/uart8250.c @@ -20,7 +20,7 @@ #include <arch/io.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> +#include <nvram.h> #include <trace.h> #if CONFIG_USE_OPTION_TABLE diff --git a/src/lib/uart8250mem.c b/src/lib/uart8250mem.c index 1482142..2cb8ee8 100644 --- a/src/lib/uart8250mem.c +++ b/src/lib/uart8250mem.c @@ -20,7 +20,7 @@ #include <arch/io.h> #include <uart8250.h> -#include <pc80/mc146818rtc.h> +#include <nvram.h> #if CONFIG_USE_OPTION_TABLE #include "option_table.h" #endif

1 0

New patch to review for coreboot: 4f97ff8 SMP: Add arch-agnostic boot_cpu()
by Kyösti Mälkki 06 Feb '14

06 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5156 -gerrit commit 4f97ff8dd8f29d0d2a6046762f349ffc423b74d4 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jan 26 14:41:54 2014 +0200 SMP: Add arch-agnostic boot_cpu() We should not have x86 specific includes in lib/. Change-Id: I18fa9c8017d65c166ffd465038d71f35b30d6f3d Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/arch/armv7/bootblock_simple.c | 11 +---------- src/arch/x86/lib/romstage_console.c | 5 ++--- src/include/cpu/x86/lapic.h | 7 +------ src/include/smp/node.h | 10 ++++++++++ src/lib/timestamp.c | 2 +- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index 6ed63ce..2c8e053 100644 --- a/src/arch/armv7/bootblock_simple.c +++ b/src/arch/armv7/bootblock_simple.c @@ -25,19 +25,10 @@ #include <arch/stages.h> #include <cbfs.h> #include <console/console.h> +#include <smp/node.h> #include "stages.c" -static int boot_cpu(void) -{ - /* - * FIXME: This is a stub for now. All non-boot CPUs should be - * waiting for an interrupt. We could move the chunk of assembly - * which puts them to sleep in here... - */ - return 1; -} - void main(void) { const char *stage_name = "fallback/romstage"; diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c index 0eb3dc2..68b10eb 100644 --- a/src/arch/x86/lib/romstage_console.c +++ b/src/arch/x86/lib/romstage_console.c @@ -17,8 +17,10 @@ * MA 02110-1301 USA */ +#include <smp/node.h> #include <console/console.h> #include <console/vtxprintf.h> + #if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM #include <uart8250.h> #endif @@ -31,9 +33,6 @@ #if CONFIG_SPKMODEM #include <console/spkmodem.h> #endif -#if CONFIG_SQUELCH_EARLY_SMP -#include <cpu/x86/lapic.h> -#endif void console_tx_byte(unsigned char byte) { diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 96b5891..3d5046e 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -4,6 +4,7 @@ #include <cpu/x86/lapic_def.h> #include <cpu/x86/msr.h> #include <arch/hlt.h> +#include <smp/node.h> /* See if I need to initialize the local apic */ #if CONFIG_SMP || CONFIG_IOAPIC @@ -153,10 +154,4 @@ int start_cpu(struct device *cpu); #endif /* !__PRE_RAM__ */ -#if CONFIG_SMP -int boot_cpu(void); -#else -#define boot_cpu(x) 1 -#endif - #endif /* CPU_X86_LAPIC_H */ diff --git a/src/include/smp/node.h b/src/include/smp/node.h new file mode 100644 index 0000000..9d04bda --- /dev/null +++ b/src/include/smp/node.h @@ -0,0 +1,10 @@ +#ifndef _SMP_NODE_H_ +#define _SMP_NODE_H_ + +#if CONFIG_SMP +int boot_cpu(void); +#else +#define boot_cpu() 1 +#endif + +#endif /* _SMP_NODE_H_ */ diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index 678f38e..f0ee48d 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -23,7 +23,7 @@ #include <cbmem.h> #include <timestamp.h> #include <arch/early_variables.h> -#include <cpu/x86/lapic.h> +#include <smp/node.h> #define MAX_TIMESTAMPS 30

1 0

New patch to review for coreboot: b927d95 Move hexdump32() to lib/hexdump.
by Kyösti Mälkki 06 Feb '14

06 Feb '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5155 -gerrit commit b927d95a3a940cd21d84a63f5ba15f742b256248 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jan 26 14:44:18 2014 +0200 Move hexdump32() to lib/hexdump. Needs printk and is not a console core function. Change-Id: Id90a363eca133af4469663c1e8b504baa70471e0 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/console/console.c | 20 -------------------- src/include/console/console.h | 1 - src/include/lib.h | 1 + src/lib/hexdump.c | 16 ++++++++++++++++ src/northbridge/intel/fsp_sandybridge/fsp_util.c | 1 + 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/console/console.c b/src/console/console.c index a31e293..38ac3e7 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -137,23 +137,3 @@ void console_init(void) #endif /* CONFIG_EARLY_CONSOLE */ } #endif - -#ifndef __ROMCC__ -void hexdump32(char LEVEL, const void *d, int len) -{ - int count=0; - - while (len > 0) { - if (count % 8 == 0) { - printk(LEVEL,"\n"); - printk(LEVEL, "%p:", d); - } - printk(LEVEL, " 0x%08lx", *(unsigned long*)d); - count++; - len--; - d += 4; - } - - printk(LEVEL,"\n\n"); -} -#endif /* !__ROMCC__ */ diff --git a/src/include/console/console.h b/src/include/console/console.h index c5f5297..6fa624c 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -86,7 +86,6 @@ void post_log_clear(void); void mainboard_post(u8 value); void __attribute__ ((noreturn)) die(const char *msg); int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); -void hexdump32(char LEVEL, const void *d, int len); #if defined(__BOOT_BLOCK__) && !CONFIG_BOOTBLOCK_CONSOLE || \ (defined(__PRE_RAM__) && !defined(__BOOT_BLOCK__)) && !CONFIG_EARLY_CONSOLE diff --git a/src/include/lib.h b/src/include/lib.h index bfa68e2..db2e9c7 100644 --- a/src/include/lib.h +++ b/src/include/lib.h @@ -60,5 +60,6 @@ void post_cache_as_ram(void); /* Defined in src/lib/hexdump.c */ void hexdump(const void *memory, size_t length); +void hexdump32(char LEVEL, const void *d, int len); #endif /* __LIB_H__ */ diff --git a/src/lib/hexdump.c b/src/lib/hexdump.c index 82b0a3b..6100920 100644 --- a/src/lib/hexdump.c +++ b/src/lib/hexdump.c @@ -62,4 +62,20 @@ void hexdump(const void* memory, size_t length) } } +void hexdump32(char LEVEL, const void *d, int len) +{ + int count=0; + + while (len > 0) { + if (count % 8 == 0) { + printk(LEVEL,"\n"); + printk(LEVEL, "%p:", d); + } + printk(LEVEL, " 0x%08lx", *(unsigned long*)d); + count++; + len--; + d += 4; + } + printk(LEVEL,"\n\n"); +} diff --git a/src/northbridge/intel/fsp_sandybridge/fsp_util.c b/src/northbridge/intel/fsp_sandybridge/fsp_util.c index a8738a4..a653747 100644 --- a/src/northbridge/intel/fsp_sandybridge/fsp_util.c +++ b/src/northbridge/intel/fsp_sandybridge/fsp_util.c @@ -21,6 +21,7 @@ #include <string.h> #include <cpu/x86/stack.h> #include <console/console.h> +#include <lib.h> #include "fsp_util.h" #if CONFIG_ENABLE_FAST_BOOT

1 0

Patch merged into coreboot/master: 8af216c ARMv7: Remove static CBMEM allocation
by gerrit＠coreboot.org 06 Feb '14

06 Feb '14

the following patch was just integrated into master: commit 8af216ce60f6379817a44dfa0e81767af0f14fb1 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Dec 23 12:14:13 2013 +0200 ARMv7: Remove static CBMEM allocation The calculations for static allocation are no longer valid. Change-Id: I6740cdcec789abddf78485a0edaf24882ef8c2a5 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> See http://review.coreboot.org/4569 for details. -gerrit

1 0

Patch merged into coreboot/master: f8f0f06 console: Drop IO and Oxford (PCI) UARTs on armv7
by gerrit＠coreboot.org 06 Feb '14

06 Feb '14

the following patch was just integrated into master: commit f8f0f06ddb987f8a6686fa59800a22d77d5a659b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Feb 3 19:43:08 2014 +0200 console: Drop IO and Oxford (PCI) UARTs on armv7 Change-Id: Ia410b61c4babdfa3c984539527a9739462d3ad80 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> See http://review.coreboot.org/5141 for details. -gerrit

1 0

Patch merged into coreboot/master: ea32b94 console: Drop extra uart_init()
by gerrit＠coreboot.org 06 Feb '14

06 Feb '14

the following patch was just integrated into master: commit ea32b942498c3ee7d7fb17f1a21d970bdc310279 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Feb 3 13:07:59 2014 +0200 console: Drop extra uart_init() This call is already in console_init(). Change-Id: Ie0cb3595af514e37efac5ac5d474f52ba551bf22 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> See http://review.coreboot.org/5140 for details. -gerrit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2014