[commit] r6304 - in trunk: . src src/ec src/ec/acpi src/mainboard/getac/p470 src/mainboard/roda/rk886ex
Author: stuge Date: Thu Jan 27 12:43:03 2011 New Revision: 6304 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6304
Log: Add new ec subdir for Embedded Controllers and common ACPI EC support
Adds a new src/ec subdir for embedded controllers (mostly found in laptops) and converts Getac P470 and Roda RK886EX to use the new ACPI EC instead of having their own copies of those functions.
Signed-off-by: Sven Schnelle svens@stackframe.org Acked-by: Peter Stuge peter@stuge.se
Added: trunk/src/ec/ trunk/src/ec/Kconfig trunk/src/ec/Makefile.inc trunk/src/ec/acpi/ trunk/src/ec/acpi/Kconfig trunk/src/ec/acpi/Makefile.inc trunk/src/ec/acpi/ec.c - copied, changed from r6302, trunk/src/mainboard/roda/rk886ex/ec.c trunk/src/ec/acpi/ec.h - copied, changed from r6302, trunk/src/mainboard/roda/rk886ex/ec.h trunk/src/mainboard/getac/p470/ec_oem.c - copied, changed from r6302, trunk/src/mainboard/getac/p470/ec.c trunk/src/mainboard/getac/p470/ec_oem.h - copied, changed from r6302, trunk/src/mainboard/getac/p470/ec.h Deleted: trunk/src/mainboard/getac/p470/ec.c trunk/src/mainboard/getac/p470/ec.h trunk/src/mainboard/roda/rk886ex/ec.c trunk/src/mainboard/roda/rk886ex/ec.h Modified: trunk/Makefile trunk/src/Kconfig trunk/src/mainboard/getac/p470/Kconfig trunk/src/mainboard/getac/p470/devicetree.cb trunk/src/mainboard/getac/p470/mainboard.c trunk/src/mainboard/getac/p470/mainboard_smi.c trunk/src/mainboard/roda/rk886ex/Makefile.inc trunk/src/mainboard/roda/rk886ex/devicetree.cb trunk/src/mainboard/roda/rk886ex/m3885.c trunk/src/mainboard/roda/rk886ex/mainboard.c
Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/Makefile Thu Jan 27 12:43:03 2011 (r6304) @@ -123,7 +123,7 @@ PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR) TARGETS-y :=
-BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers +BUILD-y := src/lib src/boot src/console src/devices src/ec src/southbridge src/northbridge src/superio src/drivers BUILD-y += util/cbfstool util/sconfig BUILD-$(CONFIG_ARCH_X86) += src/pc80
Modified: trunk/src/Kconfig ============================================================================== --- trunk/src/Kconfig Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/Kconfig Thu Jan 27 12:43:03 2011 (r6304) @@ -124,6 +124,8 @@ source src/superio/Kconfig comment "Devices" source src/devices/Kconfig +comment "Embedded Controllers" +source src/ec/Kconfig
endmenu
Added: trunk/src/ec/Kconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/ec/Kconfig Thu Jan 27 12:43:03 2011 (r6304) @@ -0,0 +1 @@ +source src/ec/acpi/Kconfig
Added: trunk/src/ec/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/ec/Makefile.inc Thu Jan 27 12:43:03 2011 (r6304) @@ -0,0 +1 @@ +subdirs-y += acpi
Added: trunk/src/ec/acpi/Kconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/ec/acpi/Kconfig Thu Jan 27 12:43:03 2011 (r6304) @@ -0,0 +1,4 @@ +config EC_ACPI + bool + help + ACPI Embedded Controller interface. Mostly found in laptops.
Added: trunk/src/ec/acpi/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/ec/acpi/Makefile.inc Thu Jan 27 12:43:03 2011 (r6304) @@ -0,0 +1,2 @@ +ramstage-y += ec.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c
Copied and modified: trunk/src/ec/acpi/ec.c (from r6302, trunk/src/mainboard/roda/rk886ex/ec.c) ============================================================================== --- trunk/src/mainboard/roda/rk886ex/ec.c Thu Jan 27 08:39:38 2011 (r6302, copy source) +++ trunk/src/ec/acpi/ec.c Thu Jan 27 12:43:03 2011 (r6304) @@ -20,6 +20,7 @@ */
#include <console/console.h> +#include <device/device.h> #include <arch/io.h> #include <delay.h> #include "ec.h" @@ -112,3 +113,6 @@ return send_ec_data(data); }
+struct chip_operations ec_acpi_ops = { + CHIP_NAME("ACPI Embedded Controller") +};
Copied and modified: trunk/src/ec/acpi/ec.h (from r6302, trunk/src/mainboard/roda/rk886ex/ec.h) ============================================================================== --- trunk/src/mainboard/roda/rk886ex/ec.h Thu Jan 27 08:39:38 2011 (r6302, copy source) +++ trunk/src/ec/acpi/ec.h Thu Jan 27 12:43:03 2011 (r6304) @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifndef _MAINBOARD_EC_H -#define _MAINBOARD_EC_H +#ifndef _EC_ACPI_H +#define _EC_ACPI_H
#define EC_DATA 0x62 #define EC_SC 0x66
Modified: trunk/src/mainboard/getac/p470/Kconfig ============================================================================== --- trunk/src/mainboard/getac/p470/Kconfig Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/mainboard/getac/p470/Kconfig Thu Jan 27 12:43:03 2011 (r6304) @@ -27,6 +27,7 @@ select SOUTHBRIDGE_TI_PCIXX12 select SUPERIO_SMSC_FDC37N972 select SUPERIO_SMSC_SIO10N268 + select EC_ACPI select BOARD_HAS_FADT select HAVE_ACPI_TABLES select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/getac/p470/devicetree.cb ============================================================================== --- trunk/src/mainboard/getac/p470/devicetree.cb Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/mainboard/getac/p470/devicetree.cb Thu Jan 27 12:43:03 2011 (r6304) @@ -135,6 +135,8 @@ end device pnp 4e.b off # HWM end + chip ec/acpi + end end
end
Copied and modified: trunk/src/mainboard/getac/p470/ec_oem.c (from r6302, trunk/src/mainboard/getac/p470/ec.c) ============================================================================== --- trunk/src/mainboard/getac/p470/ec.c Thu Jan 27 08:39:38 2011 (r6302, copy source) +++ trunk/src/mainboard/getac/p470/ec_oem.c Thu Jan 27 12:43:03 2011 (r6304) @@ -22,113 +22,8 @@ #include <console/console.h> #include <arch/io.h> #include <delay.h> -#include "ec.h" - -int send_ec_command(u8 command) -{ - int timeout; - - timeout = 0x7ff; - while ((inb(EC_SC) & EC_IBF) && --timeout) { - udelay(10); - if ((timeout & 0xff) == 0) - printk(BIOS_SPEW, "."); - } - if (!timeout) { - printk(BIOS_DEBUG, "Timeout while sending command 0x%02x to EC!\n", - command); - // return -1; - } - - outb(command, EC_SC); - return 0; -} - -int send_ec_data(u8 data) -{ - int timeout; - - timeout = 0x7ff; - while ((inb(EC_SC) & EC_IBF) && --timeout) { // wait for IBF = 0 - udelay(10); - if ((timeout & 0xff) == 0) - printk(BIOS_SPEW, "."); - } - if (!timeout) { - printk(BIOS_DEBUG, "Timeout while sending data 0x%02x to EC!\n", - data); - // return -1; - } - - outb(data, EC_DATA); - - return 0; -} - -int send_ec_data_nowait(u8 data) -{ - outb(data, EC_DATA); - - return 0; -} - -u8 recv_ec_data(void) -{ - int timeout; - u8 data; - - timeout = 0x7fff; - while (--timeout) { // Wait for OBF = 1 - if (inb(EC_SC) & EC_OBF) { - break; - } - udelay(10); - if ((timeout & 0xff) == 0) - printk(BIOS_SPEW, "."); - } - if (!timeout) { - printk(BIOS_DEBUG, "\nTimeout while receiving data from EC!\n"); - // return -1; - } - - data = inb(EC_DATA); - printk(BIOS_SPEW, "recv_ec_data: 0x%02x\n", data); - - return data; -} - -u8 ec_read(u8 addr) -{ - send_ec_command(0x80); - send_ec_data(addr); - - return recv_ec_data(); -} - -int ec_write(u8 addr, u8 data) -{ - send_ec_command(0x81); - send_ec_data(addr); - return send_ec_data(data); -} - -int ec_dump_status(void) -{ - u8 ec_sc = inb(EC_SC); - printk(BIOS_DEBUG, "Embedded Controller Status: "); - if (ec_sc & (1 << 6)) printk(BIOS_DEBUG, "SMI_EVT "); - if (ec_sc & (1 << 5)) printk(BIOS_DEBUG, "SCI_EVT "); - if (ec_sc & (1 << 4)) printk(BIOS_DEBUG, "BURST "); - if (ec_sc & (1 << 3)) printk(BIOS_DEBUG, "CMD "); - if (ec_sc & (1 << 1)) printk(BIOS_DEBUG, "IBF "); - if (ec_sc & (1 << 0)) printk(BIOS_DEBUG, "OBF "); - printk(BIOS_DEBUG, "\n"); - - return ec_sc; -} - - -/* ********************************** */ +#include <ec/acpi/ec.h> +#include "ec_oem.h"
int send_ec_oem_command(u8 command) {
Copied and modified: trunk/src/mainboard/getac/p470/ec_oem.h (from r6302, trunk/src/mainboard/getac/p470/ec.h) ============================================================================== --- trunk/src/mainboard/getac/p470/ec.h Thu Jan 27 08:39:38 2011 (r6302, copy source) +++ trunk/src/mainboard/getac/p470/ec_oem.h Thu Jan 27 12:43:03 2011 (r6304) @@ -19,12 +19,8 @@ * MA 02110-1301 USA */
-#ifndef _MAINBOARD_EC_H -#define _MAINBOARD_EC_H - -#define EC_DATA 0x62 -#define EC_SC 0x66 - +#ifndef _MAINBOARD_EC_OEM_H +#define _MAINBOARD_EC_OEM_H
#define EC_OEM_DATA 0x68 #define EC_OEM_SC 0x6c @@ -44,13 +40,6 @@ #define BD_EC 0x83 // Burst Disable Embedded Controller #define QR_EC 0x84 // Query Embedded Controller
-int send_ec_command(u8 command); -int send_ec_data(u8 data); -int send_ec_data_nowait(u8 data); -u8 recv_ec_data(void); -u8 ec_read(u8 addr); -int ec_write(u8 addr, u8 data); - int send_ec_oem_command(u8 command); int send_ec_oem_data(u8 data); int send_ec_oem_data_nowait(u8 data);
Modified: trunk/src/mainboard/getac/p470/mainboard.c ============================================================================== --- trunk/src/mainboard/getac/p470/mainboard.c Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/mainboard/getac/p470/mainboard.c Thu Jan 27 12:43:03 2011 (r6304) @@ -28,7 +28,7 @@ #include "chip.h" #include "hda_verb.h"
-#include "ec.c" +#include "ec_oem.c"
#define MAX_LCD_BRIGHTNESS 0xd8
Modified: trunk/src/mainboard/getac/p470/mainboard_smi.c ============================================================================== --- trunk/src/mainboard/getac/p470/mainboard_smi.c Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/mainboard/getac/p470/mainboard_smi.c Thu Jan 27 12:43:03 2011 (r6304) @@ -25,7 +25,8 @@ #include <cpu/x86/smm.h> #include "southbridge/intel/i82801gx/i82801gx.h" #include "southbridge/intel/i82801gx/nvs.h" -#include "ec.c" +#include <ec/acpi/ec.h> +#include "ec_oem.c"
#define MAX_LCD_BRIGHTNESS 0xd8
Modified: trunk/src/mainboard/roda/rk886ex/Makefile.inc ============================================================================== --- trunk/src/mainboard/roda/rk886ex/Makefile.inc Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/mainboard/roda/rk886ex/Makefile.inc Thu Jan 27 12:43:03 2011 (r6304) @@ -18,7 +18,6 @@ ##
ramstage-y += m3885.c -ramstage-y += ec.c driver-y += rtl8168.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
Modified: trunk/src/mainboard/roda/rk886ex/devicetree.cb ============================================================================== --- trunk/src/mainboard/roda/rk886ex/devicetree.cb Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/mainboard/roda/rk886ex/devicetree.cb Thu Jan 27 12:43:03 2011 (r6304) @@ -106,6 +106,8 @@ device pnp ff.1 on # dummy address end end + chip ec/acpi + end
end #device pci 1f.1 off end # IDE
Modified: trunk/src/mainboard/roda/rk886ex/m3885.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/m3885.c Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/mainboard/roda/rk886ex/m3885.c Thu Jan 27 12:43:03 2011 (r6304) @@ -25,7 +25,7 @@ #include <arch/io.h> #include <delay.h>
-#include "ec.h" +#include <ec/acpi/ec.h> #include "m3885.h"
#define TH0LOW 80
Modified: trunk/src/mainboard/roda/rk886ex/mainboard.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/mainboard.c Thu Jan 27 12:09:36 2011 (r6303) +++ trunk/src/mainboard/roda/rk886ex/mainboard.c Thu Jan 27 12:43:03 2011 (r6304) @@ -30,7 +30,7 @@ #include <arch/coreboot_tables.h> #include "chip.h"
-#include "ec.h" +#include <ec/acpi/ec.h> #include "m3885.h"
#define DUMP_RUNTIME_REGISTERS 0
-
repository service