summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2013-10-24 12:37:48 -0700
committerAaron Durbin <adurbin@google.com>2014-01-30 05:36:13 +0100
commit58867b10028e97a323498d0be284243f769e7845 (patch)
treea192968eaec178a048d85cd9e6d1e7e6c81fae4a /src
parent3a499c3a42e2d079c6c0c9600a3a8de928c30b6e (diff)
chrome ec: Fix ASL to use IO() instead of FixedIO()
FixedIO seems like a nice short version of IO but in reality it is limited to 10-bit ISA addresses and so should not really be used in most situations. Change all the references to use IO() directly instead. BUG=chromium:311294 BRANCH=none TEST=emerge-samus chromeos-coreboot-samus and check for iasl warnings using updated iasl compiler revision 20130117. Boot the imge and ensure that EC regions are still exported in /proc/ioports. Change-Id: I54de65892bed9e43dbba916990cf2b70c370843c Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/174810 Reviewed-by: Stefan Reinauer <reinauer@chromium.org> Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/4910 Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src')
-rw-r--r--src/ec/google/chromeec/acpi/superio.asl50
1 files changed, 32 insertions, 18 deletions
diff --git a/src/ec/google/chromeec/acpi/superio.asl b/src/ec/google/chromeec/acpi/superio.asl
index 39ddd29bdd..59401812e7 100644
--- a/src/ec/google/chromeec/acpi/superio.asl
+++ b/src/ec/google/chromeec/acpi/superio.asl
@@ -52,12 +52,14 @@ Device (SIO) {
Name (_CRS, ResourceTemplate ()
{
- FixedIO (EC_LPC_ADDR_MEMMAP, EC_MEMMAP_SIZE)
+ IO (Decode16, EC_LPC_ADDR_MEMMAP, EC_LPC_ADDR_MEMMAP,
+ 0x08, EC_MEMMAP_SIZE)
})
Name (_PRS, ResourceTemplate ()
{
- FixedIO (EC_LPC_ADDR_MEMMAP, EC_MEMMAP_SIZE)
+ IO (Decode16, EC_LPC_ADDR_MEMMAP, EC_LPC_ADDR_MEMMAP,
+ 0x08, EC_MEMMAP_SIZE)
})
}
#endif
@@ -74,21 +76,33 @@ Device (SIO) {
Name (_CRS, ResourceTemplate ()
{
- FixedIO (EC_LPC_ADDR_HOST_DATA, 1)
- FixedIO (EC_LPC_ADDR_HOST_CMD, 1)
- FixedIO (EC_HOST_CMD_REGION0, EC_HOST_CMD_REGION_SIZE)
- FixedIO (EC_HOST_CMD_REGION1, EC_HOST_CMD_REGION_SIZE)
+ IO (Decode16,
+ EC_LPC_ADDR_HOST_DATA, EC_LPC_ADDR_HOST_DATA,
+ 0x01, 0x01)
+ IO (Decode16,
+ EC_LPC_ADDR_HOST_CMD, EC_LPC_ADDR_HOST_CMD,
+ 0x01, 0x01)
+ IO (Decode16,
+ EC_HOST_CMD_REGION0, EC_HOST_CMD_REGION0, 0x08,
+ EC_HOST_CMD_REGION_SIZE)
+ IO (Decode16,
+ EC_HOST_CMD_REGION1, EC_HOST_CMD_REGION0, 0x08,
+ EC_HOST_CMD_REGION_SIZE)
})
Name (_PRS, ResourceTemplate ()
{
StartDependentFn (0, 0) {
- FixedIO (EC_LPC_ADDR_HOST_DATA, 1)
- FixedIO (EC_LPC_ADDR_HOST_CMD, 1)
- FixedIO (EC_HOST_CMD_REGION0,
- EC_HOST_CMD_REGION_SIZE)
- FixedIO (EC_HOST_CMD_REGION1,
- EC_HOST_CMD_REGION_SIZE)
+ IO (Decode16, EC_LPC_ADDR_HOST_DATA,
+ EC_LPC_ADDR_HOST_DATA, 0x01, 0x01)
+ IO (Decode16, EC_LPC_ADDR_HOST_CMD,
+ EC_LPC_ADDR_HOST_CMD, 0x01, 0x01)
+ IO (Decode16,
+ EC_HOST_CMD_REGION0, EC_HOST_CMD_REGION0,
+ 0x08, EC_HOST_CMD_REGION_SIZE)
+ IO (Decode16,
+ EC_HOST_CMD_REGION1, EC_HOST_CMD_REGION1,
+ 0x08, EC_HOST_CMD_REGION_SIZE)
}
EndDependentFn ()
})
@@ -107,14 +121,14 @@ Device (SIO) {
Name (_CRS, ResourceTemplate ()
{
- FixedIO (0x03F8, 0x08)
+ IO (Decode16, 0x03F8, 0x3F8, 0x08, 0x08)
IRQNoFlags () {4}
})
Name (_PRS, ResourceTemplate ()
{
StartDependentFn (0, 0) {
- FixedIO (0x03F8, 0x08)
+ IO (Decode16, 0x03F8, 0x3F8, 0x08, 0x08)
IRQNoFlags () {4}
}
EndDependentFn ()
@@ -136,16 +150,16 @@ Device (SIO) {
Name (_CRS, ResourceTemplate()
{
- FixedIO (0x60, 0x01)
- FixedIO (0x64, 0x01)
+ IO (Decode16, 0x60, 0x60, 0x01, 0x01)
+ IO (Decode16, 0x64, 0x64, 0x01, 0x01)
IRQNoFlags () {1}
})
Name (_PRS, ResourceTemplate()
{
StartDependentFn (0, 0) {
- FixedIO (0x60, 0x01)
- FixedIO (0x64, 0x01)
+ IO (Decode16, 0x60, 0x60, 0x01, 0x01)
+ IO (Decode16, 0x64, 0x64, 0x01, 0x01)
IRQNoFlags () {1}
}
EndDependentFn ()