ACPI: Move PICM declaration

Variable PICM was not inside GNVS region and can use a static
initialisation value.

For most AMD platforms PICM default changes from 1 to 0.

Fix comments about PICM==0 used to indicate use of i8259 PIC for
interrupt delivery.

Change-Id: I525ef8353514ec32941c4d0c37cab38aa320cb20
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49905
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

48 files changed, 6 insertions, 63 deletions

diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl
index ead37d3577..4300f0a65e 100644
--- a/src/acpi/dsdt_top.asl
+++ b/src/acpi/dsdt_top.asl
@@ -11,5 +11,8 @@
 /* Operating system enumeration. */
 Name (OSYS, 0)
 
+/* Zero => PIC mode, One => APIC Mode */
+Name (PICM, Zero)
+
 /* Power state (AC = 1) */
 Name (PWRS, One)
diff --git a/src/mainboard/amd/gardenia/acpi/mainboard.asl b/src/mainboard/amd/gardenia/acpi/mainboard.asl
index 91d3353ad2..534155ebf1 100644
--- a/src/mainboard/amd/gardenia/acpi/mainboard.asl
+++ b/src/mainboard/amd/gardenia/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(PICM, One)	/* Assume APIC */
diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/amd/inagua/acpi/mainboard.asl
+++ b/src/mainboard/amd/inagua/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/amd/olivehill/acpi/mainboard.asl b/src/mainboard/amd/olivehill/acpi/mainboard.asl
index 074be8d0f4..7e4ed7372e 100644
--- a/src/mainboard/amd/olivehill/acpi/mainboard.asl
+++ b/src/mainboard/amd/olivehill/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/amd/padmelon/acpi/mainboard.asl b/src/mainboard/amd/padmelon/acpi/mainboard.asl
index 91d3353ad2..534155ebf1 100644
--- a/src/mainboard/amd/padmelon/acpi/mainboard.asl
+++ b/src/mainboard/amd/padmelon/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(PICM, One)	/* Assume APIC */
diff --git a/src/mainboard/amd/parmer/acpi/mainboard.asl b/src/mainboard/amd/parmer/acpi/mainboard.asl
index 61b8ef6d51..66bab385b6 100644
--- a/src/mainboard/amd/parmer/acpi/mainboard.asl
+++ b/src/mainboard/amd/parmer/acpi/mainboard.asl
@@ -14,7 +14,6 @@
 	/* Some global data */
 	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
-	Name(PICM, One) /* Assume APIC */
 
 	/* AcpiGpe0Blk */
 	OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/amd/persimmon/acpi/mainboard.asl
+++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/amd/south_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/south_station/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/amd/thatcher/acpi/mainboard.asl b/src/mainboard/amd/thatcher/acpi/mainboard.asl
index 61b8ef6d51..66bab385b6 100644
--- a/src/mainboard/amd/thatcher/acpi/mainboard.asl
+++ b/src/mainboard/amd/thatcher/acpi/mainboard.asl
@@ -14,7 +14,6 @@
 	/* Some global data */
 	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
-	Name(PICM, One) /* Assume APIC */
 
 	/* AcpiGpe0Blk */
 	OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/amd/union_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/union_station/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl
+++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
index 074be8d0f4..7e4ed7372e 100644
--- a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/asus/a88xm-e/acpi/mainboard.asl b/src/mainboard/asus/a88xm-e/acpi/mainboard.asl
index 2653b0af22..40cd44de38 100644
--- a/src/mainboard/asus/a88xm-e/acpi/mainboard.asl
+++ b/src/mainboard/asus/a88xm-e/acpi/mainboard.asl
@@ -17,4 +17,3 @@
 	/* Some global data */
 	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
-	Name(PICM, One) /* Assume APIC */
diff --git a/src/mainboard/asus/am1i-a/acpi/mainboard.asl b/src/mainboard/asus/am1i-a/acpi/mainboard.asl
index 074be8d0f4..7e4ed7372e 100644
--- a/src/mainboard/asus/am1i-a/acpi/mainboard.asl
+++ b/src/mainboard/asus/am1i-a/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
index 42db31d000..18886a79af 100644
--- a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
@@ -14,4 +14,3 @@
 	/* Some global data */
 	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
-	Name(PICM, One) /* Assume APIC */
diff --git a/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl b/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
index 074be8d0f4..7e4ed7372e 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl b/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl
index 074be8d0f4..7e4ed7372e 100644
--- a/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl
+++ b/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/biostar/am1ml/acpi/mainboard.asl b/src/mainboard/biostar/am1ml/acpi/mainboard.asl
index 074be8d0f4..7e4ed7372e 100644
--- a/src/mainboard/biostar/am1ml/acpi/mainboard.asl
+++ b/src/mainboard/biostar/am1ml/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl
+++ b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/emulation/qemu-q35/dsdt.asl b/src/mainboard/emulation/qemu-q35/dsdt.asl
index e35fcdfcf5..25cc549eba 100644
--- a/src/mainboard/emulation/qemu-q35/dsdt.asl
+++ b/src/mainboard/emulation/qemu-q35/dsdt.asl
@@ -142,8 +142,6 @@ DefinitionBlock (
  * PCI IRQs
  ****************************************************************/
 
-	/* Zero => PIC mode, One => APIC Mode */
-	Name(\PICM, Zero)
 	Method(\_PIC, 1, NotSerialized) {
 		\PICM = Arg0
 	}
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
index 074be8d0f4..7e4ed7372e 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
index 3b163ac762..e7da06384c 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
@@ -17,4 +17,3 @@ Name (HPBA, 0xFED00000)
 /* Global Data */
 Name (OSVR, 3)		/* WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name (OSV, Ones)	/* Assume nothing */
-Name (PICM, One)	/* Assume APIC */
diff --git a/src/mainboard/hp/abm/acpi/mainboard.asl b/src/mainboard/hp/abm/acpi/mainboard.asl
index a2cf121c2d..78506ae704 100644
--- a/src/mainboard/hp/abm/acpi/mainboard.asl
+++ b/src/mainboard/hp/abm/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
index 465c77c97a..fc7ab13cda 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
@@ -14,7 +14,6 @@
 	/* Some global data */
 	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
-	Name(PICM, One) /* Assume APIC */
 
 	/* AcpiGpe0Blk */
 	OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/intel/cedarisland_crb/acpi/platform.asl b/src/mainboard/intel/cedarisland_crb/acpi/platform.asl
index 964959265f..6ac38dd937 100644
--- a/src/mainboard/intel/cedarisland_crb/acpi/platform.asl
+++ b/src/mainboard/intel/cedarisland_crb/acpi/platform.asl
@@ -19,8 +19,6 @@ Field (POST, ByteAcc, Lock, Preserve)
 
 Name(\APC1, Zero) // IIO IOAPIC
 
-Name(\PICM, Zero) // IOAPIC/8259
-
 Method(_PIC, 1)
 {
 	Store(Arg0, PICM)
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/lenovo/g505s/acpi/mainboard.asl b/src/mainboard/lenovo/g505s/acpi/mainboard.asl
index 465c77c97a..fc7ab13cda 100644
--- a/src/mainboard/lenovo/g505s/acpi/mainboard.asl
+++ b/src/mainboard/lenovo/g505s/acpi/mainboard.asl
@@ -14,7 +14,6 @@
 	/* Some global data */
 	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
-	Name(PICM, One) /* Assume APIC */
 
 	/* AcpiGpe0Blk */
 	OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl
index decfda4a9e..115bf11bae 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -38,7 +38,6 @@ DefinitionBlock (
 	/* Some global data */
 	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
-	Name(PICM, One)	/* Assume APIC */
 
 	/*
 	 * Processor Object
diff --git a/src/mainboard/msi/ms7721/acpi/mainboard.asl b/src/mainboard/msi/ms7721/acpi/mainboard.asl
index 42db31d000..18886a79af 100644
--- a/src/mainboard/msi/ms7721/acpi/mainboard.asl
+++ b/src/mainboard/msi/ms7721/acpi/mainboard.asl
@@ -14,4 +14,3 @@
 	/* Some global data */
 	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
-	Name(PICM, One) /* Assume APIC */
diff --git a/src/mainboard/pcengines/apu1/acpi/mainboard.asl b/src/mainboard/pcengines/apu1/acpi/mainboard.asl
index a1eb03b469..9da7bd71f2 100644
--- a/src/mainboard/pcengines/apu1/acpi/mainboard.asl
+++ b/src/mainboard/pcengines/apu1/acpi/mainboard.asl
@@ -13,7 +13,6 @@ 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(PICM, One)	/* Assume APIC */
 
 Scope(\_SB) {
 	Method(OSFL, 0){
diff --git a/src/mainboard/pcengines/apu2/acpi/mainboard.asl b/src/mainboard/pcengines/apu2/acpi/mainboard.asl
index 074be8d0f4..7e4ed7372e 100644
--- a/src/mainboard/pcengines/apu2/acpi/mainboard.asl
+++ b/src/mainboard/pcengines/apu2/acpi/mainboard.asl
@@ -12,7 +12,6 @@ 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(PICM, One)	/* Assume APIC */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/soc/amd/picasso/acpi/globalnvs.asl b/src/soc/amd/picasso/acpi/globalnvs.asl
index 3f02657d04..10a927ea78 100644
--- a/src/soc/amd/picasso/acpi/globalnvs.asl
+++ b/src/soc/amd/picasso/acpi/globalnvs.asl
@@ -1,8 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-/* Global variables */
-Name (PICM, 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 !!!
diff --git a/src/soc/intel/baytrail/acpi/globalnvs.asl b/src/soc/intel/baytrail/acpi/globalnvs.asl
index e0720d8186..8ae426cfae 100644
--- a/src/soc/intel/baytrail/acpi/globalnvs.asl
+++ b/src/soc/intel/baytrail/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name(\PICM, 0)		/* IOAPIC/8259 */
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl
index 5642e6afce..206b4666a8 100644
--- a/src/soc/intel/braswell/acpi/globalnvs.asl
+++ b/src/soc/intel/braswell/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name(\PICM, 0)		/* IOAPIC/8259 */
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/soc/intel/broadwell/pch/acpi/globalnvs.asl b/src/soc/intel/broadwell/pch/acpi/globalnvs.asl
index 31905a60f7..03aa1d68b3 100644
--- a/src/soc/intel/broadwell/pch/acpi/globalnvs.asl
+++ b/src/soc/intel/broadwell/pch/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name (\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl
index 8c29d1efef..161381f5e5 100644
--- a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl
+++ b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name (\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/soc/intel/denverton_ns/acpi/globalnvs.asl b/src/soc/intel/denverton_ns/acpi/globalnvs.asl
index 871a4710b0..a6b216a5b1 100644
--- a/src/soc/intel/denverton_ns/acpi/globalnvs.asl
+++ b/src/soc/intel/denverton_ns/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name(\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl
index cc7e8e3bec..a3fbbbca32 100644
--- a/src/soc/intel/skylake/acpi/globalnvs.asl
+++ b/src/soc/intel/skylake/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name (\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
index 56d75b1b91..8d2bbca79a 100644
--- a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name(\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/southbridge/intel/i82801gx/acpi/globalnvs.asl b/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
index c1c5ac2126..bfa1b7ec02 100644
--- a/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
+++ b/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name(\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/southbridge/intel/i82801gx/acpi/pci.asl b/src/southbridge/intel/i82801gx/acpi/pci.asl
index 99e4c759ac..a7ea1322b5 100644
--- a/src/southbridge/intel/i82801gx/acpi/pci.asl
+++ b/src/southbridge/intel/i82801gx/acpi/pci.asl
@@ -45,7 +45,7 @@ Device (PCIB)
 	// TODO: How many slots, where?
 
 	// PCI Interrupt Routing.
-	// If PICM is set, interrupts are routed over the i8259, otherwise
+	// If PICM is _not_ set, interrupts are routed over the i8259, otherwise
 	// over the IOAPIC. (Really? If they're above 15 they need to be routed
 	// fixed over the IOAPIC?)
 
diff --git a/src/southbridge/intel/i82801ix/acpi/globalnvs.asl b/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
index d6fefbe661..a565ec8745 100644
--- a/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
+++ b/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name(\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/southbridge/intel/i82801ix/acpi/pci.asl b/src/southbridge/intel/i82801ix/acpi/pci.asl
index c9a87bc565..6a5bcae130 100644
--- a/src/southbridge/intel/i82801ix/acpi/pci.asl
+++ b/src/southbridge/intel/i82801ix/acpi/pci.asl
@@ -45,7 +45,7 @@ Device (PCIB)
 	// TODO: How many slots, where?
 
 	// PCI Interrupt Routing.
-	// If PICM is set, interrupts are routed over the i8259, otherwise
+	// If PICM is _not_ set, interrupts are routed over the i8259, otherwise
 	// over the IOAPIC. (Really? If they're above 15 they need to be routed
 	// fixed over the IOAPIC?)
 
diff --git a/src/southbridge/intel/i82801jx/acpi/globalnvs.asl b/src/southbridge/intel/i82801jx/acpi/globalnvs.asl
index 230d2fc5fe..25c5290ece 100644
--- a/src/southbridge/intel/i82801jx/acpi/globalnvs.asl
+++ b/src/southbridge/intel/i82801jx/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name(\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/southbridge/intel/i82801jx/acpi/pci.asl b/src/southbridge/intel/i82801jx/acpi/pci.asl
index 29c04d4c3c..3fa2bc0d3e 100644
--- a/src/southbridge/intel/i82801jx/acpi/pci.asl
+++ b/src/southbridge/intel/i82801jx/acpi/pci.asl
@@ -45,7 +45,7 @@ Device (PCIB)
 	// TODO: How many slots, where?
 
 	// PCI Interrupt Routing.
-	// If PICM is set, interrupts are routed over the i8259, otherwise
+	// If PICM is _not_ set, interrupts are routed over the i8259, otherwise
 	// over the IOAPIC. (Really? If they're above 15 they need to be routed
 	// fixed over the IOAPIC?)
 
diff --git a/src/southbridge/intel/ibexpeak/acpi/globalnvs.asl b/src/southbridge/intel/ibexpeak/acpi/globalnvs.asl
index d025ce9572..cd37e283de 100644
--- a/src/southbridge/intel/ibexpeak/acpi/globalnvs.asl
+++ b/src/southbridge/intel/ibexpeak/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name(\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */
diff --git a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
index d422adbb88..26f98112eb 100644
--- a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
@@ -2,8 +2,6 @@
 
 /* Global Variables */
 
-Name (\PICM, 0)		// IOAPIC/8259
-
 Field (GNVS, ByteAcc, NoLock, Preserve)
 {
 	/* Miscellaneous */