coreboot February 2008

coreboot@coreboot.org

77 participants
422 discussions

[PATCH] v3: correct Makefile dependencies
by Carl-Daniel Hailfinger 13 Feb '08

13 Feb '08

Correct Makefile dependencies. This worked by accident before. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: LinuxBIOSv3-makefiledependencies/arch/x86/Makefile =================================================================== --- LinuxBIOSv3-makefiledependencies/arch/x86/Makefile (Revision 590) +++ LinuxBIOSv3-makefiledependencies/arch/x86/Makefile (Arbeitskopie) @@ -208,7 +208,7 @@ STAGE2_OBJ_NEEDED = $(filter-out $(STAGE0_OBJ), $(STAGE2_OBJ)) -$(obj)/coreboot.stage2 $(obj)/coreboot.stage2.map: $(obj)/stage0.init $(STAGE2_OBJ_NEEDED) +$(obj)/coreboot.stage2 $(obj)/coreboot.stage2.map: $(obj)/stage0.o $(STAGE2_OBJ_NEEDED) $(Q)# leave a .o with full symbols in it for debugging. $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" $(Q)$(LD) -R $(obj)/stage0.o -Ttext 0x2000 --entry=stage2 \ -- http://www.hailfinger.org/

2 2

r591 - coreboot-v3/arch/x86
by svn＠coreboot.org 13 Feb '08

13 Feb '08

Author: hailfinger Date: 2008-02-13 17:43:32 +0100 (Wed, 13 Feb 2008) New Revision: 591 Modified: coreboot-v3/arch/x86/Makefile Log: Correct Makefile dependencies. This worked by accident before. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: coreboot-v3/arch/x86/Makefile =================================================================== --- coreboot-v3/arch/x86/Makefile 2008-02-13 15:48:37 UTC (rev 590) +++ coreboot-v3/arch/x86/Makefile 2008-02-13 16:43:32 UTC (rev 591) @@ -208,7 +208,7 @@ STAGE2_OBJ_NEEDED = $(filter-out $(STAGE0_OBJ), $(STAGE2_OBJ)) -$(obj)/coreboot.stage2 $(obj)/coreboot.stage2.map: $(obj)/stage0.init $(STAGE2_OBJ_NEEDED) +$(obj)/coreboot.stage2 $(obj)/coreboot.stage2.map: $(obj)/stage0.o $(STAGE2_OBJ_NEEDED) $(Q)# leave a .o with full symbols in it for debugging. $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" $(Q)$(LD) -R $(obj)/stage0.o -Ttext 0x2000 --entry=stage2 \

1 0

r115 - buildrom-devel/packages/kernel
by svn＠coreboot.org 13 Feb '08

13 Feb '08

Author: ward Date: 2008-02-13 17:36:55 +0100 (Wed, 13 Feb 2008) New Revision: 115 Modified: buildrom-devel/packages/kernel/kernel.inc Log: Fix make dependency for kernel-config to be the kernel .config file rather than stamps/.patched. This means that make distclean && make kernel-config will now work properly. Before this patch the .config file would not be copied from packages/kernel/conf/. This is a trivial patch. Signed-off-by: Ward Vandewege <ward(a)gnu.org> Acked-by: Ward Vandewege <ward(a)gnu.org> Modified: buildrom-devel/packages/kernel/kernel.inc =================================================================== --- buildrom-devel/packages/kernel/kernel.inc 2008-02-13 16:26:58 UTC (rev 114) +++ buildrom-devel/packages/kernel/kernel.inc 2008-02-13 16:36:55 UTC (rev 115) @@ -97,7 +97,7 @@ kernel-extract: $(KERNEL_STAMP_DIR)/.patched -kernel-config: $(KERNEL_STAMP_DIR)/.patched +kernel-config: | $(KERNEL_SRC_DIR)/.config ifeq ($(shell if [ -f $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) @ cp -f $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(KERNEL_SRC_DIR)/.config endif

1 0

r114 - buildrom-devel/packages/kernel/conf
by svn＠coreboot.org 13 Feb '08

13 Feb '08

Author: ward Date: 2008-02-13 17:26:58 +0100 (Wed, 13 Feb 2008) New Revision: 114 Modified: buildrom-devel/packages/kernel/conf/defconfig-tyan-s2882 Log: This patch updates the LAB kernel config for the Tyan s2882 so that it can see a 64-bit address and IO space (and up to 64GB of RAM) and is optimized for Opteron CPUs. The kernel that is kexec'ed from the LAB kernel can not do this by itself it seems (the same with enabling SMP), so our LAB kernel needs to be configured properly. This is a trivial patch. Signed-off-by: Ward Vandewege <ward(a)gnu.org> Acked-by: Ward Vandewege <ward(a)gnu.org> Modified: buildrom-devel/packages/kernel/conf/defconfig-tyan-s2882 =================================================================== --- buildrom-devel/packages/kernel/conf/defconfig-tyan-s2882 2008-02-11 20:36:54 UTC (rev 113) +++ buildrom-devel/packages/kernel/conf/defconfig-tyan-s2882 2008-02-13 16:26:58 UTC (rev 114) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22.2 -# Wed Oct 24 14:00:48 2007 +# Tue Feb 12 16:19:45 2008 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -137,7 +137,7 @@ # CONFIG_X86_GENERICARCH is not set # CONFIG_X86_ES7000 is not set # CONFIG_PARAVIRT is not set -CONFIG_M386=y +# CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set @@ -150,7 +150,7 @@ # CONFIG_MPENTIUM4 is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set -# CONFIG_MK8 is not set +CONFIG_MK8=y # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set @@ -162,14 +162,23 @@ # CONFIG_MVIAC3_2 is not set # CONFIG_MVIAC7 is not set # CONFIG_X86_GENERIC is not set -CONFIG_X86_L1_CACHE_SHIFT=4 -CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y -CONFIG_X86_MINIMUM_CPU_MODEL=0 +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_GOOD_APIC=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_MINIMUM_CPU_MODEL=4 CONFIG_HPET_TIMER=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set @@ -194,15 +203,17 @@ # CONFIG_EDD is not set # CONFIG_DELL_RBU is not set # CONFIG_DCDBAS is not set -CONFIG_NOHIGHMEM=y +# CONFIG_NOHIGHMEM is not set # CONFIG_HIGHMEM4G is not set -# CONFIG_HIGHMEM64G is not set +CONFIG_HIGHMEM64G=y CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_2G_OPT is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_X86_PAE=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -215,9 +226,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set +CONFIG_RESOURCES_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_NR_QUICK=1 +# CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set # CONFIG_MTRR is not set # CONFIG_SECCOMP is not set @@ -227,10 +239,12 @@ # CONFIG_HZ_1000 is not set CONFIG_HZ=250 CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x100000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_COMPAT_VDSO=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management options (ACPI, APM)

1 0

[PATCH] v3: printk buffer
by Carl-Daniel Hailfinger 13 Feb '08

13 Feb '08

Make printk() log to a buffer. This only works with qemu for now, but there it works really well. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: LinuxBIOSv3-printkbuffer/include/console.h =================================================================== --- LinuxBIOSv3-printkbuffer/include/console.h (Revision 584) +++ LinuxBIOSv3-printkbuffer/include/console.h (Arbeitskopie) @@ -37,6 +37,8 @@ unsigned char console_rx_byte(void); int console_tst_byte(void); void die(const char *msg); +void printk_buffer_init(void); +void printk_buffer_move(void *newaddr, int newsize); struct console_driver { void (*init)(void); @@ -46,8 +48,20 @@ int (*tst_byte)(void); }; +struct printk_buffer { + int len; + int readoffset; + int writeoffset; + int realoffset; +#ifdef CONFIG_CHECK_STACK_USAGE /* This config variable does not exit yet. */ + void *loweststack; +#endif + char buffer[]; +}; + SHARED_WITH_ATTRIBUTES(printk, int, __attribute__((format (printf, 2, 3))), int msg_level, const char *fmt, ...); SHARED(banner, void, int msg_level, const char *msg); +SHARED(dump_mem_range, void, unsigned char *buf, int size); #endif /* CONSOLE_H */ Index: LinuxBIOSv3-printkbuffer/include/arch/x86/cpu.h =================================================================== --- LinuxBIOSv3-printkbuffer/include/arch/x86/cpu.h (Revision 584) +++ LinuxBIOSv3-printkbuffer/include/arch/x86/cpu.h (Arbeitskopie) @@ -24,6 +24,7 @@ #include <types.h> #include <device/device.h> +#include <shared.h> #define X86_VENDOR_INTEL 0 #define X86_VENDOR_CYRIX 1 @@ -196,4 +197,15 @@ __asm__ __volatile__("hlt" : : : "memory"); } +SHARED(bottom_of_stack, void *, void); + +#define PRINTK_BUF_SIZE_CAR 2048 +#ifndef CONFIG_CARBASE +#error CONFIG_CARBASE was not defined +#else +#define PRINTK_BUF_ADDR_CAR CONFIG_CARBASE +#endif +#define PRINTK_BUF_SIZE_RAM 65536 +#define PRINTK_BUF_ADDR_RAM 0x90000 + #endif /* ARCH_X86_CPU_H */ Index: LinuxBIOSv3-printkbuffer/device/device.c =================================================================== --- LinuxBIOSv3-printkbuffer/device/device.c (Revision 584) +++ LinuxBIOSv3-printkbuffer/device/device.c (Arbeitskopie) @@ -742,17 +742,16 @@ post_code(POST_STAGE2_PHASE2_ENTER); printk(BIOS_DEBUG, "Phase 2: Early setup...\n"); for (dev = all_devices; dev; dev = dev->next) { - printk(BIOS_SPEW, "%s: dev %s: ", __FUNCTION__, dev->dtsname); - printk(BIOS_SPEW, "%s: ops %p ops->phase2_setup_scan_bus %p\n", - __FUNCTION__, dev->ops, + printk(BIOS_SPEW, + "%s: dev %s: ops %p ops->phase2_setup_scan_bus %p\n", + __FUNCTION__, dev->dtsname, dev->ops, dev->ops? dev->ops->phase2_setup_scan_bus : NULL); if (dev->ops && dev->ops->phase2_setup_scan_bus) { printk(BIOS_SPEW, - "Calling phase2 phase2_setup_scan_bus..."); + "Calling phase2 phase2_setup_scan_bus...\n"); dev->ops->phase2_setup_scan_bus(dev); - printk(BIOS_SPEW, " done"); + printk(BIOS_SPEW, " done\n"); } - printk(BIOS_SPEW, "\n"); } post_code(POST_STAGE2_PHASE2_DONE); Index: LinuxBIOSv3-printkbuffer/lib/console.c =================================================================== --- LinuxBIOSv3-printkbuffer/lib/console.c (Revision 584) +++ LinuxBIOSv3-printkbuffer/lib/console.c (Arbeitskopie) @@ -3,6 +3,7 @@ #include <console.h> #include <uart8250.h> #include <stdarg.h> +#include <string.h> int vtxprintf(void (*)(unsigned char, void *arg), void *arg, const char *, va_list); @@ -12,8 +13,59 @@ return CONFIG_DEFAULT_CONSOLE_LOGLEVEL; } +void printk_buffer_move(void *newaddr, int newsize) +{ + struct printk_buffer **p; + struct printk_buffer *oldbuf, *newbuf; + p = bottom_of_stack(); + oldbuf = *p; + *p = newbuf = newaddr; + /* FIXME: The memcpy is wrong on so many levels. + * It should deal with wraparounds and with oldbuf->len > newbuf->len + */ + memcpy(newbuf, oldbuf, sizeof(struct printk_buffer) + oldbuf->len); + newbuf->len = newsize; + return; +} + +struct printk_buffer *printk_buffer_addr(void) +{ + struct printk_buffer **p; + p = bottom_of_stack(); + return *p; +} + +void printk_buffer_init(void) +{ + struct printk_buffer *buf = printk_buffer_addr(); + buf->len = PRINTK_BUF_SIZE_CAR - sizeof(struct printk_buffer); + buf->readoffset = 0; + buf->writeoffset = 0; +#ifdef CONFIG_CHECK_STACK_USAGE /* This config variable does not exit yet. */ + buf->loweststack = 0; +#endif + return; +} + +void buffer_tx_byte(unsigned char byte, void *arg) +{ + struct printk_buffer *buf = printk_buffer_addr(); + buf->buffer[buf->writeoffset++] = byte; + buf->writeoffset %= buf->len; +#ifdef CONFIG_CHECK_STACK_USAGE /* This config variable does not exit yet. */ + int i; + /* stack usage checker */ + for (i = 0; i < 2048; i++) + if (buf->buffer[buf->len + i] != 0x0) + break; + buf->loweststack = &buf->buffer[buf->len + i]; +#endif + return; +} + void console_tx_byte(unsigned char byte, void *arg) { + buffer_tx_byte(byte, arg); if (byte == '\n') { uart8250_tx_byte(TTYSx_BASE, '\r'); #if defined(CONFIG_CONSOLE_PREFIX) && (CONFIG_CONSOLE_PREFIX == 1) Index: LinuxBIOSv3-printkbuffer/arch/x86/Kconfig =================================================================== --- LinuxBIOSv3-printkbuffer/arch/x86/Kconfig (Revision 584) +++ LinuxBIOSv3-printkbuffer/arch/x86/Kconfig (Arbeitskopie) @@ -69,4 +69,15 @@ coreboot work correctly on symmetric multi processor systems. It is usually set in mainboard/*/Kconfig. - + +config CARBASE + hex + default 0x8f000 if CPU_I586 + help + This option sets the base address of the area used for CAR. + +config CARSIZE + hex + default 0x1000 if CPU_I586 + help + This option sets the size of the area used for CAR. Index: LinuxBIOSv3-printkbuffer/arch/x86/stage0_i586.S =================================================================== --- LinuxBIOSv3-printkbuffer/arch/x86/stage0_i586.S (Revision 584) +++ LinuxBIOSv3-printkbuffer/arch/x86/stage0_i586.S (Arbeitskopie) @@ -184,14 +184,13 @@ */ #ifndef CONFIG_CARSIZE -#define CacheSize 4096 +#error CONFIG_CARSIZE was not defined #else #define CacheSize CONFIG_CARSIZE #endif -/* pick a safer value for default -- i.e. not the C segment! */ #ifndef CONFIG_CARBASE -#define CacheBase (0x90000 - CacheSize) +#error CONFIG_CARBASE was not defined #else #define CacheBase CONFIG_CARBASE #endif @@ -442,7 +441,9 @@ movw %ax, %ss lout: - + /* Store pointer to start of printk buffer */ + movl $CacheBase, %eax + pushl %eax /* printk buffer */ /* Restore the BIST result */ movl %ebp, %eax /* We need to set ebp ? No need */ Index: LinuxBIOSv3-printkbuffer/arch/x86/stage1.c =================================================================== --- LinuxBIOSv3-printkbuffer/arch/x86/stage1.c (Revision 584) +++ LinuxBIOSv3-printkbuffer/arch/x86/stage1.c (Arbeitskopie) @@ -26,6 +26,7 @@ #include <tables.h> #include <lib.h> #include <mc146818rtc.h> +#include <cpu.h> /* ah, well, what a mess! This is a hard code. FIX ME but how? * By getting rid of ELF ... @@ -66,6 +67,26 @@ // FIXME check integrity } + +void *bottom_of_stack(void) +{ + + /* -4-4 because CONFIG_CARBASE + CONFIG_CARSIZE - 4 is initial %esp */ + return (void *)(CONFIG_CARBASE + CONFIG_CARSIZE - 4 - 4); +} + +void dump_mem_range(unsigned char *buf, int size) +{ + int i; + printk(BIOS_SPEW, "dump memrange:\n"); + for (i = 0; i < size; i++) { + printk(BIOS_SPEW, "%02x ", buf[i]); + if (i % 16 == 15) + printk(BIOS_SPEW, "\n"); + } + return; +} + /* until we get rid of elf */ int legacy(struct mem_file *archive, char *name, void *where, struct lb_memory *mem) { @@ -116,6 +137,9 @@ // We have cache as ram running and can start executing code in C. + /* Initialize the printk buffer. */ + printk_buffer_init(); + hardware_stage1(); // @@ -160,10 +184,12 @@ printk(BIOS_DEBUG, "Done RAM init code\n"); - /* Turn off Cache-As-Ram */ disable_car(); + /* Move the printk buffer to PRINTK_BUF_ADDR_RAM */ + printk_buffer_move((void *)PRINTK_BUF_ADDR_RAM, PRINTK_BUF_SIZE_RAM); + entry = load_file_segments(&archive, "normal/stage2"); if (entry == (void *)-1) die("FATAL: Failed loading stage2."); -- http://www.hailfinger.org/

5 13

r590 - in coreboot-v3: arch/x86 arch/x86/geodelx include include/arch/x86 lib
by svn＠coreboot.org 13 Feb '08

13 Feb '08

Author: hailfinger Date: 2008-02-13 16:48:37 +0100 (Wed, 13 Feb 2008) New Revision: 590 Modified: coreboot-v3/arch/x86/geodelx/stage0.S coreboot-v3/arch/x86/stage0_i586.S coreboot-v3/arch/x86/stage1.c coreboot-v3/include/arch/x86/cpu.h coreboot-v3/include/console.h coreboot-v3/lib/Kconfig coreboot-v3/lib/console.c Log: Make printk() log to a buffer. Tested on Qemu and Geode LX. Benefits of this patch: - printk() now works directly after printk_buffer_init(), even before the serial port is set up. - If all you want is a log, you don't have to bother with serial output. - A payload can read and analyze the log. - You can build on this and buffer log until serial is available, then flush the messages buffered so far. The printk buffer is configurable with a default-on Kconfig variable. If you want to dump the buffer from the Qemu monitor after CAR has been disabled, use this command: memsave 0x90000 65536 memdump.bin Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Peter Stuge <peter(a)stuge.se> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Marc Jones <marc.jones(a)amd.com> Modified: coreboot-v3/arch/x86/geodelx/stage0.S =================================================================== --- coreboot-v3/arch/x86/geodelx/stage0.S 2008-02-13 15:35:30 UTC (rev 589) +++ coreboot-v3/arch/x86/geodelx/stage0.S 2008-02-13 15:48:37 UTC (rev 590) @@ -361,6 +361,13 @@ movw %ax, %ss lout: +#ifdef CONFIG_CONSOLE_BUFFER + /* Store pointer to start of printk buffer, should really use + * PRINTK_BUF_ADDR_CAR instead. + */ + movl $CONFIG_CARBASE, %eax + pushl %eax /* printk buffer */ +#endif /* Restore the BIST result. */ movl %ebp, %eax Modified: coreboot-v3/arch/x86/stage0_i586.S =================================================================== --- coreboot-v3/arch/x86/stage0_i586.S 2008-02-13 15:35:30 UTC (rev 589) +++ coreboot-v3/arch/x86/stage0_i586.S 2008-02-13 15:48:37 UTC (rev 590) @@ -433,7 +433,13 @@ movw %ax, %ss lout: - +#ifdef CONFIG_CONSOLE_BUFFER + /* Store pointer to start of printk buffer, should really use + * PRINTK_BUF_ADDR_CAR instead. + */ + movl $CONFIG_CARBASE, %eax + pushl %eax /* printk buffer */ +#endif /* Restore the BIST result */ movl %ebp, %eax /* We need to set ebp ? No need */ Modified: coreboot-v3/arch/x86/stage1.c =================================================================== --- coreboot-v3/arch/x86/stage1.c 2008-02-13 15:35:30 UTC (rev 589) +++ coreboot-v3/arch/x86/stage1.c 2008-02-13 15:48:37 UTC (rev 590) @@ -26,6 +26,7 @@ #include <tables.h> #include <lib.h> #include <mc146818rtc.h> +#include <cpu.h> /* ah, well, what a mess! This is a hard code. FIX ME but how? * By getting rid of ELF ... @@ -67,6 +68,12 @@ } +void *bottom_of_stack(void) +{ + /* -4-4 because CONFIG_CARBASE + CONFIG_CARSIZE - 4 is initial %esp */ + return (void *)(CONFIG_CARBASE + CONFIG_CARSIZE - 4 - 4); +} + void dump_mem_range(int msg_level, unsigned char *buf, int size) { int i; @@ -129,6 +136,11 @@ // We have cache as ram running and can start executing code in C. +#ifdef CONFIG_CONSOLE_BUFFER + /* Initialize the printk buffer. */ + printk_buffer_init(); +#endif + hardware_stage1(); // @@ -173,10 +185,14 @@ printk(BIOS_DEBUG, "Done RAM init code\n"); - /* Turn off Cache-As-Ram */ disable_car(); +#ifdef CONFIG_CONSOLE_BUFFER + /* Move the printk buffer to PRINTK_BUF_ADDR_RAM */ + printk_buffer_move((void *)PRINTK_BUF_ADDR_RAM, PRINTK_BUF_SIZE_RAM); +#endif + entry = load_file_segments(&archive, "normal/stage2"); if (entry == (void *)-1) die("FATAL: Failed loading stage2."); Modified: coreboot-v3/include/arch/x86/cpu.h =================================================================== --- coreboot-v3/include/arch/x86/cpu.h 2008-02-13 15:35:30 UTC (rev 589) +++ coreboot-v3/include/arch/x86/cpu.h 2008-02-13 15:48:37 UTC (rev 590) @@ -24,6 +24,7 @@ #include <types.h> #include <device/device.h> +#include <shared.h> #define X86_VENDOR_INTEL 0 #define X86_VENDOR_CYRIX 1 @@ -196,4 +197,13 @@ __asm__ __volatile__("hlt" : : : "memory"); } +SHARED(bottom_of_stack, void *, void); + +#ifdef CONFIG_CONSOLE_BUFFER +#define PRINTK_BUF_SIZE_CAR (CONFIG_CARSIZE / 2) +#define PRINTK_BUF_ADDR_CAR CONFIG_CARBASE +#define PRINTK_BUF_SIZE_RAM 65536 +#define PRINTK_BUF_ADDR_RAM 0x90000 +#endif + #endif /* ARCH_X86_CPU_H */ Modified: coreboot-v3/include/console.h =================================================================== --- coreboot-v3/include/console.h 2008-02-13 15:35:30 UTC (rev 589) +++ coreboot-v3/include/console.h 2008-02-13 15:48:37 UTC (rev 590) @@ -37,6 +37,10 @@ unsigned char console_rx_byte(void); int console_tst_byte(void); void die(const char *msg); +#ifdef CONFIG_CONSOLE_BUFFER +void printk_buffer_init(void); +void printk_buffer_move(void *newaddr, int newsize); +#endif struct console_driver { void (*init)(void); @@ -46,6 +50,15 @@ int (*tst_byte)(void); }; +#ifdef CONFIG_CONSOLE_BUFFER +struct printk_buffer { + int len; + int readoffset; + int writeoffset; + char buffer[]; +}; +#endif + SHARED_WITH_ATTRIBUTES(printk, int, __attribute__((format (printf, 2, 3))), int msg_level, const char *fmt, ...); SHARED(banner, void, int msg_level, const char *msg); Modified: coreboot-v3/lib/Kconfig =================================================================== --- coreboot-v3/lib/Kconfig 2008-02-13 15:35:30 UTC (rev 589) +++ coreboot-v3/lib/Kconfig 2008-02-13 15:48:37 UTC (rev 590) @@ -223,5 +223,12 @@ When you enable this option, coreboot will prefix each line of console output with '(LB)'. +config CONSOLE_BUFFER + boolean "Console memory buffer support" + default y + depends CONSOLE + help + Save coreboot output in a memory buffer. + endmenu Modified: coreboot-v3/lib/console.c =================================================================== --- coreboot-v3/lib/console.c 2008-02-13 15:35:30 UTC (rev 589) +++ coreboot-v3/lib/console.c 2008-02-13 15:48:37 UTC (rev 590) @@ -3,6 +3,7 @@ #include <console.h> #include <uart8250.h> #include <stdarg.h> +#include <string.h> int vtxprintf(void (*)(unsigned char, void *arg), void *arg, const char *, va_list); @@ -12,8 +13,80 @@ return CONFIG_DEFAULT_CONSOLE_LOGLEVEL; } +#ifdef CONFIG_CONSOLE_BUFFER +void printk_buffer_move(void *newaddr, int newsize) +{ + struct printk_buffer **p; + struct printk_buffer *oldbuf, *newbuf; + int copylen; + p = bottom_of_stack(); + oldbuf = *p; + newbuf = newaddr; + newbuf->len = newsize; + newbuf->readoffset = 0; + /* Check for wraparound */ + if (oldbuf->writeoffset < oldbuf->readoffset) { + /* Copy from readoffset to end of buffer. */ + copylen = oldbuf->len - oldbuf->readoffset; + } else { + /* Copy from readoffset to writeoffset (exclusive).*/ + copylen = oldbuf->writeoffset - oldbuf->readoffset; + } + if (copylen > newsize) + copylen = newsize; + /* If memcpy() ever uses printk we will see pretty explosions. */ + memcpy(&newbuf->buffer[0], &oldbuf->buffer[oldbuf->readoffset], + copylen); + newbuf->writeoffset = copylen; + /* Check for wraparound */ + if (oldbuf->writeoffset < oldbuf->readoffset) { + /* Copy from start of buffer to writeoffset (exclusive). */ + copylen = (copylen + oldbuf->writeoffset > newsize) + ? newsize - copylen : oldbuf->writeoffset; + memcpy(&newbuf->buffer[newbuf->writeoffset], + &oldbuf->buffer[0], copylen); + newbuf->writeoffset += copylen; + } + *p = newbuf; + return; +} + +struct printk_buffer *printk_buffer_addr(void) +{ + struct printk_buffer **p; + p = bottom_of_stack(); + return *p; +} + +void printk_buffer_init(void) +{ + struct printk_buffer *buf = printk_buffer_addr(); + buf->len = PRINTK_BUF_SIZE_CAR - sizeof(struct printk_buffer); + buf->readoffset = 0; + buf->writeoffset = 0; + return; +} + +void buffer_tx_byte(unsigned char byte, void *arg) +{ + struct printk_buffer *buf = printk_buffer_addr(); + buf->buffer[buf->writeoffset++] = byte; + buf->writeoffset %= buf->len; + /* Make sure writeoffset is always ahead of readoffset here. */ + if (buf->writeoffset == buf->readoffset) { + buf->readoffset++; + buf->readoffset %= buf->len; + } + return; +} +#endif + void console_tx_byte(unsigned char byte, void *arg) { +#ifdef CONFIG_CONSOLE_BUFFER + buffer_tx_byte(byte, arg); +#endif +#ifdef CONFIG_CONSOLE_SERIAL if (byte == '\n') { uart8250_tx_byte(TTYSx_BASE, '\r'); #if defined(CONFIG_CONSOLE_PREFIX) && (CONFIG_CONSOLE_PREFIX == 1) @@ -26,8 +99,8 @@ return; #endif } - uart8250_tx_byte(TTYSx_BASE, byte); +#endif } int printk(int msg_level, const char *fmt, ...)

1 0

[PATCH] v3: Nuke superfluous comments for C beginners
by Carl-Daniel Hailfinger 13 Feb '08

13 Feb '08

Nuke superfluous comments for C beginners in for loops. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: LinuxBIOSv3-cosmetic/southbridge/amd/cs5536/cs5536.c =================================================================== --- LinuxBIOSv3-cosmetic/southbridge/amd/cs5536/cs5536.c (Revision 588) +++ LinuxBIOSv3-cosmetic/southbridge/amd/cs5536/cs5536.c (Arbeitskopie) @@ -492,7 +492,7 @@ if (!IsS3Resume()) { struct acpi_init *aci = acpi_init_table; - for (/* Nothing */; aci->ioreg; aci++) { + for (; aci->ioreg; aci++) { outl(aci->regdata, aci->ioreg); inl(aci->ioreg); } @@ -517,7 +517,7 @@ wrmsr(GLPCI_SB_CTRL, msr); csi = SB_MASTER_CONF_TABLE; - for (/* Nothing */; csi->msrnum; csi++) { + for (; csi->msrnum; csi++) { msr.lo = csi->msr.lo; msr.hi = csi->msr.hi; wrmsr(csi->msrnum, msr); @@ -533,7 +533,7 @@ /* TODO: Why the extra block here? Can it be removed? */ { csi = CS5536_CLOCK_GATING_TABLE; - for (/* Nothing */; csi->msrnum; csi++) { + for (; csi->msrnum; csi++) { msr.lo = csi->msr.lo; msr.hi = csi->msr.hi; wrmsr(csi->msrnum, msr); Index: LinuxBIOSv3-cosmetic/northbridge/amd/geodelx/geodelxinit.c =================================================================== --- LinuxBIOSv3-cosmetic/northbridge/amd/geodelx/geodelxinit.c (Revision 588) +++ LinuxBIOSv3-cosmetic/northbridge/amd/geodelx/geodelxinit.c (Arbeitskopie) @@ -471,7 +471,7 @@ struct msr msr; struct msrinit *gating = clock_gating_default; - for (/* Nothing */; gating->msrnum != 0xffffffff; gating++) { + for (; gating->msrnum != 0xffffffff; gating++) { msr = rdmsr(gating->msrnum); msr.hi |= gating->msr.hi; msr.lo |= gating->msr.lo; @@ -487,7 +487,7 @@ struct msr msr; struct msrinit *prio = geode_link_priority_table; - for (/* Nothing */; prio->msrnum != 0xffffffff; prio++) { + for (; prio->msrnum != 0xffffffff; prio++) { msr = rdmsr(prio->msrnum); msr.hi |= prio->msr.hi; msr.lo &= ~0xfff; @@ -539,7 +539,7 @@ } /* Load up C000 settings in eax. */ - for (/* Nothing */; bit; bit--) { + for (; bit; bit--) { msr.lo <<= 8; msr.lo |= 1; /* Cache disable PCI/Shadow memory. */ if (shadowByte && (1 << bit)) @@ -559,7 +559,7 @@ } /* Load up E000 settings in eax. */ - for (/* Nothing */; bit; bit--) { + for (; bit; bit--) { msr.lo <<= 8; msr.lo |= 1; /* Cache disable PCI/Shadow memory. */ if (shadowByte && (1 << bit)) -- http://www.hailfinger.org/

2 2

r589 - in coreboot-v3: northbridge/amd/geodelx southbridge/amd/cs5536
by svn＠coreboot.org 13 Feb '08

13 Feb '08

Author: hailfinger Date: 2008-02-13 16:35:30 +0100 (Wed, 13 Feb 2008) New Revision: 589 Modified: coreboot-v3/northbridge/amd/geodelx/geodelxinit.c coreboot-v3/southbridge/amd/cs5536/cs5536.c Log: Nuke superfluous comments for C beginners in for loops. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: coreboot-v3/northbridge/amd/geodelx/geodelxinit.c =================================================================== --- coreboot-v3/northbridge/amd/geodelx/geodelxinit.c 2008-02-12 20:31:42 UTC (rev 588) +++ coreboot-v3/northbridge/amd/geodelx/geodelxinit.c 2008-02-13 15:35:30 UTC (rev 589) @@ -471,7 +471,7 @@ struct msr msr; struct msrinit *gating = clock_gating_default; - for (/* Nothing */; gating->msrnum != 0xffffffff; gating++) { + for (; gating->msrnum != 0xffffffff; gating++) { msr = rdmsr(gating->msrnum); msr.hi |= gating->msr.hi; msr.lo |= gating->msr.lo; @@ -487,7 +487,7 @@ struct msr msr; struct msrinit *prio = geode_link_priority_table; - for (/* Nothing */; prio->msrnum != 0xffffffff; prio++) { + for (; prio->msrnum != 0xffffffff; prio++) { msr = rdmsr(prio->msrnum); msr.hi |= prio->msr.hi; msr.lo &= ~0xfff; @@ -539,7 +539,7 @@ } /* Load up C000 settings in eax. */ - for (/* Nothing */; bit; bit--) { + for (; bit; bit--) { msr.lo <<= 8; msr.lo |= 1; /* Cache disable PCI/Shadow memory. */ if (shadowByte && (1 << bit)) @@ -559,7 +559,7 @@ } /* Load up E000 settings in eax. */ - for (/* Nothing */; bit; bit--) { + for (; bit; bit--) { msr.lo <<= 8; msr.lo |= 1; /* Cache disable PCI/Shadow memory. */ if (shadowByte && (1 << bit)) Modified: coreboot-v3/southbridge/amd/cs5536/cs5536.c =================================================================== --- coreboot-v3/southbridge/amd/cs5536/cs5536.c 2008-02-12 20:31:42 UTC (rev 588) +++ coreboot-v3/southbridge/amd/cs5536/cs5536.c 2008-02-13 15:35:30 UTC (rev 589) @@ -492,7 +492,7 @@ if (!IsS3Resume()) { struct acpi_init *aci = acpi_init_table; - for (/* Nothing */; aci->ioreg; aci++) { + for (; aci->ioreg; aci++) { outl(aci->regdata, aci->ioreg); inl(aci->ioreg); } @@ -517,7 +517,7 @@ wrmsr(GLPCI_SB_CTRL, msr); csi = SB_MASTER_CONF_TABLE; - for (/* Nothing */; csi->msrnum; csi++) { + for (; csi->msrnum; csi++) { msr.lo = csi->msr.lo; msr.hi = csi->msr.hi; wrmsr(csi->msrnum, msr); @@ -533,7 +533,7 @@ /* TODO: Why the extra block here? Can it be removed? */ { csi = CS5536_CLOCK_GATING_TABLE; - for (/* Nothing */; csi->msrnum; csi++) { + for (; csi->msrnum; csi++) { msr.lo = csi->msr.lo; msr.hi = csi->msr.hi; wrmsr(csi->msrnum, msr);

1 0

r5 - trunk/openvsa/sysmgr
by svn＠coreboot.org 13 Feb '08

13 Feb '08

Author: kilgour Date: 2008-02-13 06:21:25 +0100 (Wed, 13 Feb 2008) New Revision: 5 Modified: trunk/openvsa/sysmgr/timeout.c Log: [openvsa] provide default pointer initializer to avoid compiler warning Signed-off by: Chris Kilgour <techie(a)whiterocker.com> Acked-by: Jordan Crouse <jordan.crouse(a)amd.com> Acked-by: Marc Jones <marc.jones(a)amd.com> Acked-by: Peter Stuge <peter(a)stuge.se> svn commit -m [openvsa] Modified: trunk/openvsa/sysmgr/timeout.c =================================================================== --- trunk/openvsa/sysmgr/timeout.c 2008-02-12 02:36:00 UTC (rev 4) +++ trunk/openvsa/sysmgr/timeout.c 2008-02-13 05:21:25 UTC (rev 5) @@ -369,7 +369,7 @@ UCHAR i, j, k; MBIU_INFO *MbiuPtr; register DESCRIPTOR *Descr = (DESCRIPTOR *) 0; - register PHYSICAL_COUNTERS *PhysPtr; + register PHYSICAL_COUNTERS *PhysPtr = (PHYSICAL_COUNTERS *) 0; register LOGICAL_COUNTERS *LogicalPtr; Flags = (ULONG) Attr << 16;

1 0

Re: [coreboot] LBv2: asus A8NE - Filling 2 pci slots --> no VGA/boot
by Baski 12 Feb '08

12 Feb '08

> > Removing the ATA card really doesn't change anything? > > After removing the ATA card, the system boots to Linux. Ok! > But I need to use that card. I think there was a change committed that allows just the VGA ROM to be executed and ignores the ATA card ROM. Does anyone else remember? Hmm.. If anyone remembers, let me know. Thx in advance. --------------------------------- Be a better friend, newshound, and know-it-all with Yahoo! Mobile. Try it now.

3 5

← Newer
1
...
23
24
25
26
27
28
29
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot February 2008