coreboot-gerrit July 2013

coreboot-gerrit@coreboot.org

1 participants
1030 discussions

Patch set updated for coreboot: 4ca75e4 Makefile: remove $(obj)/config.h before a build.
by Denis Carikli 06 Jul '13

06 Jul '13

Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3585 -gerrit commit 4ca75e4462f0176913581946bbe10d52c99e779e Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Mon Jul 1 08:39:51 2013 +0200 Makefile: remove $(obj)/config.h before a build. This is in order to fix config.h leaking to the next build when using CONFIG_UPDATE_IMAGE. Change-Id: … [View More]

1 0

New patch to review for coreboot: 1bb3907 lenovo/x60: Add "IBM ThinkPad Embedded Controller" SMBIOS OEM String
by Peter Stuge 06 Jul '13

06 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3620 -gerrit commit 1bb390712c0a9695825b40e2779dd4eaa42e5d5e 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 kernel driver looks for this string in the DMI tables in order to determine that it is running on an actual … [View More]

1 0

New patch to review for coreboot: 267f4af lenovo/x60: Move mainboard_enable() code into a mainboard_init()
by Peter Stuge 06 Jul '13

06 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3619 -gerrit commit 267f4afad530247835e0c604756311de98e06758 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 modeled after google/parrot where the function just sets the root device/mainboard dev->ops->init to a … [View More]

1 0

New patch to review for coreboot: 19f13e4 SMBIOS: Allow creating the DMI type 11 table "OEM Strings"
by Peter Stuge 06 Jul '13

06 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3618 -gerrit commit 19f13e4170391cfef377a0c9d96beec28fb8e9c1 Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 19:51:12 2013 +0200 SMBIOS: Allow creating the DMI type 11 table "OEM Strings" Change-Id: Id338968429435bac26595c4843b07cdbb91dd64d Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/arch/x86/boot/smbios.c | 18 ++++++++++++++… [View More]

1 0

New patch to review for coreboot: 1bbaaed ec/lenovo/h8: Add h8_build_id_and_function_spec_version()
by Peter Stuge 06 Jul '13

06 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3617 -gerrit commit 1bbaaedcffdad9979fac63b35e87a4f54e1d2fa5 Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 19:44:47 2013 +0200 ec/lenovo/h8: Add h8_build_id_and_function_spec_version() The function reads the Build ID and the supported function specification version from the running EC firmware, and stores a text representation in the … [View More]provided output buffer. Change-Id: I3b647d7f315c9b4922fa9a9c5167a80f6d82e753 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/ec/lenovo/h8/h8.c | 37 ++++++++++++++++++++++++++++--------- src/ec/lenovo/h8/h8.h | 1 + 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 9ffdfc1..21ebab7 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -26,6 +26,7 @@ #include "h8.h" #include "chip.h" #include <pc80/mc146818rtc.h> +#include <string.h> static void h8_bluetooth_enable(int on) { @@ -52,17 +53,12 @@ void h8_wlan_enable(int on) static void h8_log_ec_version(void) { - unsigned char ecfw[9], c; + char ecfw[18]; u16 fwvh, fwvl; - int i; - for(i = 0; i < 8; i++) { - c = ec_read(0xf0 + i); - if (c < 0x20 || c > 0x7f) - break; - ecfw[i] = c; - } - ecfw[i] = '\0'; + memset(ecfw, 0, sizeof ecfw); + h8_build_id_and_function_spec_version(ecfw, sizeof ecfw); + ecfw[sizeof ecfw - 1] = 0; fwvh = ec_read(0xe9); fwvl = ec_read(0xe8); @@ -109,6 +105,29 @@ int h8_ultrabay_device_present(void) return ec_read(H8_STATUS1) & 0x5 ? 0 : 1; } +u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len) +{ + u8 i, c; + char str[16 + 1]; /* 16 ASCII chars + \0 */ + + /* Build ID */ + for(i = 0; i < 8; i++) { + c = ec_read(0xf0 + i); + if (c < 0x20 || c > 0x7f) { + i = sprintf(str, "*INVALID"); + break; + } + str[i] = c; + } + + /* EC firmware function specification version */ + i += sprintf(str + i, "-%d.%d", ec_read(0xef), ec_read(0xeb)); + + memcpy(buf, str, MIN(buf_len, i)); + + return i; +} + static void h8_enable(device_t dev) { struct ec_lenovo_h8_config *conf = dev->chip_info; diff --git a/src/ec/lenovo/h8/h8.h b/src/ec/lenovo/h8/h8.h index 7379fc7..061a213 100644 --- a/src/ec/lenovo/h8/h8.h +++ b/src/ec/lenovo/h8/h8.h @@ -27,6 +27,7 @@ void h8_usb_power_enable(int on); void h8_enable_event(int event); void h8_disable_event(int event); int h8_ultrabay_device_present(void); +u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len); /* EC registers */ #define H8_CONFIG0 0x00 [View Less]

1 0

Patch set updated for coreboot: 0df8d10 Revert "Radio and dock support in EC on X60 and X201"
by Peter Stuge 06 Jul '13

06 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3616 -gerrit commit 0df8d1021ce1c411f6f9a8bc728fd59677485a81 Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 20:20:45 2013 +0200 Revert "Radio and dock support in EC on X60 and X201" This reverts commit 7d1ebbff5ad224591a2d1972737611f96a13145c Change-Id: I4a9d0cd31a3df3d1e092193953f334697ca65167 Signed-off-by: Peter Stuge <peter(… [View More]a)stuge.se> --- src/ec/lenovo/h8/h8.c | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 350cc77..9ffdfc1 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -27,10 +27,6 @@ #include "chip.h" #include <pc80/mc146818rtc.h> -#if defined (CONFIG_BOARD_LENOVO_X201) && CONFIG_BOARD_LENOVO_X201 -#include "mainboard/lenovo/x201/dock.h" -#endif - static void h8_bluetooth_enable(int on) { if (on) @@ -41,7 +37,8 @@ static void h8_bluetooth_enable(int on) void h8_trackpoint_enable(int on) { - ec_write(H8_TRACKPOINT_CTRL, on ? H8_TRACKPOINT_ON : H8_TRACKPOINT_OFF); + ec_write(H8_TRACKPOINT_CTRL, + on ? H8_TRACKPOINT_ON : H8_TRACKPOINT_OFF); } @@ -53,14 +50,6 @@ void h8_wlan_enable(int on) ec_clr_bit(0x3a, 5); } -static void h8_3g_enable(int on) -{ - if (on) - ec_set_bit(0x3a, 6); - else - ec_clr_bit(0x3a, 6); -} - static void h8_log_ec_version(void) { unsigned char ecfw[9], c; @@ -161,31 +150,17 @@ static void h8_enable(device_t dev) if (!get_option(&val, "volume")) ec_write(H8_VOLUME_CONTROL, val); - if (get_option(&val, "bluetooth")) - val = 1; - h8_bluetooth_enable(val); - - if (get_option(&val, "umts")) - val = 1; - - h8_3g_enable(val); - if (get_option(&val, "first_battery")) - val = 1; + if (!get_option(&val, "bluetooth")) + h8_bluetooth_enable(val); - tmp = ec_read(H8_CONFIG3); - tmp &= ~(1 << 4); - tmp |= (val & 1) << 4; - ec_write(H8_CONFIG3, tmp); + if (!get_option(&val, "first_battery")) { + tmp = ec_read(H8_CONFIG3); + tmp &= ~(1 << 4); + tmp |= (val & 1)<< 4; + ec_write(H8_CONFIG3, tmp); + } h8_set_audio_mute(0); - -#if defined (CONFIG_BOARD_LENOVO_X201) && CONFIG_BOARD_LENOVO_X201 - if (dock_present()) { - printk(BIOS_DEBUG, "dock is connected\n"); - dock_connect(); - } else - printk(BIOS_DEBUG, "dock is not connected\n"); -#endif } struct chip_operations ec_lenovo_h8_ops = { [View Less]

1 0

New patch to review for coreboot: 7cef3e7 Revert "Radio and dock support in EC on X60 and X201"
by Peter Stuge 06 Jul '13

06 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3616 -gerrit commit 7cef3e75c800f17063ad3f6cd9383e154a97b2b1 Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 20:20:45 2013 +0200 Revert "Radio and dock support in EC on X60 and X201" This reverts commit 7d1ebbff5ad224591a2d1972737611f96a13145c Change-Id: I4a9d0cd31a3df3d1e092193953f334697ca65167 Signed-off-by: Peter Stuge <peter(… [View More]a)stuge.se> --- src/ec/lenovo/h8/h8.c | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 350cc77..9ffdfc1 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -27,10 +27,6 @@ #include "chip.h" #include <pc80/mc146818rtc.h> -#if defined (CONFIG_BOARD_LENOVO_X201) && CONFIG_BOARD_LENOVO_X201 -#include "mainboard/lenovo/x201/dock.h" -#endif - static void h8_bluetooth_enable(int on) { if (on) @@ -41,7 +37,8 @@ static void h8_bluetooth_enable(int on) void h8_trackpoint_enable(int on) { - ec_write(H8_TRACKPOINT_CTRL, on ? H8_TRACKPOINT_ON : H8_TRACKPOINT_OFF); + ec_write(H8_TRACKPOINT_CTRL, + on ? H8_TRACKPOINT_ON : H8_TRACKPOINT_OFF); } @@ -53,14 +50,6 @@ void h8_wlan_enable(int on) ec_clr_bit(0x3a, 5); } -static void h8_3g_enable(int on) -{ - if (on) - ec_set_bit(0x3a, 6); - else - ec_clr_bit(0x3a, 6); -} - static void h8_log_ec_version(void) { unsigned char ecfw[9], c; @@ -161,31 +150,17 @@ static void h8_enable(device_t dev) if (!get_option(&val, "volume")) ec_write(H8_VOLUME_CONTROL, val); - if (get_option(&val, "bluetooth")) - val = 1; - h8_bluetooth_enable(val); - - if (get_option(&val, "umts")) - val = 1; - - h8_3g_enable(val); - if (get_option(&val, "first_battery")) - val = 1; + if (!get_option(&val, "bluetooth")) + h8_bluetooth_enable(val); - tmp = ec_read(H8_CONFIG3); - tmp &= ~(1 << 4); - tmp |= (val & 1) << 4; - ec_write(H8_CONFIG3, tmp); + if (!get_option(&val, "first_battery")) { + tmp = ec_read(H8_CONFIG3); + tmp &= ~(1 << 4); + tmp |= (val & 1)<< 4; + ec_write(H8_CONFIG3, tmp); + } h8_set_audio_mute(0); - -#if defined (CONFIG_BOARD_LENOVO_X201) && CONFIG_BOARD_LENOVO_X201 - if (dock_present()) { - printk(BIOS_DEBUG, "dock is connected\n"); - dock_connect(); - } else - printk(BIOS_DEBUG, "dock is not connected\n"); -#endif } struct chip_operations ec_lenovo_h8_ops = { [View Less]

1 0

Patch set updated for coreboot: 8918caf w83627hf/acpi: Fix endianess error in floppy drive enumeration code
by Christoph Grenz 06 Jul '13

06 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/3602 -gerrit commit 8918caf86d13c17286056e0dff1cc6a8aa2ec9a1 Author: Christoph Grenz <christophg+cb(a)grenz-bonn.de> Date: Thu Jul 4 02:51:42 2013 +0200 w83627hf/acpi: Fix endianess error in floppy drive enumeration code The enumeration results are stored as five DWORDs in one 20 byte buffer. Bytes 3, 7, 11 and 15 were used to set … [View More]

1 0

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

06 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 c25869764dd514d4b969e31804b6bc6173e56ee6 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 … [View More]

1 0

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

06 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 660fd85f0910d87b61e560a282e5a88c33285a7e 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(… [View More]). _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 [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2013