coreboot-gerrit February 2014

coreboot-gerrit@coreboot.org

1 participants
1135 discussions

Patch set updated for coreboot: 992171a CAR_GLOBAL: don't use static, but hide variables instead
by Edward O'Callaghan 20 Feb '14

20 Feb '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4718 -gerrit commit 992171a54dbf6d2d412fdfd6e34641c06823ede4 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Feb 20 20:29:26 2014 +1100 CAR_GLOBAL: don't use static, but hide variables instead attribute(section) isn't to be used on local variables and clang enforces that. Change-Id: Ie0d40946cd087e40f60f9d04e2eda56df75f26da Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/arch/x86/include/arch/early_variables.h | 4 ++-- src/cpu/x86/car.c | 2 +- src/cpu/x86/lapic/apic_timer.c | 2 +- src/drivers/emulation/qemu/qemu_debugcon.c | 2 +- src/drivers/pc80/tpm.c | 2 +- src/drivers/usb/ehci_debug.c | 2 +- src/lib/cbmem_console.c | 4 ++-- src/lib/timestamp.c | 6 +++--- src/vendorcode/google/chromeos/vbnv.c | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h index ea1a133..34f89df 100644 --- a/src/arch/x86/include/arch/early_variables.h +++ b/src/arch/x86/include/arch/early_variables.h @@ -25,8 +25,8 @@ asm(".section .car.global_data,\"w\",@nobits"); asm(".previous"); asm(".section .car.cbmem_console,\"w\",@nobits"); asm(".previous"); -#define CAR_GLOBAL __attribute__((section(".car.global_data"))) -#define CAR_CBMEM __attribute__((section(".car.cbmem_console"))) +#define CAR_GLOBAL __attribute__((section(".car.global_data"))) __attribute__((visibility ("hidden"))) +#define CAR_CBMEM __attribute__((section(".car.cbmem_console"))) __attribute__((visibility ("hidden"))) #else #define CAR_GLOBAL #define CAR_CBMEM diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index a7e3842..35e4704 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -39,7 +39,7 @@ extern char _car_data_end[]; * Based on these 2 attributes there is the ability to tell when the * cache-as-ram region has been migrated. */ -static int car_migrated CAR_GLOBAL; +int car_migrated CAR_GLOBAL; void *car_get_var_ptr(void *var) diff --git a/src/cpu/x86/lapic/apic_timer.c b/src/cpu/x86/lapic/apic_timer.c index 868fb92..5308567 100644 --- a/src/cpu/x86/lapic/apic_timer.c +++ b/src/cpu/x86/lapic/apic_timer.c @@ -41,7 +41,7 @@ static int set_timer_fsb(void) return 0; } #else -static u32 timer_fsb CAR_GLOBAL = 0; +u32 timer_fsb CAR_GLOBAL = 0; static int set_timer_fsb(void) { diff --git a/src/drivers/emulation/qemu/qemu_debugcon.c b/src/drivers/emulation/qemu/qemu_debugcon.c index 9c00585..a7def46 100644 --- a/src/drivers/emulation/qemu/qemu_debugcon.c +++ b/src/drivers/emulation/qemu/qemu_debugcon.c @@ -23,7 +23,7 @@ #include <arch/io.h> #include <arch/early_variables.h> -static int qemu_debugcon_detected CAR_GLOBAL; +int qemu_debugcon_detected CAR_GLOBAL; void qemu_debugcon_init(void) { diff --git a/src/drivers/pc80/tpm.c b/src/drivers/pc80/tpm.c index f581ab4..1955c2c 100644 --- a/src/drivers/pc80/tpm.c +++ b/src/drivers/pc80/tpm.c @@ -156,7 +156,7 @@ static const struct vendor_name vendor_names[] = { * Cached vendor/device ID pair to indicate that the device has been already * discovered */ -static u32 vendor_dev_id CAR_GLOBAL; +u32 vendor_dev_id CAR_GLOBAL; static inline u8 tpm_read_status(int locality) { diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index c60fbaa..e2f8b83 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -95,7 +95,7 @@ static int dbgp_enabled(void); #define DBGP_MICROFRAME_RETRIES 10 #define DBGP_MAX_PACKET 8 -static struct ehci_debug_info glob_dbg_info CAR_GLOBAL; +struct ehci_debug_info glob_dbg_info CAR_GLOBAL; static inline struct ehci_debug_info *dbgp_ehci_info(void) { diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 83d44e3..e517fd7 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -34,7 +34,7 @@ struct cbmem_console { u8 buffer_body[0]; } __attribute__ ((__packed__)); -static struct cbmem_console *cbmem_console_p CAR_GLOBAL; +struct cbmem_console *cbmem_console_p CAR_GLOBAL; #ifdef __PRE_RAM__ /* @@ -43,7 +43,7 @@ static struct cbmem_console *cbmem_console_p CAR_GLOBAL; * the area are defined in the config. */ -static struct cbmem_console car_cbmem_console CAR_CBMEM; +struct cbmem_console car_cbmem_console CAR_CBMEM; #else diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index f0ee48d..477d5fe 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -27,8 +27,8 @@ #define MAX_TIMESTAMPS 30 -static struct timestamp_table* ts_table_p CAR_GLOBAL = NULL; -static tsc_t ts_basetime CAR_GLOBAL = { .lo = 0, .hi =0 }; +struct timestamp_table* ts_table_p CAR_GLOBAL = NULL; +tsc_t ts_basetime CAR_GLOBAL = { .lo = 0, .hi =0 }; static void timestamp_stash(enum timestamp_id id, tsc_t ts_time); @@ -89,7 +89,7 @@ struct timestamp_cache { tsc_t time; } timestamp_cache[MAX_TIMESTAMP_CACHE] CAR_GLOBAL; -static int timestamp_entries CAR_GLOBAL = 0; +int timestamp_entries CAR_GLOBAL = 0; /** * timestamp_stash() allows to temporarily cache timestamps. diff --git a/src/vendorcode/google/chromeos/vbnv.c b/src/vendorcode/google/chromeos/vbnv.c index a13726d..8f04f1e 100644 --- a/src/vendorcode/google/chromeos/vbnv.c +++ b/src/vendorcode/google/chromeos/vbnv.c @@ -52,8 +52,8 @@ #define KERNEL_FIELD_OFFSET 11 #define CRC_OFFSET 15 -static int vbnv_initialized CAR_GLOBAL; -static uint8_t vbnv[CONFIG_VBNV_SIZE] CAR_GLOBAL; +int vbnv_initialized CAR_GLOBAL; +uint8_t vbnv[CONFIG_VBNV_SIZE] CAR_GLOBAL; /* Wrappers for accessing the variables marked as CAR_GLOBAL. */ static inline int is_vbnv_initialized(void)

1 0

Patch set updated for coreboot: 8b556b9 CAR_GLOBAL: don't use static, but hide variables instead
by Edward O'Callaghan 20 Feb '14

20 Feb '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4718 -gerrit commit 8b556b9eff6f87f8e0bb92364878c9c7e0cbff4b Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Feb 20 20:29:26 2014 +1100 CAR_GLOBAL: don't use static, but hide variables instead attribute(section) isn't to be used on local variables and clang enforces that. Also suppress GCC error on 'visibility' attribute being ignored. Change-Id: Ie0d40946cd087e40f60f9d04e2eda56df75f26da Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/arch/x86/include/arch/early_variables.h | 4 ++-- src/cpu/x86/car.c | 2 +- src/cpu/x86/lapic/apic_timer.c | 2 +- src/drivers/emulation/qemu/Makefile.inc | 2 ++ src/drivers/pc80/tpm.c | 2 +- src/drivers/usb/ehci_debug.c | 2 +- src/lib/cbmem_console.c | 4 ++-- src/lib/timestamp.c | 6 +++--- src/vendorcode/google/chromeos/vbnv.c | 4 ++-- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h index ea1a133..34f89df 100644 --- a/src/arch/x86/include/arch/early_variables.h +++ b/src/arch/x86/include/arch/early_variables.h @@ -25,8 +25,8 @@ asm(".section .car.global_data,\"w\",@nobits"); asm(".previous"); asm(".section .car.cbmem_console,\"w\",@nobits"); asm(".previous"); -#define CAR_GLOBAL __attribute__((section(".car.global_data"))) -#define CAR_CBMEM __attribute__((section(".car.cbmem_console"))) +#define CAR_GLOBAL __attribute__((section(".car.global_data"))) __attribute__((visibility ("hidden"))) +#define CAR_CBMEM __attribute__((section(".car.cbmem_console"))) __attribute__((visibility ("hidden"))) #else #define CAR_GLOBAL #define CAR_CBMEM diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index a7e3842..35e4704 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -39,7 +39,7 @@ extern char _car_data_end[]; * Based on these 2 attributes there is the ability to tell when the * cache-as-ram region has been migrated. */ -static int car_migrated CAR_GLOBAL; +int car_migrated CAR_GLOBAL; void *car_get_var_ptr(void *var) diff --git a/src/cpu/x86/lapic/apic_timer.c b/src/cpu/x86/lapic/apic_timer.c index 868fb92..5308567 100644 --- a/src/cpu/x86/lapic/apic_timer.c +++ b/src/cpu/x86/lapic/apic_timer.c @@ -41,7 +41,7 @@ static int set_timer_fsb(void) return 0; } #else -static u32 timer_fsb CAR_GLOBAL = 0; +u32 timer_fsb CAR_GLOBAL = 0; static int set_timer_fsb(void) { diff --git a/src/drivers/emulation/qemu/Makefile.inc b/src/drivers/emulation/qemu/Makefile.inc index 3351627..6055d2d 100644 --- a/src/drivers/emulation/qemu/Makefile.inc +++ b/src/drivers/emulation/qemu/Makefile.inc @@ -1,3 +1,5 @@ +CFLAGS += -Wno-attributes + romstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c ramstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c diff --git a/src/drivers/pc80/tpm.c b/src/drivers/pc80/tpm.c index f581ab4..1955c2c 100644 --- a/src/drivers/pc80/tpm.c +++ b/src/drivers/pc80/tpm.c @@ -156,7 +156,7 @@ static const struct vendor_name vendor_names[] = { * Cached vendor/device ID pair to indicate that the device has been already * discovered */ -static u32 vendor_dev_id CAR_GLOBAL; +u32 vendor_dev_id CAR_GLOBAL; static inline u8 tpm_read_status(int locality) { diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index c60fbaa..e2f8b83 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -95,7 +95,7 @@ static int dbgp_enabled(void); #define DBGP_MICROFRAME_RETRIES 10 #define DBGP_MAX_PACKET 8 -static struct ehci_debug_info glob_dbg_info CAR_GLOBAL; +struct ehci_debug_info glob_dbg_info CAR_GLOBAL; static inline struct ehci_debug_info *dbgp_ehci_info(void) { diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 83d44e3..e517fd7 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -34,7 +34,7 @@ struct cbmem_console { u8 buffer_body[0]; } __attribute__ ((__packed__)); -static struct cbmem_console *cbmem_console_p CAR_GLOBAL; +struct cbmem_console *cbmem_console_p CAR_GLOBAL; #ifdef __PRE_RAM__ /* @@ -43,7 +43,7 @@ static struct cbmem_console *cbmem_console_p CAR_GLOBAL; * the area are defined in the config. */ -static struct cbmem_console car_cbmem_console CAR_CBMEM; +struct cbmem_console car_cbmem_console CAR_CBMEM; #else diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index f0ee48d..477d5fe 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -27,8 +27,8 @@ #define MAX_TIMESTAMPS 30 -static struct timestamp_table* ts_table_p CAR_GLOBAL = NULL; -static tsc_t ts_basetime CAR_GLOBAL = { .lo = 0, .hi =0 }; +struct timestamp_table* ts_table_p CAR_GLOBAL = NULL; +tsc_t ts_basetime CAR_GLOBAL = { .lo = 0, .hi =0 }; static void timestamp_stash(enum timestamp_id id, tsc_t ts_time); @@ -89,7 +89,7 @@ struct timestamp_cache { tsc_t time; } timestamp_cache[MAX_TIMESTAMP_CACHE] CAR_GLOBAL; -static int timestamp_entries CAR_GLOBAL = 0; +int timestamp_entries CAR_GLOBAL = 0; /** * timestamp_stash() allows to temporarily cache timestamps. diff --git a/src/vendorcode/google/chromeos/vbnv.c b/src/vendorcode/google/chromeos/vbnv.c index a13726d..8f04f1e 100644 --- a/src/vendorcode/google/chromeos/vbnv.c +++ b/src/vendorcode/google/chromeos/vbnv.c @@ -52,8 +52,8 @@ #define KERNEL_FIELD_OFFSET 11 #define CRC_OFFSET 15 -static int vbnv_initialized CAR_GLOBAL; -static uint8_t vbnv[CONFIG_VBNV_SIZE] CAR_GLOBAL; +int vbnv_initialized CAR_GLOBAL; +uint8_t vbnv[CONFIG_VBNV_SIZE] CAR_GLOBAL; /* Wrappers for accessing the variables marked as CAR_GLOBAL. */ static inline int is_vbnv_initialized(void)

1 0

New patch to review for coreboot: cf5f5a0 utils/romcc.c: spurious unsigned integer comparisons.
by Edward O'Callaghan 20 Feb '14

20 Feb '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5275 -gerrit commit cf5f5a08dfa9c3c641c04e4faed38598c5bce8f9 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Feb 20 20:06:42 2014 +1100 utils/romcc.c: spurious unsigned integer comparisons. Clang warns about comparisons of unsigned integers with being below zero. Remove spurious logic checks that are always false. Change-Id: I70c4d5331df81e48bf7ef27ff98400c4218f7edc Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- util/romcc/romcc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c index 3ac42f7..d6317f1 100644 --- a/util/romcc/romcc.c +++ b/util/romcc/romcc.c @@ -2870,7 +2870,7 @@ static struct triple *do_farg(struct compile_state *state, unsigned i; ftype = func->type; - if((index < 0) || (index >= (ftype->elements + 2))) { + if(index >= (ftype->elements + 2)) { internal_error(state, func, "bad argument index: %d", index); } first = RHS(func, 0); @@ -18329,7 +18329,7 @@ static void print_interference_block( } /* Do a bunch of sanity checks */ valid_ins(state, ptr); - if ((ptr->id < 0) || (ptr->id > rstate->defs)) { + if (ptr->id > rstate->defs) { internal_error(state, ptr, "Invalid triple id: %d", ptr->id); } @@ -18944,7 +18944,7 @@ static void graph_ins( */ for(entry = live; entry; entry = entry->next) { struct live_range *lr; - if ((entry->member->id < 0) || (entry->member->id > rstate->defs)) { + if (entry->member->id > rstate->defs) { internal_error(state, 0, "bad entry?"); } lr = rstate->lrd[entry->member->id].lr; @@ -19916,7 +19916,7 @@ static void verify_colors(struct compile_state *state, struct reg_state *rstate) ins = first; do { if (triple_is_def(state, ins)) { - if ((ins->id < 0) || (ins->id > rstate->defs)) { + if (ins->id > rstate->defs) { internal_error(state, ins, "triple without a live range def"); } @@ -19951,7 +19951,7 @@ static void color_triples(struct compile_state *state, struct reg_state *rstate) first = state->first; ins = first; do { - if ((ins->id < 0) || (ins->id > rstate->defs)) { + if (ins->id > rstate->defs) { internal_error(state, ins, "triple without a live range"); }

1 0

New patch to review for coreboot: 473fdff util/sconfig: Fix missing prototype issue with bison/flex.
by Edward O'Callaghan 20 Feb '14

20 Feb '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5274 -gerrit commit 473fdff74e520ae546f71607e8052fb1dbed927a Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Feb 20 19:42:59 2014 +1100 util/sconfig: Fix missing prototype issue with bison/flex. Clang throws missing prototype warnings where GCC does not. Shift around prototype declarations a little. Change-Id: I929085e5ed87452e77409889e04b05d32e5f356c Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- util/sconfig/sconfig.h | 20 ++++++++++++++++++++ util/sconfig/sconfig.tab.c_shipped | 17 +---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h index b8a231a..1aef26d 100644 --- a/util/sconfig/sconfig.h +++ b/util/sconfig/sconfig.h @@ -100,3 +100,23 @@ void alias_siblings(struct device *d); void add_resource(struct device *dev, int type, int index, int base); void add_register(struct device *dev, char *name, char *val); void add_pci_subsystem_ids(struct device *dev, int vendor, int device, int inherit); + +void add_ioapic_info(struct device *, int, const char *, int); + +void yyerror (const char *); +void yyrestart (FILE *input_file ); + +/* Prevent warnings from -Wmissing-prototypes. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped index 3a56ac8..56045d0 100644 --- a/util/sconfig/sconfig.tab.c_shipped +++ b/util/sconfig/sconfig.tab.c_shipped @@ -673,6 +673,7 @@ while (YYID (0)) #ifdef YYLEX_PARAM # define YYLEX yylex (YYLEX_PARAM) #else +int yylex(void); # define YYLEX yylex () #endif @@ -1127,22 +1128,6 @@ yydestruct (yymsg, yytype, yyvaluep) } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - /* The lookahead symbol. */ int yychar;

1 0

New patch to review for coreboot: a669a1c romcc.c: Suppress warning about unused function.
by Edward O'Callaghan 20 Feb '14

20 Feb '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5273 -gerrit commit a669a1c6a3d2f5e22e3e8cf8f2aa2a8e7ef9268a Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Feb 20 19:37:42 2014 +1100 romcc.c: Suppress warning about unused function. GCC suppresses warnings about unused static functions if they are inline, however Clang only does this for header files. Add attribute to suppress unused function warning on Clang. Change-Id: Ia230beba3f6367237838d9b3d90536459e1d52cb Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- util/romcc/romcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c index b045b46..3ac42f7 100644 --- a/util/romcc/romcc.c +++ b/util/romcc/romcc.c @@ -5648,6 +5648,7 @@ static struct type *invalid_type(struct compile_state *state, struct type *type) #define MASK_UCHAR(X) ((X) & ((ulong_t)0xff)) #define MASK_USHORT(X) ((X) & (((ulong_t)1 << (SIZEOF_SHORT)) - 1)) +static inline ulong_t mask_uint(ulong_t x) __attribute__((unused)); static inline ulong_t mask_uint(ulong_t x) { if (SIZEOF_INT < SIZEOF_LONG) {

1 0

Patch set updated for coreboot: bba52bb libpayload/libc/hexdump.c: Use `p` as conversion specifier for void * pointer argument
by Ronald G. Minnich 20 Feb '14

20 Feb '14

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4767 -gerrit commit bba52bb521858f64c800adff1b17031f70238636 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Tue Jan 21 12:08:18 2014 +0100 libpayload/libc/hexdump.c: Use `p` as conversion specifier for void * pointer argument Change-Id: Ie5c279ef90bd9ed5e2624bf852dcff1f06531a13 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- payloads/libpayload/libc/hexdump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/libpayload/libc/hexdump.c b/payloads/libpayload/libc/hexdump.c index e4aa8b9..814adf2 100644 --- a/payloads/libpayload/libc/hexdump.c +++ b/payloads/libpayload/libc/hexdump.c @@ -49,7 +49,7 @@ void hexdump(void *memory, int length) } if (all_zero < 2) { - printf("%08lx:", memory + i); + printf("%8p:", memory + i); for (j = 0; j < 16; j++) printf(" %02x", m[i + j]); printf(" ");

1 0

New patch to review for coreboot: 6064c5b qemu-i440fx: Ignore missing prototype for entry point main()
by Edward O'Callaghan 20 Feb '14

20 Feb '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5272 -gerrit commit 6064c5bf45a6ee8eedfd5a0a35995961870676d1 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Feb 20 16:08:51 2014 +1100 qemu-i440fx: Ignore missing prototype for entry point main() The main of romstage in qemu-i440fx is called as the entry point in assembler and so should be compiled with -ffreestanding. We should also ignore a missing prototype in this particular case. Change-Id: Id0ce2348483c6e5388369000451811673f0c4eaa Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/arch/x86/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 4b28697..7362b64 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -266,7 +266,7 @@ else $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h @printf " CC romstage.inc\n" - $(CC) -MMD $(CFLAGS) -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@ + $(CC) -MMD $(CFLAGS) -ffreestanding -Wno-missing-prototypes -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc @printf " POST romstage.inc\n"

1 0

Patch set updated for coreboot: 958995b CAR_GLOBAL: enforce compiler to check if _start != _end
by Edward O'Callaghan 20 Feb '14

20 Feb '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4719 -gerrit commit 958995b116e147d8222ff0465e9733fdca3494b5 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Feb 20 05:10:09 2014 +1100 CAR_GLOBAL: enforce compiler to check if _start != _end There are some fun rules C compilers can use to optimize their code. One of them is the assumption that two symbols point to two different addresses. In this case this wasn't true, resulting in unintended code execution (and later, a crash) with a clang build. Change-Id: I1496b22e1d1869ed0610e321b6ec6a83252e9d8b Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/arch/x86/init/romstage.ld | 1 + src/cpu/x86/car.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/x86/init/romstage.ld b/src/arch/x86/init/romstage.ld index f44185f..5458cfc 100644 --- a/src/arch/x86/init/romstage.ld +++ b/src/arch/x86/init/romstage.ld @@ -37,6 +37,7 @@ SECTIONS . = ALIGN(16); _car_migrate_start = .; *(.car.migrate); + LONG(0); _car_migrate_end = .; . = ALIGN(16); _erom = .; diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index 481153d..a7e3842 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -26,7 +26,6 @@ typedef void (* const car_migration_func_t)(void); extern car_migration_func_t _car_migrate_start; -extern car_migration_func_t _car_migrate_end; extern char _car_data_start[]; extern char _car_data_end[]; @@ -98,7 +97,7 @@ void car_migrate_variables(void) /* Call all the migration functions. */ migrate_func = &_car_migrate_start; - while (migrate_func != &_car_migrate_end) { + while (*migrate_func != NULL) { (*migrate_func)(); migrate_func++; }

1 0

Patch set updated for coreboot: c87883d libpayload/endian.h: Provide alignment-agnostic enc/dec bytestreams.
by Edward O'Callaghan 20 Feb '14

20 Feb '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5198 -gerrit commit c87883d09a341f560a3bd4df8a0757c7bc3bb805 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Wed Feb 12 21:53:44 2014 +1100 libpayload/endian.h: Provide alignment-agnostic enc/dec bytestreams. Alignment-agnostic encode/decode bytestream to/from little/big endian. The le16enc(), le16dec(), le32enc(), le32dec() functions encode and decode integers to/from byte strings on any alignment in big/little endian format. See BYTEORDER(9). Change-Id: I73a174b9c02c467bc60590c5cd894dac58b8683a Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- payloads/libpayload/include/endian.h | 74 +++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/include/endian.h b/payloads/libpayload/include/endian.h index cb50443..c7ef32d 100644 --- a/payloads/libpayload/include/endian.h +++ b/payloads/libpayload/include/endian.h @@ -69,7 +69,7 @@ static inline uint64_t swap_bytes64(uint64_t in) #error Cant tell if the CPU is little or big endian. -#endif +#endif /* CONFIG_*_ENDIAN */ #define be16toh(in) htobe16(in) #define be32toh(in) htobe32(in) @@ -87,6 +87,76 @@ static inline uint64_t swap_bytes64(uint64_t in) #define ntohl(in) be32toh(in) #define ntohll(in) be64toh(in) +/* + * Alignment-agnostic encode/decode bytestream to/from little/big endian. + */ + +static inline uint16_t be16dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return ((p[0] << 8) | p[1]); +} + +static inline uint32_t be32dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return (((unsigned)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]); +} + +static inline uint16_t le16dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return ((p[1] << 8) | p[0]); +} + +static inline uint32_t le32dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]); +} + +static inline void bebitenc(void *pp, uint32_t u, uint8_t b) +{ + uint8_t *p = (uint8_t *)pp; + int i; + + for(i=(b-1); i >= 0; i++) + p[i] = (u >> i*8) & 0xFF; +} + +static inline void be16enc(void *pp, uint16_t u) +{ + bebitenc(pp, u, 2); +} + +static inline void be32enc(void *pp, uint32_t u) +{ + bebitenc(pp, u, 4); +} + +static inline void lebitenc(void *pp, uint32_t u, uint8_t b) +{ + uint8_t *p = (uint8_t *)pp; + int i; + + for(i=0; i < b; i++) + p[i] = (u >> i*8) & 0xFF; +} + +static inline void le16enc(void *pp, uint16_t u) +{ + lebitenc(pp, u, 2); +} + +static inline void le32enc(void *pp, uint32_t u) +{ + lebitenc(pp, u, 4); +} + /* Deprecated names (not in glibc / BSD) */ #define htobew(in) htobe16(in) #define htobel(in) htobe32(in) @@ -101,4 +171,4 @@ static inline uint64_t swap_bytes64(uint64_t in) #define letohl(in) le32toh(in) #define letohll(in) le64toh(in) -#endif +#endif /* _ENDIAN_H_ */

1 0

Patch set updated for coreboot: c18bdcd intel/model_2065x: Fix APICID generation.
by Vladimir Serbinenko 19 Feb '14

19 Feb '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5262 -gerrit commit c18bdcd1745aca8e014015bac6fd11f83500bba4 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Wed Feb 19 22:00:00 2014 +0100 intel/model_2065x: Fix APICID generation. APIC IDs always step by 4 on 2065x independently of number of threads. Change-Id: I5abd4005c8ce1740bb0862d952af66236b609aa8 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/cpu/intel/model_2065x/model_2065x_init.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c index 2cbe906..e73e237 100644 --- a/src/cpu/intel/model_2065x/model_2065x_init.c +++ b/src/cpu/intel/model_2065x/model_2065x_init.c @@ -371,11 +371,8 @@ static void intel_cores_init(device_t cpu) /* Build the cpu device path */ cpu_path.type = DEVICE_PATH_APIC; cpu_path.apic.apic_id = - cpu->path.apic.apic_id + (i & 1) + ((i & 2) << 1); - - /* Update APIC ID if no hyperthreading */ - if (threads_per_core == 1) - cpu_path.apic.apic_id <<= 1; + cpu->path.apic.apic_id + (i % threads_per_core) + + ((i / threads_per_core) << 2); /* Allocate the new cpu device structure */ new = alloc_dev(cpu->bus, &cpu_path);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2014