coreboot October 2009

coreboot@coreboot.org

63 participants
534 discussions

[v2] r4844 - trunk/coreboot-v2/util/xcompile
by svn＠coreboot.org 24 Oct '09

24 Oct '09

Author: stepan Date: 2009-10-24 20:38:53 +0200 (Sat, 24 Oct 2009) New Revision: 4844 Modified: trunk/coreboot-v2/util/xcompile/xcompile Log: add CPP to xcompile in case we need it (trivial) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/coreboot-v2/util/xcompile/xcompile =================================================================== --- trunk/coreboot-v2/util/xcompile/xcompile 2009-10-24 18:36:51 UTC (rev 4843) +++ trunk/coreboot-v2/util/xcompile/xcompile 2009-10-24 18:38:53 UTC (rev 4844) @@ -35,6 +35,7 @@ cat << afteroptions AS:=${GCCPREFIX}as --32 CC:=${GCCPREFIX}gcc -m32 +CPP:=${GCCPREFIX}cpp AR:=${GCCPREFIX}ar LD:=${GCCPREFIX}ld -b elf32-i386 STRIP:=${GCCPREFIX}strip

1 0

[v2] r4843 - trunk/coreboot-v2/src/cpu/intel/speedstep
by svn＠coreboot.org 24 Oct '09

24 Oct '09

Author: stepan Date: 2009-10-24 20:36:51 +0200 (Sat, 24 Oct 2009) New Revision: 4843 Modified: trunk/coreboot-v2/src/cpu/intel/speedstep/acpi.c Log: Some ACPI implementations don't like to see full paths within a scope for CPU power management, so don't add the scope name Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/coreboot-v2/src/cpu/intel/speedstep/acpi.c =================================================================== --- trunk/coreboot-v2/src/cpu/intel/speedstep/acpi.c 2009-10-24 18:15:07 UTC (rev 4842) +++ trunk/coreboot-v2/src/cpu/intel/speedstep/acpi.c 2009-10-24 18:36:51 UTC (rev 4843) @@ -62,10 +62,9 @@ void generate_cpu_entries(void) { - int len_sc, len_pr, len_ps; + int len_pr, len_ps; int coreID, cpuID, pcontrol_blk=0x510, plen=6; msr_t msr; - len_sc = acpigen_write_scope("\\_PR_"); int totalcores = determine_total_number_of_cores(); int cores_per_package = (cpuid_ebx(1)>>16) & 0xff; int numcpus = totalcores/cores_per_package; // this assumes that all CPUs share the same layout @@ -129,9 +128,7 @@ len_pr += len_ps; len_pr--; acpigen_patch_len(len_pr); - len_sc += len_pr; } } - acpigen_patch_len(len_sc-1); }

1 0

[v2] r4842 - trunk/coreboot-v2/src/pc80
by svn＠coreboot.org 24 Oct '09

24 Oct '09

Author: stepan Date: 2009-10-24 20:15:07 +0200 (Sat, 24 Oct 2009) New Revision: 4842 Modified: trunk/coreboot-v2/src/pc80/keyboard.c Log: Rework the keyboard driver * use readable macro names rather than numbers. * Factor out some commonly used code Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Myles Watson <mylesgw(a)gmail.com> Modified: trunk/coreboot-v2/src/pc80/keyboard.c =================================================================== --- trunk/coreboot-v2/src/pc80/keyboard.c 2009-10-24 18:02:04 UTC (rev 4841) +++ trunk/coreboot-v2/src/pc80/keyboard.c 2009-10-24 18:15:07 UTC (rev 4842) @@ -26,13 +26,47 @@ #include <arch/io.h> #include <delay.h> +#define KBD_DATA 0x60 +#define KBD_COMMAND 0x64 +#define KBD_STATUS 0x64 +#define KBD_IBF (1 << 1) // 1: input buffer full (data ready for ec) +#define KBD_OBF (1 << 0) // 1: output buffer full (data ready for host) + +// Keyboard Controller Commands +#define KBC_CMD_READ_COMMAND 0x20 // Read command byte +#define KBC_CMD_WRITE_COMMAND 0x60 // Write command byte +#define KBC_CMD_SELF_TEST 0xAA // Controller self-test + +/* The Keyboard controller command byte + * BIT | Description + * ----+------------------------------------------------------- + * 7 | reserved, must be zero + * 6 | XT Translation, (1 = on, 0 = off) + * 5 | Disable Mouse Port (1 = disable, 0 = enable) + * 4 | Disable Keyboard Port (1 = disable, 0 = enable) + * 3 | reserved, must be zero + * 2 | System Flag (1 = self-test passed. DO NOT SET TO ZERO) + * 1 | Mouse Port Interrupts (1 = enable, 0 = disable) + * 0 | Keyboard Port Interrupts (1 = enable, 0 = disable) + */ + +// Keyboard Controller Replies +#define KBC_REPLY_SELFTEST_OK 0x55 // controller self-test succeeded + +// +// Keyboard Replies +// +#define KBD_REPLY_POR 0xAA // Power on reset +#define KBD_REPLY_ACK 0xFA // Command ACK +#define KBD_REPLY_RESEND 0xFE // Command NACK, send command again + /* Wait 200ms for keyboard controller answers */ #define KBC_TIMEOUT_IN_MS 200 static int kbc_input_buffer_empty(void) { u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(0x64) & 0x02); timeout--) { + for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(KBD_STATUS) & KBD_IBF); timeout--) { mdelay(1); } @@ -46,7 +80,7 @@ static int kbc_output_buffer_full(void) { u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && ((inb(0x64) & 0x01) == 0); timeout--) { + for(timeout = KBC_TIMEOUT_IN_MS; timeout && ((inb(KBD_STATUS) & KBD_OBF) == 0); timeout--) { mdelay(1); } @@ -60,19 +94,51 @@ static int kbc_cleanup_buffers(void) { u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(0x64) & 0x03); timeout--) { + for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(KBD_STATUS) & (KBD_OBF | KBD_IBF)); timeout--) { mdelay(1); - inb(0x60); + inb(KBD_DATA); } if (!timeout) { printk_err("Couldn't cleanup the keyboard controller buffers\n"); - printk_err("0x64: 0x%x, 0x60: 0x%x\n", inb(0x64), inb(0x60)); + printk_err("Status (0x%x): 0x%x, Buffer (0x%x): 0x%x\n", + KBD_STATUS, inb(KBD_STATUS), KBD_DATA, inb(KBD_DATA)); } + return !!timeout; } +static int kbc_self_test(void) +{ + u8 self_test; + /* Clean up any junk that might have been in the KBC. + * Both input and output buffers must be empty. + */ + if (!kbc_cleanup_buffers()) + return 0; + + /* reset/self test 8042 - send cmd 0xAA */ + outb(KBC_CMD_SELF_TEST, KBD_COMMAND); + + if (!kbc_output_buffer_full()) { + /* There probably is no keyboard controller. */ + printk_err("Could not reset keyboard controller.\n"); + return 0; + } + + /* read self-test result, 0x55 is returned in the output buffer */ + self_test = inb(KBD_DATA); + + if (self_test != 0x55) { + printk_err("Keyboard Controller self-test failed: 0x%x\n", + self_test); + return 0; + } + + return 1; +} + static u8 send_keyboard(u8 command) { u8 regval = 0; @@ -80,47 +146,33 @@ do { if (!kbc_input_buffer_empty()) return 0; - outb(command, 0x60); + outb(command, KBD_DATA); if (!kbc_output_buffer_full()) { printk_err("Could not send keyboard command %02x\n", command); return 0; } - regval = inb(0x60); + regval = inb(KBD_DATA); --resend; } while (regval == 0xFE && resend > 0); return regval; } - static void pc_keyboard_init(struct pc_keyboard *keyboard) { u8 regval; printk_debug("Keyboard init...\n"); - /* clean up any junk that might have been in the kbc */ - if (!kbc_cleanup_buffers()) return; - - /* reset/self test 8042 - send cmd 0xAA */ - if (!kbc_input_buffer_empty()) return; - outb(0xAA, 0x64); - if (!kbc_output_buffer_full()) { - printk_err("Could not reset keyboard controller.\n"); + /* Run a keyboard controller self-test */ + if (!kbc_self_test()) return; - } - /* read self-test result, 0x55 is returned in the output buffer (0x60) */ - if ((regval = inb(0x60) != 0x55)) { - printk_err("Keyboard Controller self-test failed: 0x%x\n", regval); - return; - } - /* Enable keyboard interface - No IRQ */ if (!kbc_input_buffer_empty()) return; - outb(0x60, 0x64); + outb(0x60, KBD_COMMAND); if (!kbc_input_buffer_empty()) return; - outb(0x20, 0x60); /* send cmd: enable keyboard */ + outb(0x20, KBD_DATA); /* send cmd: enable keyboard */ if (!kbc_input_buffer_empty()) { printk_info("Timeout while enabling keyboard\n"); return; @@ -135,12 +187,13 @@ printk_err("Keyboard selftest failed ACK: 0x%x\n", regval); return; } + if (!kbc_output_buffer_full()) { printk_err("Timeout waiting for keyboard after reset.\n"); return; } - - regval = inb(0x60); + + regval = inb(KBD_DATA); if (regval != 0xAA) { printk_err("Keyboard selftest failed: 0x%x\n", regval); return; @@ -180,10 +233,10 @@ /* All is well - enable keyboard interface */ if (!kbc_input_buffer_empty()) return; - outb(0x60, 0x64); + outb(0x60, KBD_COMMAND); if (!kbc_input_buffer_empty()) return; - outb(0x61, 0x60); /* send cmd: enable keyboard and IRQ 1 */ - if (!kbc_input_buffer_empty()) { + outb(0x61, KBD_DATA); /* send cmd: enable keyboard and IRQ 1 */ + if (kbc_output_buffer_full()) { printk_err("Timeout during final keyboard enable\n"); return; } @@ -194,6 +247,8 @@ { if ((port0 == 0x60) && (port1 == 0x64)) { pc_keyboard_init(kbd); + } else { + printk_warning("Unsupported keyboard controller.\n"); } } @@ -204,24 +259,16 @@ */ void set_kbc_ps2_mode(void) { - /* clean up any junk that might have been in the kbc */ - if (!kbc_cleanup_buffers()) return; - - /* reset/self test 8042 before we can do anything */ - if (!kbc_input_buffer_empty()) return; - outb(0xAA, 0x64); - if (!kbc_output_buffer_full()) return; - - /* read self-test result, 0x55 is returned in the output buffer (0x60) */ - if ((inb(0x60) != 0x55)) { - printk_err("Keyboard Controller selftest failed\n"); + /* Run a keyboard controller self-test */ + if (!kbc_self_test()) return; - } /* Support PS/2 mode */ if (!kbc_input_buffer_empty()) return; - outb(0xcb, 0x64); + outb(0xcb, KBD_COMMAND); + if (!kbc_input_buffer_empty()) return; - outb(0x01, 0x60); + outb(0x01, KBD_DATA); + kbc_cleanup_buffers(); }

1 0

[v2] r4841 - trunk/coreboot-v2/src/include
by svn＠coreboot.org 24 Oct '09

24 Oct '09

Author: stepan Date: 2009-10-24 20:02:04 +0200 (Sat, 24 Oct 2009) New Revision: 4841 Removed: trunk/coreboot-v2/src/include/stream/ Log: drop src/include/stream/ as the source files from src/stream were dropped a while ago... Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de>

1 0

[v2] r4840 - trunk/coreboot-v2/src/cpu/x86/smm
by svn＠coreboot.org 24 Oct '09

24 Oct '09

Author: stepan Date: 2009-10-24 19:59:36 +0200 (Sat, 24 Oct 2009) New Revision: 4840 Added: trunk/coreboot-v2/src/cpu/x86/smm/smiutil.c Modified: trunk/coreboot-v2/src/cpu/x86/smm/Config.lb trunk/coreboot-v2/src/cpu/x86/smm/Makefile.inc trunk/coreboot-v2/src/cpu/x86/smm/smihandler.c Log: * refactor x86 smi handler (put all debug stuff in an extra file smiutil.c) * lock other CPUs in SMI handler while one CPU is handling an SMI. Without this various racing scenarios could happen. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Myles Watson <mylesgw(a)gmail.com> Modified: trunk/coreboot-v2/src/cpu/x86/smm/Config.lb =================================================================== --- trunk/coreboot-v2/src/cpu/x86/smm/Config.lb 2009-10-24 13:40:55 UTC (rev 4839) +++ trunk/coreboot-v2/src/cpu/x86/smm/Config.lb 2009-10-24 17:59:36 UTC (rev 4840) @@ -25,6 +25,7 @@ smmobject smmhandler.S smmobject smihandler.o + smmobject smiutil.o makerule smm.o depends "$(SMM-OBJECTS) src/console/printk.o src/console/vtxprintf.o $(LIBGCC_FILE_NAME)" Modified: trunk/coreboot-v2/src/cpu/x86/smm/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/cpu/x86/smm/Makefile.inc 2009-10-24 13:40:55 UTC (rev 4839) +++ trunk/coreboot-v2/src/cpu/x86/smm/Makefile.inc 2009-10-24 17:59:36 UTC (rev 4840) @@ -20,20 +20,20 @@ -obj-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.S +obj-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.o obj-$(CONFIG_HAVE_SMI_HANDLER) += smm_bin.o -smmobj-y += smmhandler.S +smmobj-y += smmhandler.o smmobj-y += smihandler.o smmobj-y += smiutil.o ifdef POST_EVALUATION -$(obj)/cpu/x86/smm/smm.o: $(SMM-OBJECTS) $(obj)/console/printk.o $(obj)/console/vtxprintf.o $(LIBGCC_FILE_NAME) +$(obj)/cpu/x86/smm/smm.o: $(smmobjs) $(obj)/console/printk.o $(obj)/console/vtxprintf.o $(LIBGCC_FILE_NAME) $(CC) $(LDFLAGS) -nostdlib -r -o $@ $^ -$(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(obj)/cpu/x86/smm/smm.ld ldoptions - $(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o smm.elf -T $(src)/src/cpu/x86/smm/smm.ld smm.o +$(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions + $(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o $(CONFIG_CROSS_COMPILE)nm -n smm.elf | sort > smm.map $(OBJCOPY) -O binary smm.elf smm Modified: trunk/coreboot-v2/src/cpu/x86/smm/smihandler.c =================================================================== --- trunk/coreboot-v2/src/cpu/x86/smm/smihandler.c 2009-10-24 13:40:55 UTC (rev 4839) +++ trunk/coreboot-v2/src/cpu/x86/smm/smihandler.c 2009-10-24 17:59:36 UTC (rev 4840) @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2008 coresystems GmbH + * Copyright (C) 2008-2009 coresystems GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -27,7 +27,7 @@ void southbridge_smi_set_eos(void); -#define DEBUG_SMI +/* To enable SMI define DEBUG_SMI in smiutil.c */ typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore; @@ -67,66 +67,6 @@ return (*((volatile unsigned long *)(LAPIC_ID)) >> 24); } -/* ********************* smi_util ************************* */ - -/* Data */ -#define UART_RBR 0x00 -#define UART_TBR 0x00 - -/* Control */ -#define UART_IER 0x01 -#define UART_IIR 0x02 -#define UART_FCR 0x02 -#define UART_LCR 0x03 -#define UART_MCR 0x04 -#define UART_DLL 0x00 -#define UART_DLM 0x01 - -/* Status */ -#define UART_LSR 0x05 -#define UART_MSR 0x06 -#define UART_SCR 0x07 - -static int uart_can_tx_byte(void) -{ - return inb(CONFIG_TTYS0_BASE + UART_LSR) & 0x20; -} - -static void uart_wait_to_tx_byte(void) -{ - while(!uart_can_tx_byte()) - ; -} - -static void uart_wait_until_sent(void) -{ - while(!(inb(CONFIG_TTYS0_BASE + UART_LSR) & 0x40)) - ; -} - -static void uart_tx_byte(unsigned char data) -{ - uart_wait_to_tx_byte(); - outb(data, CONFIG_TTYS0_BASE + UART_TBR); - /* Make certain the data clears the fifos */ - uart_wait_until_sent(); -} - -void console_tx_flush(void) -{ - uart_wait_to_tx_byte(); -} - -void console_tx_byte(unsigned char byte) -{ - if (byte == '\n') - uart_tx_byte('\r'); - uart_tx_byte(byte); -} - -/* ********************* smi_util ************************* */ - - void io_trap_handler(int smif) { /* If a handler function handled a given IO trap, it @@ -163,16 +103,17 @@ smm_state_save_area_t state_save; /* Are we ok to execute the handler? */ - if (!smi_obtain_lock()) + if (!smi_obtain_lock()) { + /* For security reasons we don't release the other CPUs + * until the CPU with the lock is actually done + */ + while (smi_handler_status == SMI_LOCKED) /* wait */ ; return; + } node=nodeid(); -#ifdef DEBUG_SMI - console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; -#else - console_loglevel = 1; -#endif + console_init(); printk_spew("\nSMI# #%d\n", node); Added: trunk/coreboot-v2/src/cpu/x86/smm/smiutil.c =================================================================== --- trunk/coreboot-v2/src/cpu/x86/smm/smiutil.c (rev 0) +++ trunk/coreboot-v2/src/cpu/x86/smm/smiutil.c 2009-10-24 17:59:36 UTC (rev 4840) @@ -0,0 +1,130 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008-2009 coresystems GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include <arch/io.h> +#include <arch/romcc_io.h> +#include <console/console.h> +#include <cpu/x86/cache.h> +#include <cpu/x86/smm.h> + +// #define DEBUG_SMI + +/* ********************* smi_util ************************* */ + +/* Data */ +#define UART_RBR 0x00 +#define UART_TBR 0x00 + +/* Control */ +#define UART_IER 0x01 +#define UART_IIR 0x02 +#define UART_FCR 0x02 +#define UART_LCR 0x03 +#define UART_MCR 0x04 +#define UART_DLL 0x00 +#define UART_DLM 0x01 + +/* Status */ +#define UART_LSR 0x05 +#define UART_MSR 0x06 +#define UART_SCR 0x07 + +#ifndef CONFIG_TTYS0_BASE +#define CONFIG_TTYS0_BASE 0x3f8 +#endif + +#ifndef CONFIG_TTYS0_BAUD +#define CONFIG_TTYS0_BAUD 115200 +#endif + +#ifndef CONFIG_TTYS0_DIV +#define CONFIG_TTYS0_DIV (115200/CONFIG_TTYS0_BAUD) +#endif + +/* Line Control Settings */ +#ifndef CONFIG_TTYS0_LCS +/* Set 8bit, 1 stop bit, no parity */ +#define CONFIG_TTYS0_LCS 0x3 +#endif + +#define UART_LCS CONFIG_TTYS0_LCS + +static int uart_can_tx_byte(void) +{ + return inb(CONFIG_TTYS0_BASE + UART_LSR) & 0x20; +} + +static void uart_wait_to_tx_byte(void) +{ + while(!uart_can_tx_byte()) + ; +} + +static void uart_wait_until_sent(void) +{ + while(!(inb(CONFIG_TTYS0_BASE + UART_LSR) & 0x40)) + ; +} + +static void uart_tx_byte(unsigned char data) +{ + uart_wait_to_tx_byte(); + outb(data, CONFIG_TTYS0_BASE + UART_TBR); + /* Make certain the data clears the fifos */ + uart_wait_until_sent(); +} + +void console_tx_flush(void) +{ + uart_wait_to_tx_byte(); +} + +void console_tx_byte(unsigned char byte) +{ + if (byte == '\n') + uart_tx_byte('\r'); + uart_tx_byte(byte); +} + +void uart_init(void) +{ + /* disable interrupts */ + outb(0x0, CONFIG_TTYS0_BASE + UART_IER); + /* enable fifo's */ + outb(0x01, CONFIG_TTYS0_BASE + UART_FCR); + /* Set Baud Rate Divisor to 12 ==> 115200 Baud */ + outb(0x80 | UART_LCS, CONFIG_TTYS0_BASE + UART_LCR); + outb(CONFIG_TTYS0_DIV & 0xFF, CONFIG_TTYS0_BASE + UART_DLL); + outb((CONFIG_TTYS0_DIV >> 8) & 0xFF, CONFIG_TTYS0_BASE + UART_DLM); + outb(UART_LCS, CONFIG_TTYS0_BASE + UART_LCR); +} + +void console_init(void) +{ +#ifdef DEBUG_SMI + console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; + uart_init(); +#else + console_loglevel = 1; +#endif +} + +/* ********************* smi_util ************************* */

1 0

[PATCH] k8 uma and high tables
by Stefan Reinauer 24 Oct '09

24 Oct '09

See patch. Carl Daniel sent something very similar before... This one is the same but adds some preprocessing sugar to it so it does the right thing both for UMA and non-UMA cases -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866 Fix K8 boards high tables on UMA systems (KT690 for example) Thanks to Carl-Daniel for pointing this out with some example code. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Index: src/northbridge/amd/amdk8/northbridge.c =================================================================== --- src/northbridge/amd/amdk8/northbridge.c (revision 4831) +++ src/northbridge/amd/amdk8/northbridge.c (working copy) @@ -837,7 +837,10 @@ #if CONFIG_WRITE_HIGH_TABLES==1 #define HIGH_TABLES_SIZE 64 // maximum size of high tables in KB extern uint64_t high_tables_base, high_tables_size; +#if CONFIG_GFXUMA == 1 +extern uint64_t uma_memory_base, uma_memory_size; #endif +#endif static void amdk8_domain_set_resources(device_t dev) { @@ -1001,7 +1004,13 @@ } +#if CONFIG_GFXUMA == 1 + printk_debug("node %d : uma_memory_base/1024=0x%08x, mmio_basek=0x%08x, basek=0x%08x, limitk=0x%08x\n", i, uma_memory_base >> 10, mmio_basek, basek, limitk); + if ((uma_memory_base >> 10) < mmio_basek) + printk_alert("node %d: UMA memory starts below mmio_basek\n", i); +#else // printk_debug("node %d : mmio_basek=%08x, basek=%08x, limitk=%08x\n", i, mmio_basek, basek, limitk); //yhlu +#endif /* See if I need to split the region to accomodate pci memory space */ if ( (basek < 4*1024*1024 ) && (limitk > mmio_basek) ) { @@ -1015,7 +1024,11 @@ #if CONFIG_WRITE_HIGH_TABLES==1 if (i==0 && high_tables_base==0) { /* Leave some space for ACPI, PIRQ and MP tables */ +#if CONFIG_GFXUMA == 1 + high_tables_base = ((uma_memory_base >> 10) - HIGH_TABLES_SIZE) * 1024; +#else high_tables_base = (mmio_basek - HIGH_TABLES_SIZE) * 1024; +#endif high_tables_size = HIGH_TABLES_SIZE * 1024; printk_debug(" split: %dK table at =%08llx\n", HIGH_TABLES_SIZE, high_tables_base); @@ -1051,7 +1064,11 @@ i, mmio_basek, basek, limitk); if (i==0 && high_tables_base==0) { /* Leave some space for ACPI, PIRQ and MP tables */ +#if CONFIG_GFXUMA == 1 + high_tables_base = ((uma_memory_base >> 10) - HIGH_TABLES_SIZE) * 1024; +#else high_tables_base = (limitk - HIGH_TABLES_SIZE) * 1024; +#endif high_tables_size = HIGH_TABLES_SIZE * 1024; } #endif

3 5

[v2] r4839 - trunk/coreboot-v2/src/northbridge/amd/amdk8
by svn＠coreboot.org 24 Oct '09

24 Oct '09

Author: myles Date: 2009-10-24 15:40:55 +0200 (Sat, 24 Oct 2009) New Revision: 4839 Modified: trunk/coreboot-v2/src/northbridge/amd/amdk8/northbridge.c Log: Trivial regrouping of a calculation to simplify it. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Myles Watson <mylesgw(a)gmail.com> Modified: trunk/coreboot-v2/src/northbridge/amd/amdk8/northbridge.c =================================================================== --- trunk/coreboot-v2/src/northbridge/amd/amdk8/northbridge.c 2009-10-24 13:13:37 UTC (rev 4838) +++ trunk/coreboot-v2/src/northbridge/amd/amdk8/northbridge.c 2009-10-24 13:40:55 UTC (rev 4839) @@ -1025,7 +1025,7 @@ if (i==0 && high_tables_base==0) { /* Leave some space for ACPI, PIRQ and MP tables */ #if CONFIG_GFXUMA == 1 - high_tables_base = ((uma_memory_base >> 10) - HIGH_TABLES_SIZE) * 1024; + high_tables_base = uma_memory_base - (HIGH_TABLES_SIZE * 1024); #else high_tables_base = (mmio_basek - HIGH_TABLES_SIZE) * 1024; #endif @@ -1065,7 +1065,7 @@ if (i==0 && high_tables_base==0) { /* Leave some space for ACPI, PIRQ and MP tables */ #if CONFIG_GFXUMA == 1 - high_tables_base = ((uma_memory_base >> 10) - HIGH_TABLES_SIZE) * 1024; + high_tables_base = uma_memory_base - (HIGH_TABLES_SIZE * 1024); #else high_tables_base = (limitk - HIGH_TABLES_SIZE) * 1024; #endif

1 0

[v2] r4838 - trunk/coreboot-v2/src/pc80
by svn＠coreboot.org 24 Oct '09

24 Oct '09

Author: stepan Date: 2009-10-24 15:13:37 +0200 (Sat, 24 Oct 2009) New Revision: 4838 Modified: trunk/coreboot-v2/src/pc80/mc146818rtc.c Log: A (hypothetical southbridge) component might provide functionality that is not available on all boards. Thus, only print a debug level warning instead of an error. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/coreboot-v2/src/pc80/mc146818rtc.c =================================================================== --- trunk/coreboot-v2/src/pc80/mc146818rtc.c 2009-10-24 13:06:04 UTC (rev 4837) +++ trunk/coreboot-v2/src/pc80/mc146818rtc.c 2009-10-24 13:13:37 UTC (rev 4838) @@ -253,7 +253,7 @@ } } if(!found) { - printk_err("ERROR: No cmos option '%s'\n", name); + printk_debug("WARNING: No cmos option '%s'\n", name); return(-2); }

1 0

[PATCH] Fix USB EHCI Debug Device for Intel ICH
by Stefan Reinauer 24 Oct '09

24 Oct '09

2 2

[patch] console code cleanup
by Stefan Reinauer 24 Oct '09

24 Oct '09

See patch -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866 re-order console output functions, add proper prototypes, drop claim that our files were blatantly copied, because they have been rewritten a very long time ago. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Index: src/include/console/vtxprintf.h =================================================================== --- src/include/console/vtxprintf.h (revision 0) +++ src/include/console/vtxprintf.h (revision 0) @@ -0,0 +1,29 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2009 coresystems GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef __CONSOLE_VTXPRINTF_H +#define __CONSOLE_VTXPRINTF_H + +#include <stdarg.h> + +int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args); + +#endif Index: src/console/vtxprintf.c =================================================================== --- src/console/vtxprintf.c (revision 4831) +++ src/console/vtxprintf.c (working copy) @@ -7,50 +7,13 @@ #include <stdarg.h> #include <string.h> #include <div64.h> +#include <console/vtxprintf.h> /* haha, don't need ctype.c */ #define isdigit(c) ((c) >= '0' && (c) <= '9') #define is_digit isdigit #define isxdigit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F')) -#if 0 -/* We are using number() instead. So this code is obsoleted and should - * probably go away. - */ - -static unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base) -{ - unsigned long result = 0,value; - - if (!base) { - base = 10; - if (*cp == '0') { - base = 8; - cp++; - if ((*cp == 'x') && isxdigit(cp[1])) { - cp++; - base = 16; - } - } - } - while (isxdigit(*cp) && (value = isdigit(*cp) ? *cp-'0' : (islower(*cp) - ? toupper(*cp) : *cp)-'A'+10) < base) { - result = result*base + value; - cp++; - } - if (endp) - *endp = (char *)cp; - return result; -} - -static long simple_strtol(const char *cp,char **endp,unsigned int base) -{ - if(*cp=='-') - return -simple_strtoul(cp+1,endp,base); - return simple_strtoul(cp,endp,base); -} -#endif - static int skip_atoi(const char **s) { int i=0; Index: src/console/Makefile.inc =================================================================== --- src/console/Makefile.inc (revision 4831) +++ src/console/Makefile.inc (working copy) @@ -4,7 +4,6 @@ obj-y += vsprintf.o initobj-y += vtxprintf.o -initobj-y += vsprintf.o driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_direct_console.o Index: src/console/printk.c =================================================================== --- src/console/printk.c (revision 4831) +++ src/console/printk.c (working copy) @@ -7,6 +7,7 @@ #include <stdarg.h> #include <smp/spinlock.h> +#include <console/vtxprintf.h> #include <console/console.h> /* printk's without a loglevel use this.. */ @@ -22,9 +23,6 @@ int minimum_console_loglevel = MINIMUM_CONSOLE_LOGLEVEL; int default_console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; -void display(char*); -extern int vtxprintf(void (*)(unsigned char), const char *, va_list); - static spinlock_t console_lock = SPIN_LOCK_UNLOCKED; int do_printk(int msg_level, const char *fmt, ...) Index: src/console/vsprintf.c =================================================================== --- src/console/vsprintf.c (revision 4831) +++ src/console/vsprintf.c (working copy) @@ -1,45 +1,61 @@ /* - * linux/lib/vsprintf.c + * This file is part of the coreboot project. + * + * Copyright (C) 2009 coresystems GmbH * - * Copyright (C) 1991, 1992 Linus Torvalds + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA */ -/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ -/* - * Wirzenius wrote this portably, Torvalds fucked it up :-) - */ #include <stdarg.h> -#include <string.h> +#include <smp/spinlock.h> +#include <console/vtxprintf.h> -int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args); +static spinlock_t vsprintf_lock = SPIN_LOCK_UNLOCKED; -int vsprintf(char * buf, const char *fmt, va_list args) +static char *str_buf; + +static void str_tx_byte(unsigned char byte) { - char *str_buf; + *str_buf = byte; + str_buf++; +} - /* this function is only used by vsprintf. - To keep str_buf local (for reentrancy - and to avoid .bss use, nest it */ - void str_tx_byte(unsigned char byte) - { - *str_buf = byte; - str_buf++; - } +static int vsprintf(char *buf, const char *fmt, va_list args) +{ + int i; - int i; + spin_lock(&vsprintf_lock); + str_buf = buf; i = vtxprintf(str_tx_byte, fmt, args); *str_buf = '\0'; + + spin_unlock(&vsprintf_lock); + return i; } -int sprintf(char * buf, const char *fmt, ...) +int sprintf(char *buf, const char *fmt, ...) { va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vsprintf(buf, fmt, args); va_end(args); + return i; } Index: src/config/Options.lb =================================================================== --- src/config/Options.lb (revision 4831) +++ src/config/Options.lb (working copy) @@ -862,10 +862,16 @@ comment "Define to build ACPI tables" end +define CONFIG_HAVE_ACPI_SLIC + default 0 + export always + comment "Define to build ACPI SLIC table" +end + define CONFIG_HAVE_ACPI_RESUME default 0 export always - comment "Define to build ACPI with resume support" + comment "Enable for ACPI S3 Support" end define CONFIG_ACPI_SSDTX_NUM Index: src/arch/ppc/lib/printk_init.c =================================================================== --- src/arch/ppc/lib/printk_init.c (revision 4831) +++ src/arch/ppc/lib/printk_init.c (working copy) @@ -1,26 +1,34 @@ /* - * blantantly copied from linux/kernel/printk.c + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. * - * Copyright (C) 1991, 1992 Linus Torvalds + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA */ + #include <stdarg.h> +#include <console/vtxprintf.h> #include <console/loglevel.h> +#include <uart8250.h> -/* printk's without a loglevel use this.. */ -#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */ - -/* Keep together for sysctl support */ - int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; -extern int vtxprintf(void (*)(unsigned char), const char *, va_list); -extern void uart8250_tx_byte(unsigned, unsigned char); - void console_tx_byte(unsigned char byte) { if (byte == '\n') uart8250_tx_byte(CONFIG_TTYS0_BASE, '\r'); + uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); } Index: src/arch/i386/include/stdint.h =================================================================== --- src/arch/i386/include/stdint.h (revision 4831) +++ src/arch/i386/include/stdint.h (working copy) @@ -1,7 +1,7 @@ #ifndef I386_STDINT_H #define I386_STDINT_H -#if defined(__GNUC__) && !defined(__ROMCC__) +#if defined(__GNUC__) #define __HAVE_LONG_LONG__ 1 #else #define __HAVE_LONG_LONG__ 0 Index: src/arch/i386/lib/console.c =================================================================== --- src/arch/i386/lib/console.c (revision 4831) +++ src/arch/i386/lib/console.c (working copy) @@ -1,18 +1,9 @@ #include <console/loglevel.h> #if CONFIG_USE_PRINTK_IN_CAR == 0 -static void __console_tx_byte(unsigned char byte) -{ - uart_tx_byte(byte); -} - #include "console_print.c" - -#else -/* CONFIG_USE_PRINTK_IN_CAR == 1 */ - +#else /* CONFIG_USE_PRINTK_IN_CAR == 1 */ #include "console_printk.c" - #endif /* CONFIG_USE_PRINTK_IN_CAR */ #ifndef COREBOOT_EXTRA_VERSION @@ -32,7 +23,7 @@ } -static void die(const char *str) +void die(const char *str) { print_emerg(str); do { Index: src/arch/i386/lib/console_print.c =================================================================== --- src/arch/i386/lib/console_print.c (revision 4831) +++ src/arch/i386/lib/console_print.c (working copy) @@ -1,3 +1,7 @@ +static void __console_tx_byte(unsigned char byte) +{ + uart_tx_byte(byte); +} static void __console_tx_nibble(unsigned nibble) { Index: src/arch/i386/lib/printk_init.c =================================================================== --- src/arch/i386/lib/printk_init.c (revision 4831) +++ src/arch/i386/lib/printk_init.c (working copy) @@ -1,31 +1,42 @@ /* - * blantantly copied from linux/kernel/printk.c + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. * - * Copyright (C) 1991, 1992 Linus Torvalds + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * by yhlu moved from arch/ppc/lib/printk_init.c, removed the global variable console_loglevel + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA */ + #include <stdarg.h> +#include <console/vtxprintf.h> #include <console/loglevel.h> +#include <uart8250.h> -/* printk's without a loglevel use this.. */ -#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */ - -/* Keep together for sysctl support */ -/* Using an global varible can cause problem when we reset the stack from cache as ram to ram*/ +/* Using a global varible can cause problems when we reset the stack + * from cache as ram to ram. If we make this a define USE_SHARED_STACK + * we could use the same code on all architectures. + */ #if 0 int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; #else -#define console_loglevel ASM_CONSOLE_LOGLEVEL +#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL #endif -extern int vtxprintf(void (*)(unsigned char), const char *, va_list); -extern void uart8250_tx_byte(unsigned, unsigned char); - void console_tx_byte(unsigned char byte) { if (byte == '\n') uart8250_tx_byte(CONFIG_TTYS0_BASE, '\r'); + uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); }

2 2

← Newer
1
...
16
17
18
19
20
21
22
...
54
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 October 2009