coreboot-gerrit August 2014

coreboot-gerrit@coreboot.org

1 participants
1011 discussions

Patch merged into coreboot/master: 2177f1b qemu: fix cirrus build
by gerrit＠coreboot.org 28 Aug '14

28 Aug '14

the following patch was just integrated into master: commit 2177f1bcb5420a69957e7146c1b77e8f4c4d8aa8 Author: Gerd Hoffmann <kraxel(a)redhat.com> Date: Wed Aug 27 11:23:35 2014 +0200 qemu: fix cirrus build commit 9518b56 (intel/gma: Clarify code and use dedicated init for Google Peppy) changed "struct edid" and thereby broke the build. Adapt drivers/emulation/qemu/bochs.c to the changes to fix this. Build failure triggers with CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y. Change-Id: I2d3cecde21d495e9b99ff8d2f741f8a462c75a4d Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> Reviewed-on: http://review.coreboot.org/6771 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/6771 for details. -gerrit

1 0

Patch merged into coreboot/master: 4f62732 qemu: fix bochs build
by gerrit＠coreboot.org 28 Aug '14

28 Aug '14

the following patch was just integrated into master: commit 4f62732858ef5d332c6f646c3302b5e7c0f5e436 Author: Gerd Hoffmann <kraxel(a)redhat.com> Date: Wed Aug 27 10:42:47 2014 +0200 qemu: fix bochs build commit 9518b56 (intel/gma: Clarify code and use dedicated init for Google Peppy) changed "struct edid" and thereby broke the build. Adapt drivers/emulation/qemu/bochs.c to the changes to fix this. Build failure triggers with CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y. Change-Id: Ic295c6d31284555e1463af5bca673231b8722d54 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> Reviewed-on: http://review.coreboot.org/6769 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/6769 for details. -gerrit

1 0

New patch to review for coreboot: feca3d0 ec/lenovo/h8: return correctlyt typed package if battery is absent
by Vladimir Serbinenko 28 Aug '14

28 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6793 -gerrit commit feca3d08adf7216a08c23a53174d1aa0ce7e7818 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Thu Aug 28 01:14:00 2014 +0200 ec/lenovo/h8: return correctlyt typed package if battery is absent Change-Id: I51f9d819f164552567d75f83c95ba7523e97343e Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/ec/lenovo/h8/acpi/battery.asl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ec/lenovo/h8/acpi/battery.asl b/src/ec/lenovo/h8/acpi/battery.asl index 7dd49fe..6abd4a5 100644 --- a/src/ec/lenovo/h8/acpi/battery.asl +++ b/src/ec/lenovo/h8/acpi/battery.asl @@ -223,7 +223,7 @@ Device (BAT0) if (B0PR) { Return (BSTA(0, BATI, B0CH, B0DI)) } else { - Return (BATS) + Return (Package () { 0, 0, 0, 0 }) } } @@ -281,7 +281,7 @@ Device (BAT1) if (B1PR) { Return (BSTA(0x10, BATI, B1CH, B1DI)) } else { - Return (BATS) + Return (Package () { 0, 0, 0, 0 }) } }

1 0

New patch to review for coreboot: d522c90 Set mobo type to notebook on laptops
by Vladimir Serbinenko 28 Aug '14

28 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6792 -gerrit commit d522c90c1ec60e4f891fbe84ff1bd5eb877783a6 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Thu Aug 28 00:43:48 2014 +0200 Set mobo type to notebook on laptops Change-Id: Iabb46e4b0f0e786779125cd9379e29afa686ad82 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/smbios.c | 7 ++++++- src/mainboard/apple/macbook21/mainboard.c | 5 +++++ src/mainboard/getac/p470/mainboard.c | 5 +++++ src/mainboard/google/butterfly/mainboard.c | 5 +++++ src/mainboard/google/falco/mainboard.c | 5 +++++ src/mainboard/google/link/mainboard.c | 5 +++++ src/mainboard/google/parrot/mainboard.c | 5 +++++ src/mainboard/google/peppy/mainboard.c | 5 +++++ src/mainboard/google/snow/mainboard.c | 5 +++++ src/mainboard/google/stout/mainboard.c | 5 +++++ src/mainboard/hp/pavilion_m6_1035dx/mainboard.c | 5 +++++ src/mainboard/lenovo/t520/mainboard.c | 5 +++++ src/mainboard/lenovo/t530/mainboard.c | 5 +++++ src/mainboard/lenovo/t60/mainboard.c | 5 +++++ src/mainboard/lenovo/x200/mainboard.c | 5 +++++ src/mainboard/lenovo/x201/mainboard.c | 5 +++++ src/mainboard/lenovo/x220/mainboard.c | 5 +++++ src/mainboard/lenovo/x230/mainboard.c | 5 +++++ src/mainboard/lenovo/x60/mainboard.c | 5 +++++ src/mainboard/packardbell/ms2290/mainboard.c | 5 +++++ src/mainboard/roda/rk886ex/mainboard.c | 5 +++++ src/mainboard/roda/rk9/mainboard.c | 5 +++++ src/mainboard/samsung/lumpy/mainboard.c | 5 +++++ 23 files changed, 116 insertions(+), 1 deletion(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 8437fb5..cb46c33 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -198,6 +198,11 @@ const char *__attribute__((weak)) smbios_mainboard_product_name(void) return CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME; } +u8 __attribute__((weak)) smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_DESKTOP; +} + void __attribute__((weak)) smbios_mainboard_set_uuid(u8 *uuid) { /* leave all zero */ @@ -253,7 +258,7 @@ static int smbios_write_type3(unsigned long *current, int handle) t->bootup_state = SMBIOS_STATE_SAFE; t->power_supply_state = SMBIOS_STATE_SAFE; t->thermal_state = SMBIOS_STATE_SAFE; - t->_type = SMBIOS_ENCLOSURE_DESKTOP; + t->_type = smbios_mainboard_enclosure_type(); t->security_status = SMBIOS_STATE_SAFE; len = t->length + smbios_string_table_len(t->eos); *current += len; diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c index b537f78..bb41b30 100644 --- a/src/mainboard/apple/macbook21/mainboard.c +++ b/src/mainboard/apple/macbook21/mainboard.c @@ -93,3 +93,8 @@ struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c index ac235d3..a273336 100644 --- a/src/mainboard/getac/p470/mainboard.c +++ b/src/mainboard/getac/p470/mainboard.c @@ -101,3 +101,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c index 85b86cb..646d12e 100644 --- a/src/mainboard/google/butterfly/mainboard.c +++ b/src/mainboard/google/butterfly/mainboard.c @@ -390,3 +390,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/google/falco/mainboard.c b/src/mainboard/google/falco/mainboard.c index 38edb5c..7953712 100644 --- a/src/mainboard/google/falco/mainboard.c +++ b/src/mainboard/google/falco/mainboard.c @@ -200,3 +200,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c index ee83089..1c20a9d 100644 --- a/src/mainboard/google/link/mainboard.c +++ b/src/mainboard/google/link/mainboard.c @@ -228,3 +228,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c index 6aa3fca..d20229e 100644 --- a/src/mainboard/google/parrot/mainboard.c +++ b/src/mainboard/google/parrot/mainboard.c @@ -197,3 +197,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/google/peppy/mainboard.c b/src/mainboard/google/peppy/mainboard.c index 38edb5c..7953712 100644 --- a/src/mainboard/google/peppy/mainboard.c +++ b/src/mainboard/google/peppy/mainboard.c @@ -200,3 +200,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/snow/mainboard.c index f906e53..24eb614 100644 --- a/src/mainboard/google/snow/mainboard.c +++ b/src/mainboard/google/snow/mainboard.c @@ -367,3 +367,8 @@ void lb_board(struct lb_header *header) dma->range_start = (intptr_t)DMA_START; dma->range_size = DMA_SIZE; } + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c index b0ed3c1..aaff263 100644 --- a/src/mainboard/google/stout/mainboard.c +++ b/src/mainboard/google/stout/mainboard.c @@ -180,3 +180,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c index 53c5342..8614453 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c @@ -58,3 +58,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/lenovo/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c index a0403f6..cc1492c 100644 --- a/src/mainboard/lenovo/t520/mainboard.c +++ b/src/mainboard/lenovo/t520/mainboard.c @@ -182,3 +182,8 @@ void h8_mainboard_init_dock (void) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c index c3425b3..713e652 100644 --- a/src/mainboard/lenovo/t530/mainboard.c +++ b/src/mainboard/lenovo/t530/mainboard.c @@ -185,3 +185,8 @@ void h8_mainboard_init_dock (void) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c index 9c6a30a..5e6a166 100644 --- a/src/mainboard/lenovo/t60/mainboard.c +++ b/src/mainboard/lenovo/t60/mainboard.c @@ -137,3 +137,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c index df31463..0253214 100644 --- a/src/mainboard/lenovo/x200/mainboard.c +++ b/src/mainboard/lenovo/x200/mainboard.c @@ -148,3 +148,8 @@ struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c index fd11da8..14eb279 100644 --- a/src/mainboard/lenovo/x201/mainboard.c +++ b/src/mainboard/lenovo/x201/mainboard.c @@ -183,3 +183,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c index 28cd814..7af58e1 100644 --- a/src/mainboard/lenovo/x220/mainboard.c +++ b/src/mainboard/lenovo/x220/mainboard.c @@ -195,3 +195,8 @@ void h8_mainboard_init_dock (void) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c index c017712..0ca0ccd 100644 --- a/src/mainboard/lenovo/x230/mainboard.c +++ b/src/mainboard/lenovo/x230/mainboard.c @@ -195,3 +195,8 @@ void h8_mainboard_init_dock (void) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index 4472c0b..6b19645 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -153,3 +153,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c index aca221a..8b663a3 100644 --- a/src/mainboard/packardbell/ms2290/mainboard.c +++ b/src/mainboard/packardbell/ms2290/mainboard.c @@ -174,3 +174,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c index 7f188d4..7ad7c5a 100644 --- a/src/mainboard/roda/rk886ex/mainboard.c +++ b/src/mainboard/roda/rk886ex/mainboard.c @@ -136,3 +136,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c index 4744415..50078fd 100644 --- a/src/mainboard/roda/rk9/mainboard.c +++ b/src/mainboard/roda/rk9/mainboard.c @@ -140,3 +140,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +} diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c index ee6728f..8f81fa7 100644 --- a/src/mainboard/samsung/lumpy/mainboard.c +++ b/src/mainboard/samsung/lumpy/mainboard.c @@ -212,3 +212,8 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +u8 smbios_mainboard_enclosure_type(void) +{ + return SMBIOS_ENCLOSURE_NOTEBOOK; +}

1 0

New patch to review for coreboot: dc3353a arm: Update a stale comment in bootblock .S files
by Isaac Christensen 28 Aug '14

28 Aug '14

Isaac Christensen (isaac.christensen(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6791 -gerrit commit dc3353aa289e0d33d04016f29189825aec8efadf Author: David Hendricks <dhendrix(a)chromium.org> Date: Thu Oct 3 14:02:45 2013 -0700 arm: Update a stale comment in bootblock .S files This just updates a comment which refers to "board_init_f". We use bootblock main() in coreboot. Change-Id: I4cb6b3c11f163b67fe48de495d13dce88710efc0 Reviewed-on: https://chromium-review.googlesource.com/172095 Reviewed-by: Gabe Black <gabeblack(a)chromium.org> Commit-Queue: David Hendricks <dhendrix(a)chromium.org> Tested-by: David Hendricks <dhendrix(a)chromium.org> (cherry picked from commit 65139f29682cedca8dfb58b3dfe67eab64299064) Signed-off-by: Isaac Christensen <isaac.christensen(a)se-eng.com> --- src/arch/arm/armv4/bootblock.S | 2 +- src/arch/arm/armv7/bootblock.S | 2 +- src/soc/nvidia/tegra124/bootblock_asm.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/arch/arm/armv4/bootblock.S b/src/arch/arm/armv4/bootblock.S index 5f7de13..3ba2a88 100644 --- a/src/arch/arm/armv4/bootblock.S +++ b/src/arch/arm/armv4/bootblock.S @@ -65,7 +65,7 @@ init_stack_loop: cmp r0, r1 bne init_stack_loop -/* Set stackpointer in internal RAM to call board_init_f */ +/* Set stackpointer in internal RAM to call bootblock main() */ call_bootblock: ldr sp, .Stack /* Set up stack pointer */ ldr r0,=0x00000000 diff --git a/src/arch/arm/armv7/bootblock.S b/src/arch/arm/armv7/bootblock.S index f2f528a..f18a355 100644 --- a/src/arch/arm/armv7/bootblock.S +++ b/src/arch/arm/armv7/bootblock.S @@ -76,7 +76,7 @@ init_stack_loop: cmp r0, r1 bne init_stack_loop -/* Set stackpointer in internal RAM to call board_init_f */ +/* Set stackpointer in internal RAM to call bootblock main() */ call_bootblock: ldr sp, .Stack /* Set up stack pointer */ ldr r0,=0x00000000 diff --git a/src/soc/nvidia/tegra124/bootblock_asm.S b/src/soc/nvidia/tegra124/bootblock_asm.S index 5f7de13..3ba2a88 100644 --- a/src/soc/nvidia/tegra124/bootblock_asm.S +++ b/src/soc/nvidia/tegra124/bootblock_asm.S @@ -65,7 +65,7 @@ init_stack_loop: cmp r0, r1 bne init_stack_loop -/* Set stackpointer in internal RAM to call board_init_f */ +/* Set stackpointer in internal RAM to call bootblock main() */ call_bootblock: ldr sp, .Stack /* Set up stack pointer */ ldr r0,=0x00000000

1 0

New patch to review for coreboot: 5753111 ec/lenovo/h8: Implement thinkpad-acpi compatible LED function
by Vladimir Serbinenko 28 Aug '14

28 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6790 -gerrit commit 5753111c37175cf3c9c27ffef86e95ee77f448c3 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Thu Aug 28 01:41:20 2014 +0200 ec/lenovo/h8: Implement thinkpad-acpi compatible LED function Change-Id: I9998b0b4a1413ab65f1dbdf59b2f84d331ce9c3d Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/ec/lenovo/h8/acpi/ec.asl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl index 28f095c..3971ec2 100644 --- a/src/ec/lenovo/h8/acpi/ec.asl +++ b/src/ec/lenovo/h8/acpi/ec.asl @@ -75,6 +75,12 @@ Device(EC) Store(Arg0, LEDS) } + /* Not used for coreboot. Provided for compatibility with thinkpad-acpi. */ + Method (LED, 2, NotSerialized) + { + TLED(Or(Arg0, Arg1)) + } + Method (_INI, 0, NotSerialized) { }

1 0

New patch to review for coreboot: 7f09ed5 ec/lenovo/h8: Rename LED to avoid conflicting with thinkpad-acpi
by Vladimir Serbinenko 28 Aug '14

28 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6789 -gerrit commit 7f09ed5253a741d17383a3e071f78e1475661da7 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Thu Aug 28 01:31:33 2014 +0200 ec/lenovo/h8: Rename LED to avoid conflicting with thinkpad-acpi Change-Id: I9fd7f894d0e611f61e8702e4eacb12d7b81154d8 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/smbios.c | 2 +- src/ec/lenovo/h8/acpi/ec.asl | 2 +- src/ec/lenovo/h8/acpi/systemstatus.asl | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 9eea38f..8437fb5 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -253,7 +253,7 @@ static int smbios_write_type3(unsigned long *current, int handle) t->bootup_state = SMBIOS_STATE_SAFE; t->power_supply_state = SMBIOS_STATE_SAFE; t->thermal_state = SMBIOS_STATE_SAFE; - t->_type = SMBIOS_ENCLOSURE_NOTEBOOK; + t->_type = SMBIOS_ENCLOSURE_DESKTOP; t->security_status = SMBIOS_STATE_SAFE; len = t->length + smbios_string_table_len(t->eos); *current += len; diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl index e8d5215..28f095c 100644 --- a/src/ec/lenovo/h8/acpi/ec.asl +++ b/src/ec/lenovo/h8/acpi/ec.asl @@ -70,7 +70,7 @@ Device(EC) Return (ECMD) } - Method (LED, 1, NotSerialized) + Method (TLED, 1, NotSerialized) { Store(Arg0, LEDS) } diff --git a/src/ec/lenovo/h8/acpi/systemstatus.asl b/src/ec/lenovo/h8/acpi/systemstatus.asl index 17e8ba7..c51a4fa 100644 --- a/src/ec/lenovo/h8/acpi/systemstatus.asl +++ b/src/ec/lenovo/h8/acpi/systemstatus.asl @@ -27,37 +27,37 @@ Scope (\_SI) If (LEqual (Arg0, 0)) { /* Indicator off */ - /* power LED off */ - \_SB.PCI0.LPCB.EC.LED(0x00) - /* suspend LED off */ - \_SB.PCI0.LPCB.EC.LED(0x07) + /* power TLED off */ + \_SB.PCI0.LPCB.EC.TLED(0x00) + /* suspend TLED off */ + \_SB.PCI0.LPCB.EC.TLED(0x07) } If (LEqual (Arg0, 1)) { /* working state */ - /* power LED on */ - \_SB.PCI0.LPCB.EC.LED(0x80) - /* suspend LED off */ - \_SB.PCI0.LPCB.EC.LED(0x07) + /* power TLED on */ + \_SB.PCI0.LPCB.EC.TLED(0x80) + /* suspend TLED off */ + \_SB.PCI0.LPCB.EC.TLED(0x07) } If (LEqual (Arg0, 2)) { /* waking state */ - /* power LED om */ - \_SB.PCI0.LPCB.EC.LED(0x80) - /* suspend LED blinking */ - \_SB.PCI0.LPCB.EC.LED(0xc7) + /* power TLED om */ + \_SB.PCI0.LPCB.EC.TLED(0x80) + /* suspend TLED blinking */ + \_SB.PCI0.LPCB.EC.TLED(0xc7) } If (LEqual (Arg0, 3)) { /* sleep state */ - /* power LED off */ - \_SB.PCI0.LPCB.EC.LED(0x00) - /* suspend LED on */ - \_SB.PCI0.LPCB.EC.LED(0x87) + /* power TLED off */ + \_SB.PCI0.LPCB.EC.TLED(0x00) + /* suspend TLED on */ + \_SB.PCI0.LPCB.EC.TLED(0x87) } } }

1 0

New patch to review for coreboot: c6751d9 smbios: reorganise OEM strings handling.
by Vladimir Serbinenko 28 Aug '14

28 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6788 -gerrit commit c6751d916fd8c192b3d539316878df482e9e87a7 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Wed Aug 27 23:42:45 2014 +0200 smbios: reorganise OEM strings handling. OEM strings should not be handled by mobo code but by common code with strings collected from all devices. Change-Id: Ibde61a1ca79845670bc0df87dc6c67fa868d48a9 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/smbios.c | 23 +++++++++++++++++------ src/ec/lenovo/h8/h8.c | 18 +++++++++++++++++- src/include/device/device.h | 3 +++ src/include/smbios.h | 1 - src/mainboard/lenovo/t530/mainboard.c | 15 --------------- src/mainboard/lenovo/t60/mainboard.c | 15 --------------- src/mainboard/lenovo/x200/mainboard.c | 15 --------------- src/mainboard/lenovo/x201/mainboard.c | 15 --------------- src/mainboard/lenovo/x220/mainboard.c | 15 --------------- src/mainboard/lenovo/x230/mainboard.c | 15 --------------- src/mainboard/lenovo/x60/mainboard.c | 15 --------------- 11 files changed, 37 insertions(+), 113 deletions(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 1e720ec..9eea38f 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -253,7 +253,7 @@ static int smbios_write_type3(unsigned long *current, int handle) t->bootup_state = SMBIOS_STATE_SAFE; t->power_supply_state = SMBIOS_STATE_SAFE; t->thermal_state = SMBIOS_STATE_SAFE; - t->_type = SMBIOS_ENCLOSURE_DESKTOP; + t->_type = SMBIOS_ENCLOSURE_NOTEBOOK; t->security_status = SMBIOS_STATE_SAFE; len = t->length + smbios_string_table_len(t->eos); *current += len; @@ -295,21 +295,31 @@ 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) +static int smbios_write_type11(unsigned long *current, int *handle) { struct smbios_type11 *t = (struct smbios_type11 *)*current; - int i, len; + int len; + device_t dev; memset(t, 0, sizeof *t); t->type = SMBIOS_OEM_STRINGS; - t->handle = handle; + 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]); + for(dev = all_devices; dev; dev = dev->next) { + if (dev->ops && dev->ops->get_smbios_strings) + dev->ops->get_smbios_strings(dev, t); + } + + if (t->count == 0) { + memset(t, 0, sizeof *t); + return 0; + } len += smbios_string_table_len(t->eos); + *current += len; + (*handle)++; return len; } @@ -398,6 +408,7 @@ unsigned long smbios_write_tables(unsigned long current) len += smbios_write_type2(&current, handle++); len += smbios_write_type3(&current, handle++); len += smbios_write_type4(&current, handle++); + len += smbios_write_type11(&current, &handle); #if CONFIG_ELOG len += elog_smbios_write_type15(&current, handle++); #endif diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index e70c0e8..79ef3cd 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -25,6 +25,7 @@ #include <kconfig.h> #include <stdlib.h> #include <string.h> +#include <smbios.h> #include <pc80/mc146818rtc.h> #include "h8.h" @@ -166,12 +167,27 @@ u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len) return i; } +static void h8_smbios_strings(device_t dev, struct smbios_type11 *t) +{ + char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; + + h8_build_id_and_function_spec_version(tpec + 35, 17); + + t->count = smbios_add_string(t->eos, tpec); +} + +struct device_operations h8_dev_ops = { + .get_smbios_strings = h8_smbios_strings +}; + static void h8_enable(device_t dev) { struct ec_lenovo_h8_config *conf = dev->chip_info; u8 val, tmp; u8 beepmask0, beepmask1, config1; + dev->ops = &h8_dev_ops; + h8_log_ec_version(); ec_write(H8_CONFIG0, conf->config0); @@ -279,5 +295,5 @@ static void h8_enable(device_t dev) struct chip_operations ec_lenovo_h8_ops = { CHIP_NAME("Lenovo H8 EC") - .enable_dev = h8_enable + .enable_dev = h8_enable, }; diff --git a/src/include/device/device.h b/src/include/device/device.h index ec17adf..19b5ea0 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -39,6 +39,8 @@ struct chip_operations { struct bus; +struct smbios_type11; + struct device_operations { void (*read_resources)(device_t dev); void (*set_resources)(device_t dev); @@ -52,6 +54,7 @@ struct device_operations { void (*reset_bus)(struct bus *bus); #if CONFIG_GENERATE_SMBIOS_TABLES int (*get_smbios_data)(device_t dev, int *handle, unsigned long *current); + void (*get_smbios_strings)(device_t dev, struct smbios_type11 *t); #endif const struct pci_operations *ops_pci; const struct smbus_bus_operations *ops_smbus_bus; diff --git a/src/include/smbios.h b/src/include/smbios.h index a5716b3..cf9df1a 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -3,7 +3,6 @@ #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); diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c index feb1aa7..c3425b3 100644 --- a/src/mainboard/lenovo/t530/mainboard.c +++ b/src/mainboard/lenovo/t530/mainboard.c @@ -164,27 +164,12 @@ static void mainboard_init(device_t dev) 0x42, 0x142); } -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; -} - // mainboard_enable is executed as first thing after // enumerate_buses(). static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; - dev->ops->get_smbios_data = mainboard_smbios_data; #if CONFIG_VGA_ROM_RUN /* Install custom int15 handler for VGA OPROM */ diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c index 6dac819..9c6a30a 100644 --- a/src/mainboard/lenovo/t60/mainboard.c +++ b/src/mainboard/lenovo/t60/mainboard.c @@ -129,24 +129,9 @@ static void mainboard_init(device_t dev) ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09); } -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 = { diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c index 9fe55db..df31463 100644 --- a/src/mainboard/lenovo/x200/mainboard.c +++ b/src/mainboard/lenovo/x200/mainboard.c @@ -125,20 +125,6 @@ const char *smbios_mainboard_bios_version(void) return "CBET4000 " COREBOOT_VERSION; } -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_init(device_t dev) { /* This sneaked in here, because X200 SuperIO chip isn't really @@ -155,7 +141,6 @@ static void mainboard_enable(device_t dev) mainboard_interrupt_handlers(0x15, &int15_handler); #endif - dev->ops->get_smbios_data = mainboard_smbios_data; dev->ops->init = mainboard_init; } diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c index 16d4bd9..fd11da8 100644 --- a/src/mainboard/lenovo/x201/mainboard.c +++ b/src/mainboard/lenovo/x201/mainboard.c @@ -147,27 +147,12 @@ static void mainboard_init(device_t dev) 0x42, 0x142); } -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) { device_t dev0; u16 pmbase; dev->ops->init = mainboard_init; - dev->ops->get_smbios_data = mainboard_smbios_data; pmbase = pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1f, 0)), PMBASE) & 0xff80; diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c index 7bc1edb..28cd814 100644 --- a/src/mainboard/lenovo/x220/mainboard.c +++ b/src/mainboard/lenovo/x220/mainboard.c @@ -174,27 +174,12 @@ static void mainboard_init(device_t dev) 0x42, 0x142); } -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; -} - // mainboard_enable is executed as first thing after // enumerate_buses(). static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; - dev->ops->get_smbios_data = mainboard_smbios_data; #if CONFIG_VGA_ROM_RUN /* Install custom int15 handler for VGA OPROM */ diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c index 323f37f..c017712 100644 --- a/src/mainboard/lenovo/x230/mainboard.c +++ b/src/mainboard/lenovo/x230/mainboard.c @@ -174,27 +174,12 @@ static void mainboard_init(device_t dev) 0x42, 0x142); } -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; -} - // mainboard_enable is executed as first thing after // enumerate_buses(). static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; - dev->ops->get_smbios_data = mainboard_smbios_data; #if CONFIG_VGA_ROM_RUN /* Install custom int15 handler for VGA OPROM */ diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index cc89047..4472c0b 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -136,20 +136,6 @@ 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; -} - const char *smbios_mainboard_bios_version(void) { /* Satisfy thinkpad_acpi. */ @@ -162,7 +148,6 @@ const char *smbios_mainboard_bios_version(void) 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

New patch to review for coreboot: b7d64ac smbios: Define and use enclosure types.
by Vladimir Serbinenko 28 Aug '14

28 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6786 -gerrit commit b7d64ac604041b5f10209cf46a59ccb58be8ce3c Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Wed Aug 27 23:23:14 2014 +0200 smbios: Define and use enclosure types. Change-Id: Ib5b92120cbe2ca41c9813e8caeb03161f4d3954c Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/smbios.c | 2 +- src/include/smbios.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index ce47a8b..1e720ec 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -253,7 +253,7 @@ static int smbios_write_type3(unsigned long *current, int handle) t->bootup_state = SMBIOS_STATE_SAFE; t->power_supply_state = SMBIOS_STATE_SAFE; t->thermal_state = SMBIOS_STATE_SAFE; - t->_type = 3; + t->_type = SMBIOS_ENCLOSURE_DESKTOP; t->security_status = SMBIOS_STATE_SAFE; len = t->length + smbios_string_table_len(t->eos); *current += len; diff --git a/src/include/smbios.h b/src/include/smbios.h index 7c41c42..a5716b3 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -115,6 +115,12 @@ struct smbios_type2 { char eos[2]; } __attribute__((packed)); +enum +{ + SMBIOS_ENCLOSURE_DESKTOP = 3, + SMBIOS_ENCLOSURE_NOTEBOOK = 9, +}; + struct smbios_type3 { u8 type; u8 length;

1 0

New patch to review for coreboot: bdd7d2a libpayload: xhci: Ensure to reset dequeue pointer on stopped endpoints
by Isaac Christensen 28 Aug '14

28 Aug '14

Isaac Christensen (isaac.christensen(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6787 -gerrit commit bdd7d2a6269d15959e4d2ddf0701bf5763b07a5a Author: Julius Werner <jwerner(a)chromium.org> Date: Thu Sep 26 15:13:44 2013 -0700 libpayload: xhci: Ensure to reset dequeue pointer on stopped endpoints This patch fixes a bug in the XHCI stack that occurs when a multi-TRB TD times out before the last TRB is processed. The driver will correctly issue a Stop Endpoint command in that case, but the xHC will still preserve the transfer state and just pick up right after that on the next doorbell ring. It will then process the leftover TRBs from the old TD the next time a transfer is issued. (cf. XHCI 4.6.9) We fix this by changing the existing xhci_reset_endpoint() calls in transfer functions to not only trigger on Halted (2) and Error (4), but also on Stopped (3). That function will not actually issue a Reset Endpoint command in this case, but it will nuke the whole transfer ring and issue a Set TR Dequeue Pointer command, which is sufficient (though slightly overkill) to solve our problem. Change-Id: I3abbe30ff9d4911a8af1f792324e018d427019e8 Signed-off-by: Julius Werner <jwerner(a)chromium.org> Reviewed-on: https://chromium-review.googlesource.com/170833 Reviewed-by: Ronald Minnich <rminnich(a)chromium.org> Reviewed-by: Kees Cook <keescook(a)chromium.org> (cherry picked from commit f12424af0e29ac12963e8e5a7970fadcc0bb6cee) Signed-off-by: Isaac Christensen <isaac.christensen(a)se-eng.com> --- payloads/libpayload/drivers/usb/xhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c index 4ab2fe3..5b30d0c 100644 --- a/payloads/libpayload/drivers/usb/xhci.c +++ b/payloads/libpayload/drivers/usb/xhci.c @@ -599,9 +599,9 @@ xhci_control(usbdev_t *const dev, const direction_t dir, return -1; } - /* Reset endpoint if it's halted */ + /* Reset endpoint if it's not running */ const unsigned ep_state = EC_GET(STATE, epctx); - if (ep_state == 2 || ep_state == 4) { + if (ep_state > 1) { if (xhci_reset_endpoint(dev, NULL, 0)) return -1; } @@ -710,9 +710,9 @@ xhci_bulk(endpoint_t *const ep, const int size, u8 *const src, memcpy(data, src, size); } - /* Reset endpoint if it's halted */ + /* Reset endpoint if it's not running */ const unsigned ep_state = EC_GET(STATE, epctx); - if (ep_state == 2 || ep_state == 4) { + if (ep_state > 1) { if (xhci_reset_endpoint(ep->dev, ep, 0)) return -1; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
102
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2014