coreboot-gerrit July 2013

coreboot-gerrit@coreboot.org

1 participants
1030 discussions

Patch merged into coreboot/master: c65001f Fix CBMEM console use with CAR_MIGRATION
by gerrit＠coreboot.org 11 Jul '13

11 Jul '13

the following patch was just integrated into master: commit c65001fcda55758d3be1f8bc0571672263f9ab57 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Wed Jun 19 10:41:18 2013 +0300 Fix CBMEM console use with CAR_MIGRATION With EARLY_CBMEM_INIT and CAR_MIGRATION selected, cbmemc_reinit() was called twice during romstage. This effectively deleted output of romstage in CBMEM console. Change-Id: I21072a319c0e4a5f695b0573bc017bf7921fc663 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/3609 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/3609 for details. -gerrit

1 0

Patch set updated for coreboot: a6fbcc9 w83627hf/acpi: Fix logical device power down in ACPI
by Christoph Grenz 11 Jul '13

11 Jul '13

Christoph Grenz (christophg+cb(a)grenz-bonn.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3605 -gerrit commit a6fbcc93e9ef25ea9cd42bb3e3af4cb7bf7fbd51 Author: Christoph Grenz <christophg+cb(a)grenz-bonn.de> Date: Thu Jul 4 03:41:39 2013 +0200 w83627hf/acpi: Fix logical device power down in ACPI As Nico noticed for the W83627DHG, the power management bits to power down individual logical devices on Winbond superios are named counterintuitively and need to be set when the logical device should be powered. This corrects the power management methods for the W83627HF. Change-Id: I98bccd550a0513c62bfa9480275f88c566691bc8 Signed-off-by: Christoph Grenz <christophg+cb(a)grenz-bonn.de> --- src/superio/winbond/w83627hf/acpi/superio.asl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl index efb7fba..427d63c 100644 --- a/src/superio/winbond/w83627hf/acpi/superio.asl +++ b/src/superio/winbond/w83627hf/acpi/superio.asl @@ -242,13 +242,13 @@ Device(SIO) { /* Disable power saving mode */ Method (_PS0) { ENCM (0xFF) - Store (Zero, FDPW) + Store (One, FDPW) EXCM () } /* Enable power saving mode */ Method (_PS1) { ENCM (0xFF) - Store (One, FDPW) + Store (Zero, FDPW) EXCM () } @@ -462,12 +462,12 @@ Device(SIO) { } Method (_PS0) { ENCM (0xFF) - Store (Zero, PRPW) + Store (One, PRPW) EXCM () } Method (_PS1) { ENCM (0xFF) - Store (One, PRPW) + Store (Zero, PRPW) EXCM () } @@ -639,12 +639,12 @@ Device(SIO) { } Method (_PS0) { ENCM (0xFF) - Store (Zero, UAPW) + Store (One, UAPW) EXCM () } Method (_PS1) { ENCM (0xFF) - Store (One, UAPW) + Store (Zero, UAPW) EXCM () } @@ -764,12 +764,12 @@ Device(SIO) { } Method (_PS0) { ENCM (0xFF) - Store (Zero, UBPW) + Store (One, UBPW) EXCM () } Method (_PS1) { ENCM (0xFF) - Store (One, UBPW) + Store (Zero, UBPW) EXCM () } @@ -889,12 +889,12 @@ Device(SIO) { } Method (_PS0) { ENCM (0xFF) - Store (Zero, UBPW) + Store (One, UBPW) EXCM () } Method (_PS1) { ENCM (0xFF) - Store (One, UBPW) + Store (Zero, UBPW) EXCM () } @@ -1414,14 +1414,14 @@ Device(SIO) { Method (_PS0) { ENCM (0xFF) - Store (Zero, HWPW) + Store (One, HWPW) EXCM () } Method (_PS1) { ENCM (0xFF) - Store (One, HWPW) + Store (Zero, HWPW) EXCM () }

1 0

Patch set updated for coreboot: 75c301d w83627hf/acpi: Move floppy drive enumeration from _INI into _FDE.
by Christoph Grenz 11 Jul '13

11 Jul '13

Christoph Grenz (christophg+cb(a)grenz-bonn.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3604 -gerrit commit 75c301d694c9ecdaa8c2b1873c2350d1370b5e27 Author: Christoph Grenz <christophg+cb(a)grenz-bonn.de> Date: Thu Jul 4 03:06:26 2013 +0200 w83627hf/acpi: Move floppy drive enumeration from _INI into _FDE. Move the floppy drive enumeration from _INI() and PROB(), which stored the enumeration results into _FDE into _FDE(). _INI is called by any ACPI-capable OS on boot while _FDE is rarely used. So it's better to run the enumeration when requested rather than unconditionally. Change-Id: Icf1e2a551806592faa8ba8d80fa8d02681602007 Signed-off-by: Christoph Grenz <christophg+cb(a)grenz-bonn.de> --- src/superio/winbond/w83627hf/acpi/superio.asl | 59 ++++++++++++--------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl index 05b570b..efb7fba 100644 --- a/src/superio/winbond/w83627hf/acpi/superio.asl +++ b/src/superio/winbond/w83627hf/acpi/superio.asl @@ -212,24 +212,6 @@ Device(SIO) { Name (_STR, Unicode ("W83627HF Floppy Disk Controller")) Name (_UID, "w83627hf-fdc") - #ifndef NO_W83627HF_FDC_ENUM - /* Initialization method: Should be run once on boot - If FDC is active, enumerate all connected devices */ - Method (_INI) { - ENCM (0) - Store (ACTR, Local0) - Store (IO1H, Local1) - Store (IO1L, Local2) - EXCM () - ShiftLeft(Local1, 8, Local1) - Or(Local1, Local2, Local1) - If (Local0) { - /* Try probing drives and save result in _FDE */ - PROB(Local1) - } - } - #endif - Method (_STA) { Store (0x00, Local0) @@ -317,18 +299,33 @@ Device(SIO) { } #ifndef NO_W83627HF_FDC_ENUM - Name(_FDE, Buffer(){0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}) - #endif - - Method (PROB, 1) { - #ifndef NO_W83627HF_FDC_ENUM - /* Try probing drives and save result in _FDE + Method (_FDE, 0) { + /* Try probing drives. Probing is done through selecting and activating a drive and reading 0x03F7 aka the "shared IDE and floppy register" as any value there besides zero seems to indicate a connected drive. */ - OperationRegion (FIO1, SystemIO, Arg0, 0x06) + // Create template + Name(FDE, Buffer(){0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}) + CreateByteField (FDE, 1, FD1) + CreateByteField (FDE, 4, FD2) + CreateByteField (FDE, 8, FD3) + CreateByteField (FDE, 12, FD4) + + // Get resources from logical device + ENCM (0) + Store (ACTR, Local0) + Store (IO1H, Local1) + Store (IO1L, Local2) + EXCM () + ShiftLeft(Local1, 8, Local1) + Or(Local1, Local2, Local1) + If (LNot(Local0)) { + Return (FDE) + } + + OperationRegion (FIO1, SystemIO, Local1, 0x06) Field (FIO1, ByteAcc, NoLock, Preserve) { Offset(0x02), @@ -356,11 +353,6 @@ Device(SIO) { SIFR, 8 } - CreateByteField (_FDE, 1, FD1) - CreateByteField (_FDE, 4, FD2) - CreateByteField (_FDE, 8, FD3) - CreateByteField (_FDE, 12, FD4) - Store(One, ACT1) Store(0, SELE) Sleep(0x64) @@ -385,8 +377,10 @@ Device(SIO) { If (SIFR) { Store (One, FD4) } Store(Zero, ACT4) Store(Zero, SELE) - #endif + + Return (FDE) } + #endif Method (_SRS, 1, Serialized) @@ -407,9 +401,6 @@ Device(SIO) { Store (Local1, IO1H) Store (One, ACTR) EXCM () - - /* Try probing drives and save result in _FDE */ - PROB(IOA0) } } #endif

1 0

Patch set updated for coreboot: 493451a w83627hf/acpi: Make `AddressMax` a multiple of `AddressAlignment`
by Christoph Grenz 11 Jul '13

11 Jul '13

Christoph Grenz (christophg+cb(a)grenz-bonn.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2942 -gerrit commit 493451ace545b1ccaa51e9c4b3776cfc533dbc88 Author: Christoph Grenz <christophg+cb(a)grenz-bonn.de> Date: Sat Jul 6 17:09:39 2013 +0200 w83627hf/acpi: Make `AddressMax` a multiple of `AddressAlignment` The parallel port of the W83627HF can be configured on any port between 0x100 and 0xFFC with 4 byte alignment for traditional modes and 8 byte alignment for EPP mode. As the ACPI specification says that the maximum acceptable starting address has to be a multiple of the alignment granularity, correct the maximum starting address from 0xFFC to 0xFF8. Change-Id: I272e09d091149791f2867b1d06e4fc27bc1bb2cd Signed-off-by: Christoph Grenz <christophg+cb(a)grenz-bonn.de> --- src/superio/winbond/w83627hf/acpi/superio.asl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl index 05b570b..8f68c70 100644 --- a/src/superio/winbond/w83627hf/acpi/superio.asl +++ b/src/superio/winbond/w83627hf/acpi/superio.asl @@ -564,7 +564,7 @@ Device(SIO) { /* Any configurable address (EPP mode) */ StartDependentFn (2,0) { - IO (Decode16, 0x0100, 0x0FFC, 0x08, 0x08) + IO (Decode16, 0x0100, 0x0FF8, 0x08, 0x08) IRQNoFlags () {3,4,5,7,9,10,11,12} } /* Any configurable address (No EPP mode) */

1 0

Patch set updated for coreboot: eb049fe lenovo/t60 lenovo/x60: Default SEABIOS_PS2_TIMEOUT to 3 seconds
by Stefan Reinauer 11 Jul '13

11 Jul '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3735 -gerrit commit eb049fe0d3e55eac13d421fb67294eae76bea075 Author: Peter Stuge <peter(a)stuge.se> Date: Tue Jul 9 20:17:28 2013 +0200 lenovo/t60 lenovo/x60: Default SEABIOS_PS2_TIMEOUT to 3 seconds The ThinkPad keyboard controller sometimes needs a while in order to initialize, so let's ask SeaBIOS to wait for it. This change ensures that the internal keyboard always functions correctly on the ThinkPad when coreboot is built with SeaBIOS as payload. Change-Id: I562475ec98b0c1f5d0debf6e9b597748a420f068 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/lenovo/t60/Kconfig | 4 ++++ src/mainboard/lenovo/x60/Kconfig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index e5d17b8..0f0670e 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -54,4 +54,8 @@ config MAINBOARD_SMBIOS_MANUFACTURER string default "LENOVO" +config SEABIOS_PS2_TIMEOUT + int + default 3000 + endif diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 1a765fb..72aeef8 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -58,4 +58,8 @@ config MAINBOARD_SMBIOS_MANUFACTURER string default "LENOVO" +config SEABIOS_PS2_TIMEOUT + int + default 3000 + endif

1 0

Patch set updated for coreboot: cfd888d payload/SeaBIOS: Add SEABIOS_PS2_TIMEOUT Kconfig variable
by Stefan Reinauer 11 Jul '13

11 Jul '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3734 -gerrit commit cfd888d855d44f79714cd7bd1d90262e7e75d937 Author: Peter Stuge <peter(a)stuge.se> Date: Tue Jul 9 19:43:09 2013 +0200 payload/SeaBIOS: Add SEABIOS_PS2_TIMEOUT Kconfig variable This allows mainboards to preconfigure a ps2-keyboard-spinup timeout when SeaBIOS is chosen as the payload. The Kconfig option can be changed manually if CONFIG_EXPERT is set. Change-Id: I5732b18ef04f4bdef6236f35039656ad02011aec Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/Kconfig | 9 +++++++++ src/arch/x86/Makefile.inc | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/src/Kconfig b/src/Kconfig index fdf40e5..e3b2728 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -572,6 +572,15 @@ config SEABIOS_MASTER Newest SeaBIOS version endchoice +config SEABIOS_PS2_TIMEOUT + prompt "PS/2 keyboard controller initialization timeout (milliseconds)" if PAYLOAD_SEABIOS + depends on EXPERT + int + help + Some PS/2 keyboard controllers don't respond to commands immediately + after powering on. This specifies how long SeaBIOS will wait for the + keyboard controller to become ready before giving up. + choice prompt "FILO version" default FILO_STABLE diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 7f1b7b2..0989adf 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -87,6 +87,12 @@ endif ifeq ($(CONFIG_PAYLOAD_SEABIOS),y) @printf " PAYLOAD SeaBIOS (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) +ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),) +ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0) + @printf " SeaBIOS Wait up to $(CONFIG_SEABIOS_PS2_TIMEOUT) ms for PS/2 keyboard controller initialization\n" + $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup +endif +endif endif ifeq ($(CONFIG_PAYLOAD_FILO),y) @printf " PAYLOAD FILO (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n"

1 0

Patch set updated for coreboot: 1ea03a0 cbfstool: Add an add-int command that adds a raw 64-bit integer CBFS file
by Stefan Reinauer 11 Jul '13

11 Jul '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3733 -gerrit commit 1ea03a0962807ea8fde5e4e93da9aa33c8ea8b43 Author: Peter Stuge <peter(a)stuge.se> Date: Tue Jul 9 19:39:13 2013 +0200 cbfstool: Add an add-int command that adds a raw 64-bit integer CBFS file This simplifies storing SeaBIOS parameters in CBFS. Change-Id: I301644ba0d7a9cb5917c37a3b4ceddfa59e34e77 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- util/cbfstool/cbfstool.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index bd34960..fc49ed2 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -42,6 +42,7 @@ static struct param { char *name; char *filename; char *bootblock; + uint64_t u64val; uint32_t type; uint32_t baseaddress; uint32_t baseaddress_assigned; @@ -63,6 +64,50 @@ static struct param { typedef int (*convert_buffer_t)(struct buffer *buffer, uint32_t *offset); +static int cbfs_add_integer_component(const char *cbfs_name, + const char *name, + uint64_t u64val, + uint32_t offset) { + struct cbfs_image image; + struct buffer buffer; + int i, ret = 1; + + if (!name) { + ERROR("You need to specify -n/--name.\n"); + return 1; + } + + if (buffer_create(&buffer, 8, name) != 0) + return 1; + + for (i = 0; i < 8; i++) + buffer.data[i] = (u64val >> i*8) & 0xff; + + if (cbfs_image_from_file(&image, cbfs_name) != 0) { + ERROR("Could not load ROM image '%s'.\n", cbfs_name); + buffer_delete(&buffer); + return 1; + } + + if (cbfs_get_entry(&image, name)) { + ERROR("'%s' already in ROM image.\n", name); + goto done; + } + + if (cbfs_add_entry(&image, &buffer, name, CBFS_COMPONENT_RAW, param.baseaddress) != 0) { + ERROR("Failed to add %llu into ROM image as '%s'.\n", (long long unsigned)u64val, name); + goto done; + } + + if (cbfs_image_write_file(&image, cbfs_name) == 0) + ret = 0; + +done: + buffer_delete(&buffer); + cbfs_image_delete(&image); + return ret; +} + static int cbfs_add_component(const char *cbfs_name, const char *filename, const char *name, @@ -227,6 +272,14 @@ static int cbfs_add_flat_binary(void) cbfstool_convert_mkflatpayload); } +static int cbfs_add_integer(void) +{ + return cbfs_add_integer_component(param.cbfs_name, + param.name, + param.u64val, + param.baseaddress); +} + static int cbfs_remove(void) { struct cbfs_image image; @@ -452,6 +505,7 @@ static const struct command commands[] = { {"add-payload", "f:n:t:c:b:vh?", cbfs_add_payload}, {"add-stage", "f:n:t:c:b:vh?", cbfs_add_stage}, {"add-flat-binary", "f:n:l:e:c:b:vh?", cbfs_add_flat_binary}, + {"add-int", "i:n:b:vh?", cbfs_add_integer}, {"remove", "n:vh?", cbfs_remove}, {"create", "s:B:b:H:a:o:m:vh?", cbfs_create}, {"locate", "f:n:P:a:Tvh?", cbfs_locate}, @@ -474,6 +528,7 @@ static struct option long_options[] = { {"page-size", required_argument, 0, 'P' }, {"offset", required_argument, 0, 'o' }, {"file", required_argument, 0, 'f' }, + {"int", required_argument, 0, 'i' }, {"machine", required_argument, 0, 'm' }, {"empty-fits", required_argument, 0, 'x' }, {"verbose", no_argument, 0, 'v' }, @@ -500,6 +555,8 @@ static void usage(char *name) " add-flat-binary -f FILE -n NAME -l load-address \\\n" " -e entry-point [-c compression] [-b base] " "Add a 32bit flat mode binary\n" + " add-int -i INTEGER -n NAME [-b base] " + "Add a raw 64-bit integer value\n" " remove -n NAME " "Remove a component\n" " create -s size -B bootblock -m ARCH [-a align] [-o offset] " @@ -619,6 +676,9 @@ int main(int argc, char **argv) case 'f': param.filename = optarg; break; + case 'i': + param.u64val = strtoull(optarg, NULL, 0); + break; case 'T': param.top_aligned = 1; break;

1 0

Patch set updated for coreboot: 92107e5 lenovo/x60: Add "IBM ThinkPad Embedded Controller" SMBIOS OEM String
by Stefan Reinauer 11 Jul '13

11 Jul '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3620 -gerrit commit 92107e5e61896c9c89e92f10362394a9b4727014 Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 20:10:36 2013 +0200 lenovo/x60: Add "IBM ThinkPad Embedded Controller" SMBIOS OEM String The Linux thinkpad_acpi.c driver looks for this string while reading information about the system it is running on. This commit does not make the module load but it is one of several things that the module looks for on a ThinkPad. Change-Id: Ief5f28d2e27bf959cb579c4c8eea9eecc9a89a7c Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/lenovo/x60/mainboard.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index b344ccb..f4c5a34 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -36,6 +36,7 @@ #include <pc80/mc146818rtc.h> #include "dock.h" #include <arch/x86/include/arch/acpigen.h> +#include <smbios.h> #include <x86emu/x86emu.h> #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT @@ -133,9 +134,24 @@ static void mainboard_init(device_t dev) } } +static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current) +{ + int len; + char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; + const char *oem_strings[] = { + tpec, + }; + + h8_build_id_and_function_spec_version(tpec + 35, 17); + len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings)); + + return len; +} + static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; + dev->ops->get_smbios_data = mainboard_smbios_data; } struct chip_operations mainboard_ops = {

1 0

Patch set updated for coreboot: 313e88d lenovo/x60: Move mainboard_enable() code into a mainboard_init()
by Stefan Reinauer 11 Jul '13

11 Jul '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3619 -gerrit commit 313e88dce55c600b29c3f760356c62a5299f7f9f Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 20:05:13 2013 +0200 lenovo/x60: Move mainboard_enable() code into a mainboard_init() mainboard_enable() is now modelled after google/parrot where the enable function only sets dev->ops->init for the root device to point to a mainboard_init() function, which in turn is called in a later pass over the device tree to do the actual initialization. Change-Id: Iaf9187532a1e432b991260201b95dda85cc312c5 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/lenovo/x60/mainboard.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index d2d0733..b344ccb 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -85,7 +85,7 @@ int get_cst_entries(acpi_cstate_t **entries) return ARRAY_SIZE(cst_entries); } -static void mainboard_enable(device_t dev) +static void mainboard_init(device_t dev) { device_t dev0, idedev, sdhci_dev; @@ -133,6 +133,11 @@ static void mainboard_enable(device_t dev) } } +static void mainboard_enable(device_t dev) +{ + dev->ops->init = mainboard_init; +} + struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, };

1 0

Patch set updated for coreboot: fe1f816 SMBIOS: Add smbios_write_type11() for creating an OEM Strings structure
by Stefan Reinauer 11 Jul '13

11 Jul '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3618 -gerrit commit fe1f816df0fc36bb2bbec3add4f7dc045bf001dd Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 19:51:12 2013 +0200 SMBIOS: Add smbios_write_type11() for creating an OEM Strings structure Change-Id: Id338968429435bac26595c4843b07cdbb91dd64d Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/arch/x86/boot/smbios.c | 18 ++++++++++++++++++ src/include/smbios.h | 10 ++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 073c7c5..901a209 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -256,6 +256,24 @@ static int smbios_write_type4(unsigned long *current, int handle) return len; } +int smbios_write_type11(unsigned long *current, int handle, const char **oem_strings, int count) +{ + struct smbios_type11 *t = (struct smbios_type11 *)*current; + int i, len; + + memset(t, 0, sizeof *t); + t->type = SMBIOS_OEM_STRINGS; + t->handle = handle; + t->length = len = sizeof *t - 2; + + for (i = 0; i < count; i++) + t->count = smbios_add_string(t->eos, oem_strings[i]); + + len += smbios_string_table_len(t->eos); + *current += len; + return len; +} + static int smbios_write_type32(unsigned long *current, int handle) { struct smbios_type32 *t = (struct smbios_type32 *)*current; diff --git a/src/include/smbios.h b/src/include/smbios.h index 50bce2a..9051a69 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -3,6 +3,7 @@ #include <types.h> +int smbios_write_type11(unsigned long *current, int handle, const char **oem_strings, int count); unsigned long smbios_write_tables(unsigned long start); int smbios_add_string(char *start, const char *str); int smbios_string_table_len(char *start); @@ -31,6 +32,7 @@ typedef enum { SMBIOS_PROCESSOR_INFORMATION=4, SMBIOS_CACHE_INFORMATION=7, SMBIOS_SYSTEM_SLOTS=9, + SMBIOS_OEM_STRINGS=11, SMBIOS_EVENT_LOG=15, SMBIOS_PHYS_MEMORY_ARRAY=16, SMBIOS_MEMORY_DEVICE=17, @@ -142,6 +144,14 @@ struct smbios_type4 { char eos[2]; } __attribute__((packed)); +struct smbios_type11 { + u8 type; + u8 length; + u16 handle; + u8 count; + char eos[2]; +} __attribute__((packed)); + struct smbios_type15 { u8 type; u8 length;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2013