aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Wu <david_wu@quanta.corp-partner.google.com>2018-03-21 16:48:53 +0800
committerMartin Roth <martinroth@google.com>2018-08-28 15:14:42 +0000
commit5dff396befca2241f8323b422cbf6cc5b66a7488 (patch)
treeab023988a647046de152cee0c90f871b981e8c09 /src
parent216345dd2480cf30df4e3ec8f323ce75f30e222e (diff)
acpi: Hide Chrome and coreboot specific devices
Some ACPI interfaces introduced by Chrome or coreboot do not need drivers outside ChromeOS, for example Chrome EC or coreboot table; or will be probed by direct ACPI calls (instead of trying to find drivers by device IDs). These interfaces should be set to hidden so non-ChromeOS systems, for example Windows, won't have problem finding driver. Interfaces changed: - coreboot (BOOT0000), only used by Chrome OS / Linux kernel. - Chrome OS EC - Chrome OS EC PD - Chrome OS TBMC - Chrome OS RAMoops BUG=b:72200466 BRANCH=eve TEST=Boot into non-ChromeOS systems (for example Windows) and checked ACPI devices on UI. Change-Id: I9786cf9ee07b2c3f11509850604f2bfb3f3e710a Signed-off-by: David Wu <David_Wu@quanta.corp-partner.google.com> Reviewed-on: https://chromium-review.googlesource.com/1078211 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Queue: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> Trybot-Ready: Hung-Te Lin <hungte@chromium.org> Reviewed-on: https://review.coreboot.org/28333 Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/acpi.c2
-rw-r--r--src/arch/x86/include/arch/acpigen.h3
-rw-r--r--src/ec/google/chromeec/acpi/cros_ec.asl4
-rw-r--r--src/ec/google/chromeec/acpi/pd.asl4
-rw-r--r--src/ec/google/chromeec/acpi/tbmc.asl4
-rw-r--r--src/vendorcode/google/chromeos/acpi/ramoops.asl4
6 files changed, 20 insertions, 1 deletions
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 012fe186e7..0701bbe8fb 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -324,7 +324,7 @@ static void acpi_ssdt_write_cbtable(void)
acpigen_write_device("CTBL");
acpigen_write_coreboot_hid(COREBOOT_ACPI_ID_CBTABLE);
acpigen_write_name_integer("_UID", 0);
- acpigen_write_STA(ACPI_STATUS_DEVICE_ALL_ON);
+ acpigen_write_STA(ACPI_STATUS_DEVICE_HIDDEN_ON);
acpigen_write_name("_CRS");
acpigen_write_resourcetemplate_header();
acpigen_write_mem32fixed(0, base, size);
diff --git a/src/arch/x86/include/arch/acpigen.h b/src/arch/x86/include/arch/acpigen.h
index 775339a713..a27bd6f277 100644
--- a/src/arch/x86/include/arch/acpigen.h
+++ b/src/arch/x86/include/arch/acpigen.h
@@ -36,6 +36,9 @@
ACPI_STATUS_DEVICE_ENABLED |\
ACPI_STATUS_DEVICE_SHOW_IN_UI |\
ACPI_STATUS_DEVICE_STATE_OK)
+#define ACPI_STATUS_DEVICE_HIDDEN_ON (ACPI_STATUS_DEVICE_PRESENT |\
+ ACPI_STATUS_DEVICE_ENABLED |\
+ ACPI_STATUS_DEVICE_STATE_OK)
/* ACPI Op/Prefix Codes */
enum {
diff --git a/src/ec/google/chromeec/acpi/cros_ec.asl b/src/ec/google/chromeec/acpi/cros_ec.asl
index 1d7fb5227b..d0a5b68438 100644
--- a/src/ec/google/chromeec/acpi/cros_ec.asl
+++ b/src/ec/google/chromeec/acpi/cros_ec.asl
@@ -39,4 +39,8 @@ Device (CREC)
Name (_DDN, "EC Base Switch Device")
}
#endif
+ Method(_STA, 0)
+ {
+ Return (0xB)
+ }
}
diff --git a/src/ec/google/chromeec/acpi/pd.asl b/src/ec/google/chromeec/acpi/pd.asl
index a5a58f5534..7b799e82ee 100644
--- a/src/ec/google/chromeec/acpi/pd.asl
+++ b/src/ec/google/chromeec/acpi/pd.asl
@@ -18,4 +18,8 @@ Device (ECPD)
Name (_HID, "GOOG0003")
Name (_UID, 1)
Name (_DDN, "EC PD Device")
+ Method(_STA, 0)
+ {
+ Return (0xB)
+ }
}
diff --git a/src/ec/google/chromeec/acpi/tbmc.asl b/src/ec/google/chromeec/acpi/tbmc.asl
index 25a27ef1be..86a6de86ba 100644
--- a/src/ec/google/chromeec/acpi/tbmc.asl
+++ b/src/ec/google/chromeec/acpi/tbmc.asl
@@ -26,4 +26,8 @@ Device (TBMC)
Return (0x0)
}
}
+ Method(_STA, 0)
+ {
+ Return (0xB)
+ }
}
diff --git a/src/vendorcode/google/chromeos/acpi/ramoops.asl b/src/vendorcode/google/chromeos/acpi/ramoops.asl
index 5a8ed86632..810ff91a01 100644
--- a/src/vendorcode/google/chromeos/acpi/ramoops.asl
+++ b/src/vendorcode/google/chromeos/acpi/ramoops.asl
@@ -35,5 +35,9 @@ Scope (\_SB)
Store (\RMOL, RLEN)
Return (^RBUF)
}
+ Method(_STA, 0)
+ {
+ Return (0xB)
+ }
}
}