coreboot-gerrit October 2013

coreboot-gerrit@coreboot.org

1 participants
159 discussions

Patch set updated for coreboot: 1030720 northbridge/amd/amdk8/raminit_f_dqs.c: Remove unused variable `reg` in `setup_mtrr_dqs()`
by Ronald G. Minnich 13 Oct '13

13 Oct '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3965 -gerrit commit 1030720b181b783f6cd0ebf6a2ee02979393d925 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sat Oct 12 21:29:26 2013 +0200 northbridge/amd/amdk8/raminit_f_dqs.c: Remove unused variable `reg` in `setup_mtrr_dqs()` Change-Id: I7fc7819c329c058472031e82237be5c170b277f4 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/northbridge/amd/amdk8/raminit_f_dqs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/northbridge/amd/amdk8/raminit_f_dqs.c b/src/northbridge/amd/amdk8/raminit_f_dqs.c index 08a3bab..4438340 100644 --- a/src/northbridge/amd/amdk8/raminit_f_dqs.c +++ b/src/northbridge/amd/amdk8/raminit_f_dqs.c @@ -1735,7 +1735,6 @@ static void set_top_mem_ap(unsigned tom_k, unsigned tom2_k) static void setup_mtrr_dqs(unsigned tom_k, unsigned tom2_k) { - unsigned reg; msr_t msr; #if 0 @@ -1752,7 +1751,7 @@ static void setup_mtrr_dqs(unsigned tom_k, unsigned tom2_k) wrmsr(0x258, msr); //[1M, TOM) - reg = range_to_mtrr(2, 0, tom_k,4*1024*1024, MTRR_TYPE_WRBACK, 40); + range_to_mtrr(2, 0, tom_k,4*1024*1024, MTRR_TYPE_WRBACK, 40); //[4G, TOM2) if(tom2_k) {

1 0

Patch merged into coreboot/master: 772d026 ck804 lpc: use PCI_BASE_ADDRESS_1 instead of 0x14
by gerrit＠coreboot.org 13 Oct '13

13 Oct '13

the following patch was just integrated into master: commit 772d026076d7c19755aa9dcc592a372e3c5ba980 Author: Jonathan A. Kollasch <jakllsch(a)kollasch.net> Date: Fri Oct 11 16:09:37 2013 -0500 ck804 lpc: use PCI_BASE_ADDRESS_1 instead of 0x14 Change-Id: I752a4a890e1f610651a2c688cf42350ce8e9deaa Signed-off-by: Jonathan A. Kollasch <jakllsch(a)kollasch.net> Reviewed-on: http://review.coreboot.org/3962 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> See http://review.coreboot.org/3962 for details. -gerrit

1 0

Patch set updated for coreboot: 3640c32 Revert "CBMEM: Always have early initialisation"
by Kyösti Mälkki 13 Oct '13

13 Oct '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3968 -gerrit commit 3640c32840df56ca9c6583ff331a6a5b09ad5680 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Oct 11 22:08:02 2013 +0300 Revert "CBMEM: Always have early initialisation" This reverts commit de1fe7f655c549e8dce5b34218221890fa5ccc34. While things appeared to work, there were actually invalid references to CAR storage after CAR was torn down on boards without EARLY_CBMEM_INIT. It was discussed use of CAR_GLOBAL should be restricted to boards that handle CAR migration properly. Change-Id: I9969d2ea79c334a7f95a0dbb7c78065720e6ccae Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/Kconfig | 12 +++++++++++- src/arch/x86/boot/Makefile.inc | 3 ++- src/console/Kconfig | 1 + src/cpu/x86/Makefile.inc | 2 +- src/lib/Makefile.inc | 5 +++-- src/lib/cbmem.c | 4 ++++ src/mainboard/emulation/qemu-i440fx/Kconfig | 1 + src/mainboard/emulation/qemu-q35/Kconfig | 1 + src/mainboard/google/butterfly/Kconfig | 1 + src/mainboard/google/link/Kconfig | 1 + src/mainboard/google/parrot/Kconfig | 1 + src/mainboard/google/stout/romstage.c | 4 ++++ src/mainboard/intel/emeraldlake2/Kconfig | 1 + src/mainboard/kontron/ktqm77/Kconfig | 1 + src/mainboard/lenovo/t60/Kconfig | 1 + src/mainboard/lenovo/x60/Kconfig | 1 + src/mainboard/samsung/lumpy/Kconfig | 1 + src/mainboard/samsung/stumpy/Kconfig | 1 + src/mainboard/via/epia-m850/romstage.c | 2 ++ src/northbridge/intel/sandybridge/raminit.c | 2 ++ 20 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 1c35fb3..4af8002 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -170,9 +170,19 @@ config INCLUDE_CONFIG_FILE config 0x8d740 raw 3324 (empty) 0x8e480 null 3610440 +config EARLY_CBMEM_INIT + bool + default n + help + Make coreboot initialize the CBMEM structures while running in ROM + stage. This is useful when the ROM stage wants to communicate + some, for instance, execution timestamps. It needs support in + romstage.c and should be enabled by the board's Kconfig. + config DYNAMIC_CBMEM bool "The CBMEM space is dynamically grown." default n + select EARLY_CBMEM_INIT help Instead of reserving a static amount of CBMEM space the CBMEM area grows dynamically. CBMEM can be used both in romstage (after @@ -180,7 +190,7 @@ config DYNAMIC_CBMEM config COLLECT_TIMESTAMPS bool "Create a table of timestamps collected during boot" - default n + depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM) help Make coreboot create a table of timer-ID/timer-value pairs to allow measuring time spent at different phases of the boot process. diff --git a/src/arch/x86/boot/Makefile.inc b/src/arch/x86/boot/Makefile.inc index d3a5f21..4b4a841 100644 --- a/src/arch/x86/boot/Makefile.inc +++ b/src/arch/x86/boot/Makefile.inc @@ -1,4 +1,5 @@ -romstage-y += cbmem.c +romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c +romstage-$(CONFIG_HAVE_ACPI_RESUME) += cbmem.c ramstage-y += boot.c ramstage-$(CONFIG_MULTIBOOT) += multiboot.c diff --git a/src/console/Kconfig b/src/console/Kconfig index f415d93..9bfb6e9 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -274,6 +274,7 @@ config CONSOLE_NE2K_IO_PORT boundary, qemu needs broader align) config CONSOLE_CBMEM + depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM) bool "Send console output to a CBMEM buffer" default n help diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index 311dcc1..584004d 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -1 +1 @@ -romstage-$(CONFIG_CACHE_AS_RAM) += car.c +romstage-$(CONFIG_EARLY_CBMEM_INIT) += car.c diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 1455e4c..6110b88 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -50,7 +50,7 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_SPKMODEM) += spkmodem.c -ifeq ($(CONFIG_CACHE_AS_RAM),y) +ifeq ($(CONFIG_EARLY_CBMEM_INIT),y) romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c romstage-$(CONFIG_USBDEBUG) += usbdebug.c @@ -108,7 +108,8 @@ ramstage-y += dynamic_cbmem.c romstage-y += dynamic_cbmem.c else ramstage-y += cbmem.c -romstage-$(CONFIG_CACHE_AS_RAM) += cbmem.c +romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c +romstage-$(CONFIG_HAVE_ACPI_RESUME) += cbmem.c endif # CONFIG_DYNAMIC_CBMEM ramstage-y += cbmem_info.c diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index 8a39647..de49816 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -95,6 +95,7 @@ void cbmem_late_set_table(uint64_t base, uint64_t size) * - suspend/resume backup memory */ +#if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__) static void cbmem_init(void) { uint64_t baseaddr, size; @@ -119,6 +120,7 @@ static void cbmem_init(void) .size = size - CBMEM_TOC_RESERVED }; } +#endif int cbmem_reinit(void) { @@ -218,6 +220,7 @@ void *cbmem_find(u32 id) return (void *)NULL; } +#if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__) /* Returns True if it was not initialized before. */ int cbmem_initialize(void) { @@ -241,6 +244,7 @@ int cbmem_initialize(void) return rv; } +#endif #ifndef __PRE_RAM__ static void init_cbmem_post_device(void *unused) diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 2eed55b..b462b8c 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -11,6 +11,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_256 + select EARLY_CBMEM_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT config MAINBOARD_DIR diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index 43bba46..9d78bb8 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES # select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_256 + select EARLY_CBMEM_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT config MAINBOARD_DIR diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index d35be8d..e9ad6ef 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select GFXUMA select CHROMEOS + select EARLY_CBMEM_INIT # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index d040599..b74c604 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -16,6 +16,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CHROMEOS select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_NATIVE_VGA_INIT + select EARLY_CBMEM_INIT select MARK_GRAPHICS_MEM_WRCOMB config MAINBOARD_DIR diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 1108b13..191e856 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select GFXUMA select CHROMEOS + select EARLY_CBMEM_INIT # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c index a0700af..8a961ea 100644 --- a/src/mainboard/google/stout/romstage.c +++ b/src/mainboard/google/stout/romstage.c @@ -296,7 +296,11 @@ void main(unsigned long bist) post_code(0x3e); MCHBAR16(SSKPD) = 0xCAFE; +#if CONFIG_EARLY_CBMEM_INIT cbmem_was_initted = !cbmem_initialize(); +#else + cbmem_was_initted = cbmem_reinit(); +#endif #if CONFIG_HAVE_ACPI_RESUME /* If there is no high memory area, we didn't boot before, so diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 1ad50d9..fd98485 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select GFXUMA #select CHROMEOS + select EARLY_CBMEM_INIT config MAINBOARD_DIR string diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig index d379f6f..e9d1ce7 100644 --- a/src/mainboard/kontron/ktqm77/Kconfig +++ b/src/mainboard/kontron/ktqm77/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select HAVE_SMI_HANDLER select GFXUMA + select EARLY_CBMEM_INIT select ENABLE_VMX select HAVE_MRC diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index ec03534..0f0670e 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CHANNEL_XOR_RANDOMIZATION select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME + select EARLY_CBMEM_INIT config MAINBOARD_DIR string default lenovo/t60 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 8eb159b..72aeef8 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select USE_OPTION_TABLE select MAINBOARD_HAS_NATIVE_VGA_INIT + select EARLY_CBMEM_INIT config MAINBOARD_DIR string diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 13c8748..91dc3b6 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_SMSC_MEC1308 select DRIVERS_GENERIC_IOAPIC + select EARLY_CBMEM_INIT select HAVE_MRC config MAINBOARD_DIR diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index 17f854f..f4f8e4d 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_ITE_IT8772F + select EARLY_CBMEM_INIT select HAVE_MRC config MAINBOARD_DIR diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c index 473e60e..39f4253 100644 --- a/src/mainboard/via/epia-m850/romstage.c +++ b/src/mainboard/via/epia-m850/romstage.c @@ -94,7 +94,9 @@ void main(unsigned long bist) print_debug("We passed RAM verify\n"); /* We got RAM working, now we can write the timestamps to RAM */ +#if CONFIG_EARLY_CBMEM_INIT cbmem_initialize(); +#endif timestamp_add_now(TS_END_ROMSTAGE); /* FIXME: See if this is needed or take this out please */ /* Disable Memcard and SDIO */ diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c index db96202..3b321d7 100644 --- a/src/northbridge/intel/sandybridge/raminit.c +++ b/src/northbridge/intel/sandybridge/raminit.c @@ -58,6 +58,7 @@ static void save_mrc_data(struct pei_data *pei_data) { u16 c1, c2, checksum; +#if CONFIG_EARLY_CBMEM_INIT struct mrc_data_container *mrcdata; int output_len = ALIGN(pei_data->mrc_output_len, 16); @@ -83,6 +84,7 @@ static void save_mrc_data(struct pei_data *pei_data) mrcdata->mrc_checksum = compute_ip_checksum(mrcdata->mrc_data, mrcdata->mrc_data_size); +#endif /* Save the MRC seed values to CMOS */ cmos_write32(CMOS_OFFSET_MRC_SEED, pei_data->scrambler_seed);

1 0

New patch to review for coreboot: 174f32e Have option of timestamps, CBMEM console and usbdebug for most boards
by Kyösti Mälkki 13 Oct '13

13 Oct '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3970 -gerrit commit 174f32edf8b6f036ab9eaa0aa42802f98f758264 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Oct 11 21:14:59 2013 +0300 Have option of timestamps, CBMEM console and usbdebug for most boards As boards without EARLY_CBMEM_INIT do not initialize CBMEM in romstage, and have no CAR migration, these features are available for ramstage only. Change-Id: Ic3f77ccdedd4e71ba693619c02c9b98b328a0882 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/Kconfig | 2 +- src/arch/x86/lib/romstage_console.c | 6 +++--- src/console/Kconfig | 1 - src/console/console.c | 4 ++-- src/include/timestamp.h | 2 +- src/lib/usbdebug.c | 6 ++---- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 4af8002..10f8c18 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -190,7 +190,7 @@ config DYNAMIC_CBMEM config COLLECT_TIMESTAMPS bool "Create a table of timestamps collected during boot" - depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM) + default n help Make coreboot create a table of timer-ID/timer-value pairs to allow measuring time spent at different phases of the boot process. diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c index 1c3141c..fc90085 100644 --- a/src/arch/x86/lib/romstage_console.c +++ b/src/arch/x86/lib/romstage_console.c @@ -49,13 +49,13 @@ void console_tx_byte(unsigned char byte) #if CONFIG_CONSOLE_SERIAL8250 uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); #endif -#if CONFIG_USBDEBUG +#if CONFIG_USBDEBUG && (CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)) usbdebug_tx_byte(dbgp_console_output(), byte); #endif #if CONFIG_CONSOLE_NE2K ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT); #endif -#if CONFIG_CONSOLE_CBMEM +#if CONFIG_CONSOLE_CBMEM && (CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)) cbmemc_tx_byte(byte); #endif #if CONFIG_SPKMODEM @@ -74,7 +74,7 @@ void console_tx_flush(void) #if CONFIG_CONSOLE_NE2K ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT); #endif -#if CONFIG_USBDEBUG +#if CONFIG_USBDEBUG && (CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)) usbdebug_tx_flush(dbgp_console_output()); #endif } diff --git a/src/console/Kconfig b/src/console/Kconfig index 9bfb6e9..f415d93 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -274,7 +274,6 @@ config CONSOLE_NE2K_IO_PORT boundary, qemu needs broader align) config CONSOLE_CBMEM - depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM) bool "Send console output to a CBMEM buffer" default n help diff --git a/src/console/console.c b/src/console/console.c index 06a4604..014a4f7 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -113,13 +113,13 @@ void console_init(void) #if CONFIG_CONSOLE_NE2K ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT); #endif -#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__) +#if CONFIG_CONSOLE_CBMEM && CONFIG_EARLY_CBMEM_INIT && !defined(__BOOT_BLOCK__) cbmemc_init(); #endif #if CONFIG_SPKMODEM spkmodem_init(); #endif -#if CONFIG_USBDEBUG && !defined(__BOOT_BLOCK__) +#if CONFIG_USBDEBUG && CONFIG_EARLY_CBMEM_INIT && !defined(__BOOT_BLOCK__) usbdebug_init(); #endif diff --git a/src/include/timestamp.h b/src/include/timestamp.h index edc0076..9e780c3 100644 --- a/src/include/timestamp.h +++ b/src/include/timestamp.h @@ -54,7 +54,7 @@ enum timestamp_id { TS_SELFBOOT_JUMP = 99, }; -#if CONFIG_COLLECT_TIMESTAMPS +#if CONFIG_COLLECT_TIMESTAMPS && (CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)) #include <cpu/x86/tsc.h> void timestamp_init(tsc_t base); void timestamp_add(enum timestamp_id id, tsc_t ts_time); diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index 3faec10..e5f7902 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -579,13 +579,13 @@ err: } #endif /* CONFIG_USBDEBUG_OPTIONAL_HUB_PORT */ -#if defined(__PRE_RAM__) || !CONFIG_EARLY_CONSOLE static void enable_usbdebug(void) { +#if defined(__PRE_RAM__) || !(CONFIG_EARLY_CONSOLE && CONFIG_EARLY_CBMEM_INIT) pci_devfn_t dbg_dev = pci_ehci_dbg_dev(CONFIG_USBDEBUG_HCD_INDEX); pci_ehci_dbg_enable(dbg_dev, CONFIG_EHCI_BAR); -} #endif +} static void set_debug_port(unsigned int port) { @@ -1038,8 +1038,6 @@ int usbdebug_init(void) if (!get_usbdebug_from_cbmem(dbg_info)) return 0; #endif -#if defined(__PRE_RAM__) || !CONFIG_EARLY_CONSOLE enable_usbdebug(); -#endif return usbdebug_init_(CONFIG_EHCI_BAR, CONFIG_EHCI_DEBUG_OFFSET, dbg_info); }

1 0

New patch to review for coreboot: ce7b6b4 CBMEM: Restrict CAR_GLOBALs to boards with EARLY_CBMEM_INIT
by Kyösti Mälkki 13 Oct '13

13 Oct '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3969 -gerrit commit ce7b6b4f1433a23ae0a551efa63964e6ef86f1f3 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sat Oct 12 00:22:57 2013 +0300 CBMEM: Restrict CAR_GLOBALs to boards with EARLY_CBMEM_INIT The mechanisms behind CAR_GLOBALs migration only work correctly when romstage succesfully makes the cbmem_initialize() call. Dummy get_top_of_ram() is removed from romstage to fail already at build-time for cases where cbmem_initialize() could not complete. Change-Id: I359820fb196ef187b9aa2e8a3e8f658a0550f237 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/Kconfig | 1 + src/arch/x86/boot/cbmem.c | 12 ++++++------ src/cpu/x86/Makefile.inc | 2 +- src/lib/Makefile.inc | 7 ++----- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 127887c..4af8002 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -182,6 +182,7 @@ config EARLY_CBMEM_INIT config DYNAMIC_CBMEM bool "The CBMEM space is dynamically grown." default n + select EARLY_CBMEM_INIT help Instead of reserving a static amount of CBMEM space the CBMEM area grows dynamically. CBMEM can be used both in romstage (after diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c index 58ccbca..d8b2e56 100644 --- a/src/arch/x86/boot/cbmem.c +++ b/src/arch/x86/boot/cbmem.c @@ -18,12 +18,6 @@ #include <console/console.h> #include <cbmem.h> -unsigned long __attribute__((weak)) get_top_of_ram(void) -{ - printk(BIOS_WARNING, "WARNING: you need to define get_top_of_ram() for your chipset\n"); - return 0; -} - #if !CONFIG_DYNAMIC_CBMEM void get_cbmem_table(uint64_t *base, uint64_t *size) { @@ -54,4 +48,10 @@ void set_top_of_ram(uint64_t ramtop) backup_top_of_ram(ramtop); cbmem_late_set_table(ramtop - HIGH_MEMORY_SIZE, HIGH_MEMORY_SIZE); } + +unsigned long __attribute__((weak)) get_top_of_ram(void) +{ + printk(BIOS_WARNING, "WARNING: you need to define get_top_of_ram() for your chipset\n"); + return 0; +} #endif diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index 311dcc1..584004d 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -1 +1 @@ -romstage-$(CONFIG_CACHE_AS_RAM) += car.c +romstage-$(CONFIG_EARLY_CBMEM_INIT) += car.c diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 44b5ebd..6110b88 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -50,16 +50,12 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_SPKMODEM) += spkmodem.c -ifeq ($(CONFIG_CACHE_AS_RAM),y) +ifeq ($(CONFIG_EARLY_CBMEM_INIT),y) romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c romstage-$(CONFIG_USBDEBUG) += usbdebug.c endif -ifneq ($(CONFIG_DYNAMIC_CBMEM),y) -romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c -endif - romstage-y += compute_ip_checksum.c ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y) romstage-y += memmove.c @@ -112,6 +108,7 @@ ramstage-y += dynamic_cbmem.c romstage-y += dynamic_cbmem.c else ramstage-y += cbmem.c +romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c romstage-$(CONFIG_HAVE_ACPI_RESUME) += cbmem.c endif # CONFIG_DYNAMIC_CBMEM ramstage-y += cbmem_info.c

1 0

New patch to review for coreboot: 9edc862 Revert "CBMEM: Always have early initialisation"
by Kyösti Mälkki 13 Oct '13

13 Oct '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3968 -gerrit commit 9edc862b081b733b507e804820e1cbdd7c23f4a1 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Oct 11 22:08:02 2013 +0300 Revert "CBMEM: Always have early initialisation" This reverts commit de1fe7f655c549e8dce5b34218221890fa5ccc34. While things appeared to work, there were actually invalid references to CAR storage after CAR was torn down on boards without EARLY_CBMEM_INIT. It was discussed use of CAR_GLOBAL should be restricted to boards that handle CAR migration properly. Change-Id: I9969d2ea79c334a7f95a0dbb7c78065720e6ccae Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/Kconfig | 11 ++++++++++- src/console/Kconfig | 1 + src/lib/Makefile.inc | 6 +++++- src/lib/cbmem.c | 4 ++++ src/mainboard/emulation/qemu-i440fx/Kconfig | 1 + src/mainboard/emulation/qemu-q35/Kconfig | 1 + src/mainboard/google/butterfly/Kconfig | 1 + src/mainboard/google/link/Kconfig | 1 + src/mainboard/google/parrot/Kconfig | 1 + src/mainboard/google/stout/romstage.c | 4 ++++ src/mainboard/intel/emeraldlake2/Kconfig | 1 + src/mainboard/kontron/ktqm77/Kconfig | 1 + src/mainboard/lenovo/t60/Kconfig | 1 + src/mainboard/lenovo/x60/Kconfig | 1 + src/mainboard/samsung/lumpy/Kconfig | 1 + src/mainboard/samsung/stumpy/Kconfig | 1 + src/mainboard/via/epia-m850/romstage.c | 2 ++ src/northbridge/intel/sandybridge/raminit.c | 2 ++ 18 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 1c35fb3..127887c 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -170,6 +170,15 @@ config INCLUDE_CONFIG_FILE config 0x8d740 raw 3324 (empty) 0x8e480 null 3610440 +config EARLY_CBMEM_INIT + bool + default n + help + Make coreboot initialize the CBMEM structures while running in ROM + stage. This is useful when the ROM stage wants to communicate + some, for instance, execution timestamps. It needs support in + romstage.c and should be enabled by the board's Kconfig. + config DYNAMIC_CBMEM bool "The CBMEM space is dynamically grown." default n @@ -180,7 +189,7 @@ config DYNAMIC_CBMEM config COLLECT_TIMESTAMPS bool "Create a table of timestamps collected during boot" - default n + depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM) help Make coreboot create a table of timer-ID/timer-value pairs to allow measuring time spent at different phases of the boot process. diff --git a/src/console/Kconfig b/src/console/Kconfig index f415d93..9bfb6e9 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -274,6 +274,7 @@ config CONSOLE_NE2K_IO_PORT boundary, qemu needs broader align) config CONSOLE_CBMEM + depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM) bool "Send console output to a CBMEM buffer" default n help diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 1455e4c..44b5ebd 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -56,6 +56,10 @@ romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c romstage-$(CONFIG_USBDEBUG) += usbdebug.c endif +ifneq ($(CONFIG_DYNAMIC_CBMEM),y) +romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c +endif + romstage-y += compute_ip_checksum.c ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y) romstage-y += memmove.c @@ -108,7 +112,7 @@ ramstage-y += dynamic_cbmem.c romstage-y += dynamic_cbmem.c else ramstage-y += cbmem.c -romstage-$(CONFIG_CACHE_AS_RAM) += cbmem.c +romstage-$(CONFIG_HAVE_ACPI_RESUME) += cbmem.c endif # CONFIG_DYNAMIC_CBMEM ramstage-y += cbmem_info.c diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index 8a39647..de49816 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -95,6 +95,7 @@ void cbmem_late_set_table(uint64_t base, uint64_t size) * - suspend/resume backup memory */ +#if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__) static void cbmem_init(void) { uint64_t baseaddr, size; @@ -119,6 +120,7 @@ static void cbmem_init(void) .size = size - CBMEM_TOC_RESERVED }; } +#endif int cbmem_reinit(void) { @@ -218,6 +220,7 @@ void *cbmem_find(u32 id) return (void *)NULL; } +#if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__) /* Returns True if it was not initialized before. */ int cbmem_initialize(void) { @@ -241,6 +244,7 @@ int cbmem_initialize(void) return rv; } +#endif #ifndef __PRE_RAM__ static void init_cbmem_post_device(void *unused) diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 2eed55b..b462b8c 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -11,6 +11,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_256 + select EARLY_CBMEM_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT config MAINBOARD_DIR diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index 43bba46..9d78bb8 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES # select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_256 + select EARLY_CBMEM_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT config MAINBOARD_DIR diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index d35be8d..e9ad6ef 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select GFXUMA select CHROMEOS + select EARLY_CBMEM_INIT # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index d040599..b74c604 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -16,6 +16,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CHROMEOS select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_NATIVE_VGA_INIT + select EARLY_CBMEM_INIT select MARK_GRAPHICS_MEM_WRCOMB config MAINBOARD_DIR diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 1108b13..191e856 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select GFXUMA select CHROMEOS + select EARLY_CBMEM_INIT # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c index a0700af..8a961ea 100644 --- a/src/mainboard/google/stout/romstage.c +++ b/src/mainboard/google/stout/romstage.c @@ -296,7 +296,11 @@ void main(unsigned long bist) post_code(0x3e); MCHBAR16(SSKPD) = 0xCAFE; +#if CONFIG_EARLY_CBMEM_INIT cbmem_was_initted = !cbmem_initialize(); +#else + cbmem_was_initted = cbmem_reinit(); +#endif #if CONFIG_HAVE_ACPI_RESUME /* If there is no high memory area, we didn't boot before, so diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 1ad50d9..fd98485 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select GFXUMA #select CHROMEOS + select EARLY_CBMEM_INIT config MAINBOARD_DIR string diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig index d379f6f..e9d1ce7 100644 --- a/src/mainboard/kontron/ktqm77/Kconfig +++ b/src/mainboard/kontron/ktqm77/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select HAVE_SMI_HANDLER select GFXUMA + select EARLY_CBMEM_INIT select ENABLE_VMX select HAVE_MRC diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index ec03534..0f0670e 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CHANNEL_XOR_RANDOMIZATION select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME + select EARLY_CBMEM_INIT config MAINBOARD_DIR string default lenovo/t60 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 8eb159b..72aeef8 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select USE_OPTION_TABLE select MAINBOARD_HAS_NATIVE_VGA_INIT + select EARLY_CBMEM_INIT config MAINBOARD_DIR string diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 13c8748..91dc3b6 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_SMSC_MEC1308 select DRIVERS_GENERIC_IOAPIC + select EARLY_CBMEM_INIT select HAVE_MRC config MAINBOARD_DIR diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index 17f854f..f4f8e4d 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_ITE_IT8772F + select EARLY_CBMEM_INIT select HAVE_MRC config MAINBOARD_DIR diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c index 473e60e..39f4253 100644 --- a/src/mainboard/via/epia-m850/romstage.c +++ b/src/mainboard/via/epia-m850/romstage.c @@ -94,7 +94,9 @@ void main(unsigned long bist) print_debug("We passed RAM verify\n"); /* We got RAM working, now we can write the timestamps to RAM */ +#if CONFIG_EARLY_CBMEM_INIT cbmem_initialize(); +#endif timestamp_add_now(TS_END_ROMSTAGE); /* FIXME: See if this is needed or take this out please */ /* Disable Memcard and SDIO */ diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c index db96202..3b321d7 100644 --- a/src/northbridge/intel/sandybridge/raminit.c +++ b/src/northbridge/intel/sandybridge/raminit.c @@ -58,6 +58,7 @@ static void save_mrc_data(struct pei_data *pei_data) { u16 c1, c2, checksum; +#if CONFIG_EARLY_CBMEM_INIT struct mrc_data_container *mrcdata; int output_len = ALIGN(pei_data->mrc_output_len, 16); @@ -83,6 +84,7 @@ static void save_mrc_data(struct pei_data *pei_data) mrcdata->mrc_checksum = compute_ip_checksum(mrcdata->mrc_data, mrcdata->mrc_data_size); +#endif /* Save the MRC seed values to CMOS */ cmos_write32(CMOS_OFFSET_MRC_SEED, pei_data->scrambler_seed);

1 0

New patch to review for coreboot: c7e61a9 timestamps: Fix some lost timestamps for romstage
by Kyösti Mälkki 13 Oct '13

13 Oct '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3967 -gerrit commit c7e61a999b81d8214a6ff2a04d568f420102d990 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Oct 13 13:27:56 2013 +0300 timestamps: Fix some lost timestamps for romstage Timestamps from cbfs_and_run, TS_START_COPYRAM and TS_END_COPYRAM, were lost with commit b766b1c7. Reason is variable ts_table was referencing CAR storage after CAR is torn doesn. Add use of car_get_var() / car_set_var() so the references go to migrated storage in CBMEM. Change-Id: I5a942ad7fd59a04e3a5255f4a3636d37dcfc1591 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/lib/timestamp.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index 8942649..7af433b 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -27,7 +27,7 @@ #define MAX_TIMESTAMPS 30 -static struct timestamp_table* ts_table CAR_GLOBAL = NULL; +static struct timestamp_table* ts_table_p CAR_GLOBAL = NULL; static tsc_t ts_basetime CAR_GLOBAL = { .lo = 0, .hi =0 }; static void timestamp_stash(enum timestamp_id id, tsc_t ts_time); @@ -54,16 +54,18 @@ static void timestamp_real_init(tsc_t base) tst->max_entries = MAX_TIMESTAMPS; tst->num_entries = 0; - ts_table = tst; + car_set_var(ts_table_p, tst); } void timestamp_add(enum timestamp_id id, tsc_t ts_time) { struct timestamp_entry *tse; + struct timestamp_table *ts_table = NULL; if (!boot_cpu()) return; + ts_table = car_get_var(ts_table_p); if (!ts_table) { timestamp_stash(id, ts_time); return; @@ -123,14 +125,14 @@ void timestamp_init(tsc_t base) #ifdef __PRE_RAM__ /* Copy of basetime, it is too early for CBMEM. */ - ts_basetime = base; + car_set_var(ts_basetime, base); #else struct timestamp_table* tst; /* Locate and use an already existing table. */ tst = cbmem_find(CBMEM_ID_TIMESTAMP); if (tst) { - ts_table = tst; + ts_table_p = tst; return; } @@ -146,12 +148,12 @@ void timestamp_reinit(void) return; #ifdef __PRE_RAM__ - timestamp_real_init(ts_basetime); + timestamp_real_init(car_get_var(ts_basetime)); #else - if (!ts_table) + if (!ts_table_p) timestamp_init(ts_basetime); #endif - if (ts_table) + if (car_get_var(ts_table_p)) timestamp_do_sync(); }

1 0

Patch merged into coreboot/master: fd4f413 Rename cpu/x86/car.h to arch/early_variables.h
by gerrit＠coreboot.org 13 Oct '13

13 Oct '13

the following patch was just integrated into master: commit fd4f4136e8b6dd6f743b2a3bfd02c735b6b25131 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Wed Jun 19 12:25:44 2013 -0700 Rename cpu/x86/car.h to arch/early_variables.h and add an ARMv7 version. Change-Id: I14fbff88d7c2b003dde57a19bf0ba9640d322156 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> [km: rebased fa004acf8 from chromium git] Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/3939 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/3939 for details. -gerrit

1 0

New patch to review for coreboot: 0f2066f AMD AGESA boards: Kconfig: Do not set `DRIVERS_PS2_KEYBOARD`
by Paul Menzel 13 Oct '13

13 Oct '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3966 -gerrit commit 0f2066f68fa406505fd1346ce096801e800da981 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sun Oct 13 09:15:24 2013 +0200 AMD AGESA boards: Kconfig: Do not set `DRIVERS_PS2_KEYBOARD` The Kconfig option `DRIVERS_PS2_KEYBOARD`, controlling if the PS/2 keyboard should be initialized or not, should only be selected by the user as it depends on if the selected payload is able to initialize the keyboard or not. So remove that option from the mainboard’s Kconfig with the following commmand. $ git grep -l DRIVERS_PS2_KEYBOARD src/mainboard | xargs sed -i '/DRIVERS_PS2_KEYBOARD/,+3d' Change-Id: Iafff465daf522d9bd1127c3098dff093920d4db6 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/mainboard/amd/dinar/Kconfig | 4 ---- src/mainboard/amd/inagua/Kconfig | 4 ---- src/mainboard/amd/persimmon/Kconfig | 4 ---- src/mainboard/amd/south_station/Kconfig | 4 ---- src/mainboard/amd/torpedo/Kconfig | 4 ---- src/mainboard/amd/union_station/Kconfig | 4 ---- src/mainboard/asrock/e350m1/Kconfig | 4 ---- src/mainboard/lippert/frontrunner-af/Kconfig | 4 ---- src/mainboard/lippert/toucan-af/Kconfig | 4 ---- src/mainboard/supermicro/h8qgi/Kconfig | 4 ---- src/mainboard/supermicro/h8scm/Kconfig | 4 ---- src/mainboard/tyan/s8226/Kconfig | 4 ---- 12 files changed, 48 deletions(-) diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig index 441357b..8441d44 100644 --- a/src/mainboard/amd/dinar/Kconfig +++ b/src/mainboard/amd/dinar/Kconfig @@ -88,10 +88,6 @@ config SIO_PORT hex default 0x2e -config DRIVERS_PS2_KEYBOARD - bool - default y - config ONBOARD_VGA_IS_PRIMARY bool default y diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index cf868fe..5101b19 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -90,10 +90,6 @@ config SIO_PORT hex default 0x2e -config DRIVERS_PS2_KEYBOARD - bool - default y - config ONBOARD_VGA_IS_PRIMARY bool default y diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig index 5781a25..02af942 100644 --- a/src/mainboard/amd/persimmon/Kconfig +++ b/src/mainboard/amd/persimmon/Kconfig @@ -111,8 +111,4 @@ config SB800_AHCI_ROM bool default n -config DRIVERS_PS2_KEYBOARD - bool - default n - endif # BOARD_AMD_PERSIMMON diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig index 81d631f..c05295e 100644 --- a/src/mainboard/amd/south_station/Kconfig +++ b/src/mainboard/amd/south_station/Kconfig @@ -105,9 +105,5 @@ config VGA_BIOS_ID string default "1002,9806" -config DRIVERS_PS2_KEYBOARD - bool - default n - endif # BOARD_AMD_SOUTHSTATION diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig index cfcf3cb..a426301 100644 --- a/src/mainboard/amd/torpedo/Kconfig +++ b/src/mainboard/amd/torpedo/Kconfig @@ -150,10 +150,6 @@ config XHC_BIOS_ID depends on XHC_BIOS default "1022,7812" -config DRIVERS_PS2_KEYBOARD - bool - default y - config CONSOLE_POST bool depends on !NO_POST diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig index 848fd36..735e84d 100644 --- a/src/mainboard/amd/union_station/Kconfig +++ b/src/mainboard/amd/union_station/Kconfig @@ -104,9 +104,5 @@ config VGA_BIOS_ID string default "1002,9802" -config DRIVERS_PS2_KEYBOARD - bool - default n - endif # BOARD_AMD_UNIONSTATION diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index 026deeb..b905624 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -98,9 +98,5 @@ config VGA_BIOS_ID string default "1002,9802" -config DRIVERS_PS2_KEYBOARD - bool - default n - endif # BOARD_ASROCK_E350M1 diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig index 945d9cb..903b154 100644 --- a/src/mainboard/lippert/frontrunner-af/Kconfig +++ b/src/mainboard/lippert/frontrunner-af/Kconfig @@ -115,8 +115,4 @@ config SB800_AHCI_ROM bool default n -config DRIVERS_PS2_KEYBOARD - bool - default n - endif # BOARD_LIPPERT_FRONTRUNNER_AF diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig index be016fb..c2d4d73 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig +++ b/src/mainboard/lippert/toucan-af/Kconfig @@ -117,8 +117,4 @@ config SB800_AHCI_ROM bool default n -config DRIVERS_PS2_KEYBOARD - bool - default n - endif # BOARD_LIPPERT_TOUCAN_AF diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig index 5ee9a19..f965b58 100644 --- a/src/mainboard/supermicro/h8qgi/Kconfig +++ b/src/mainboard/supermicro/h8qgi/Kconfig @@ -89,10 +89,6 @@ config SIO_PORT though UARTs are on the NUVOTON BMC, port 0x164E PS2 keyboard and mouse are on SUPERIO_WINBOND_W83627DHG, port 0x2E -config DRIVERS_PS2_KEYBOARD - bool - default y - config ONBOARD_VGA_IS_PRIMARY bool default y diff --git a/src/mainboard/supermicro/h8scm/Kconfig b/src/mainboard/supermicro/h8scm/Kconfig index a7f40be..969fae1 100644 --- a/src/mainboard/supermicro/h8scm/Kconfig +++ b/src/mainboard/supermicro/h8scm/Kconfig @@ -92,10 +92,6 @@ config SIO_PORT though UARTs are on the NUVOTON BMC, port 0x164E PS2 keyboard and mouse are on SUPERIO_WINBOND_W83627DHG, port 0x2E -config DRIVERS_PS2_KEYBOARD - bool - default y - config ONBOARD_VGA_IS_PRIMARY bool default y diff --git a/src/mainboard/tyan/s8226/Kconfig b/src/mainboard/tyan/s8226/Kconfig index 68ce152..ded2620 100644 --- a/src/mainboard/tyan/s8226/Kconfig +++ b/src/mainboard/tyan/s8226/Kconfig @@ -85,10 +85,6 @@ config SIO_PORT though UARTs are on the NUVOTON BMC, port 0x164E PS2 keyboard and mouse are on SUPERIO_WINBOND_W83627DHG, port 0x2E -config DRIVERS_PS2_KEYBOARD - bool - default y - config ONBOARD_VGA_IS_PRIMARY bool default y

1 0

Patch set updated for coreboot: 8ceb0c8 northbridge/amd/amdk8/raminit_f_dqs.c: Remove unused variable `reg` in `setup_mtrr_dqs()`
by Paul Menzel 13 Oct '13

13 Oct '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3965 -gerrit commit 8ceb0c8ed07e167adf265d7603c92f9948ccbfdb Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sat Oct 12 21:29:26 2013 +0200 northbridge/amd/amdk8/raminit_f_dqs.c: Remove unused variable `reg` in `setup_mtrr_dqs()` Trying to build the ASUS M2V-MX SE, gcc aborts with the following error. $ ./util/crossgcc/xgcc/i386-elf/bin/gcc --version gcc (coreboot toolchain v1.20 December 4th, 2012) 4.7.3 $ make V=1 [...] CC romstage.inc In file included from src/northbridge/amd/amdk8/raminit_f.c:2905:0, from src/mainboard/asus/m2v-mx_se/romstage.c:67: src/northbridge/amd/amdk8/raminit_f_dqs.c: In function 'setup_mtrr_dqs': src/northbridge/amd/amdk8/raminit_f_dqs.c:1738:11: error: variable 'reg' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors make: *** [build/mainboard/asus/m2v-mx_se/romstage.pre.inc] Error 1 Removing the variable `reg` solves this issue. Change-Id: I7fc7819c329c058472031e82237be5c170b277f4 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/northbridge/amd/amdk8/raminit_f_dqs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/northbridge/amd/amdk8/raminit_f_dqs.c b/src/northbridge/amd/amdk8/raminit_f_dqs.c index 08a3bab..4438340 100644 --- a/src/northbridge/amd/amdk8/raminit_f_dqs.c +++ b/src/northbridge/amd/amdk8/raminit_f_dqs.c @@ -1735,7 +1735,6 @@ static void set_top_mem_ap(unsigned tom_k, unsigned tom2_k) static void setup_mtrr_dqs(unsigned tom_k, unsigned tom2_k) { - unsigned reg; msr_t msr; #if 0 @@ -1752,7 +1751,7 @@ static void setup_mtrr_dqs(unsigned tom_k, unsigned tom2_k) wrmsr(0x258, msr); //[1M, TOM) - reg = range_to_mtrr(2, 0, tom_k,4*1024*1024, MTRR_TYPE_WRBACK, 40); + range_to_mtrr(2, 0, tom_k,4*1024*1024, MTRR_TYPE_WRBACK, 40); //[4G, TOM2) if(tom2_k) {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit October 2013