summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2020-07-13 22:36:51 -0700
committerFurquan Shaikh <furquan@google.com>2020-07-17 18:29:37 +0000
commitdbac2b59128193b5c44b3587c75f09a560a2c426 (patch)
tree9d5488f9c9daff3cda01c5c86706eea6e545403f
parentd2b173657a5d9a48f8ec4f3f2cabb02dc161171b (diff)
downloadcoreboot-dbac2b59128193b5c44b3587c75f09a560a2c426.tar.xz
soc/amd/picasso: Move PMOD global variable to globalnvs.asl
Global variable `PMOD` that stores the interrupt mode used by OS is required by all mainboards. This change moves the variable definition to globalnvs.asl under picasso. Additionally, ACPI spec says that BIOS should assume interrupt mode as PIC until _PIC() method is called by OS. Thus, this change also updates the default value of PMOD as 0 i.e. PIC mode. BUG=b:153879530 Signed-off-by: Furquan Shaikh <furquan@google.com> Change-Id: I731c03d965882281a7a23f55894451210ba72274 Reviewed-on: https://review.coreboot.org/c/coreboot/+/43514 Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/amd/mandolin/acpi/mainboard.asl1
-rw-r--r--src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/mainboard.asl1
-rw-r--r--src/soc/amd/picasso/acpi/globalnvs.asl3
3 files changed, 3 insertions, 2 deletions
diff --git a/src/mainboard/amd/mandolin/acpi/mainboard.asl b/src/mainboard/amd/mandolin/acpi/mainboard.asl
index d59240bc16..534155ebf1 100644
--- a/src/mainboard/amd/mandolin/acpi/mainboard.asl
+++ b/src/mainboard/amd/mandolin/acpi/mainboard.asl
@@ -12,4 +12,3 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */
/* Some global data */
Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
Name(OSV, Ones) /* Assume nothing */
-Name(PMOD, One) /* Assume APIC */
diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/mainboard.asl b/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/mainboard.asl
index b3d39969f1..e77897033d 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/mainboard.asl
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/mainboard.asl
@@ -12,4 +12,3 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */
/* Some global data */
Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
Name(OSV, Ones) /* Assume nothing */
-Name(PMOD, One) /* Assume APIC */
diff --git a/src/soc/amd/picasso/acpi/globalnvs.asl b/src/soc/amd/picasso/acpi/globalnvs.asl
index 3ab35df630..8147619ab5 100644
--- a/src/soc/amd/picasso/acpi/globalnvs.asl
+++ b/src/soc/amd/picasso/acpi/globalnvs.asl
@@ -1,5 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* Global variables */
+Name (PMOD, Zero) /* Interrupt Mode used by OS. Assume PIC. */
+
/*
* NOTE: The layout of the GNVS structure below must match the layout in
* soc/amd/picasso/include/soc/nvs.h !!!