Attention is currently required from: Lance Zhao, Jason Glenesk, Anjaneya "Reddy" Chagam, Raul Rangel, Marshall Dawson, Jonathan Zhang, Johnny Lin, Morgan Jang, Patrick Rudolph, Felix Held. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50470 )
Change subject: [WIP] ACPI: Move _PIC declarations ......................................................................
[WIP] ACPI: Move _PIC declarations
Change-Id: I659835354570fb1d4860fcbddf2a51831170a374 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/acpi/dsdt_top.asl M src/mainboard/51nb/x210/acpi/platform.asl M src/mainboard/emulation/qemu-q35/dsdt.asl M src/mainboard/intel/cedarisland_crb/acpi/platform.asl M src/mainboard/lippert/frontrunner-af/dsdt.asl M src/mainboard/ocp/deltalake/acpi/platform.asl M src/mainboard/ocp/tiogapass/acpi/platform.asl M src/soc/amd/picasso/acpi/pci_int.asl M src/soc/amd/stoneyridge/acpi/pci_int.asl M src/soc/intel/common/block/acpi/acpi/platform.asl M src/southbridge/amd/agesa/hudson/acpi/pci_int.asl M src/southbridge/amd/cimx/sb800/acpi/pcie.asl M src/southbridge/amd/pi/hudson/acpi/pci_int.asl M src/southbridge/intel/common/acpi/platform.asl 14 files changed, 14 insertions(+), 109 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/50470/1
diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl index 4300f0a..3e6bb1c 100644 --- a/src/acpi/dsdt_top.asl +++ b/src/acpi/dsdt_top.asl @@ -16,3 +16,17 @@
/* Power state (AC = 1) */ Name (PWRS, One) + +/* + * The _PIC method is called by the OS to choose between interrupt + * routing via the i8259 interrupt controller or the APIC. + * + * _PIC is called with a parameter of 0 for i8259 configuration and + * with a parameter of 1 for Local Apic/IOAPIC configuration. + */ + +Method (_PIC, 1) +{ + /* Remember the OS' IRQ routing choice. */ + PICM = Arg0 +} diff --git a/src/mainboard/51nb/x210/acpi/platform.asl b/src/mainboard/51nb/x210/acpi/platform.asl index 6cf3f32..dbf6241 100644 --- a/src/mainboard/51nb/x210/acpi/platform.asl +++ b/src/mainboard/51nb/x210/acpi/platform.asl @@ -4,20 +4,6 @@ #include <soc/intel/common/acpi/acpi_wake_source.asl>
/* - * The _PIC method is called by the OS to choose between interrupt - * routing via the i8259 interrupt controller or the APIC. - * - * _PIC is called with a parameter of 0 for i8259 configuration and - * with a parameter of 1 for Local Apic/IOAPIC configuration. - */ - -Method (_PIC, 1) -{ - /* Remember the OS' IRQ routing choice. */ - Store (Arg0, PICM) -} - -/* * The _PTS method (Prepare To Sleep) is called before the OS is * entering a sleep state. The sleep state number is passed in Arg0 */ diff --git a/src/mainboard/emulation/qemu-q35/dsdt.asl b/src/mainboard/emulation/qemu-q35/dsdt.asl index 25cc549e..d65f2de 100644 --- a/src/mainboard/emulation/qemu-q35/dsdt.asl +++ b/src/mainboard/emulation/qemu-q35/dsdt.asl @@ -142,10 +142,6 @@ * PCI IRQs ****************************************************************/
- Method(_PIC, 1, NotSerialized) { - \PICM = Arg0 - } - Scope(_SB) { Scope(PCI0) { #define prt_slot_lnk(nr, lnk0, lnk1, lnk2, lnk3) \ diff --git a/src/mainboard/intel/cedarisland_crb/acpi/platform.asl b/src/mainboard/intel/cedarisland_crb/acpi/platform.asl index 6ac38dd..3bebbff 100644 --- a/src/mainboard/intel/cedarisland_crb/acpi/platform.asl +++ b/src/mainboard/intel/cedarisland_crb/acpi/platform.asl @@ -19,11 +19,6 @@
Name(\APC1, Zero) // IIO IOAPIC
-Method(_PIC, 1) -{ - Store(Arg0, PICM) -} - /* * The _PTS method (Prepare To Sleep) is called before the OS is * entering a sleep state. The sleep state number is passed in Arg0 diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl index 0729442..87eea4c 100644 --- a/src/mainboard/lippert/frontrunner-af/dsdt.asl +++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl @@ -388,11 +388,6 @@ Return(OSVR) }
- Method(_PIC, 0x01, NotSerialized) - { - PICM = Arg0 - } - Name(IRQB, ResourceTemplate(){ IRQ(Level,ActiveLow,Shared){15} }) diff --git a/src/mainboard/ocp/deltalake/acpi/platform.asl b/src/mainboard/ocp/deltalake/acpi/platform.asl index 286cc6c..fa6a451 100644 --- a/src/mainboard/ocp/deltalake/acpi/platform.asl +++ b/src/mainboard/ocp/deltalake/acpi/platform.asl @@ -335,20 +335,6 @@ }
/* - * The _PIC method is called by the OS to choose between interrupt - * routing via the i8259 interrupt controller or the APIC. - * - * _PIC is called with a parameter of 0 for i8259 configuration and - * with a parameter of 1 for Local Apic/IOAPIC configuration. - */ - -Method (_PIC, 1) -{ - /* Remember the OS' IRQ routing choice. */ - PICM = Arg0 -} - -/* * The _PTS method (Prepare To Sleep) is called before the OS is * entering a sleep state. The sleep state number is passed in Arg0 */ diff --git a/src/mainboard/ocp/tiogapass/acpi/platform.asl b/src/mainboard/ocp/tiogapass/acpi/platform.asl index 02c32f9..9f51fdf 100644 --- a/src/mainboard/ocp/tiogapass/acpi/platform.asl +++ b/src/mainboard/ocp/tiogapass/acpi/platform.asl @@ -335,20 +335,6 @@ }
/* - * The _PIC method is called by the OS to choose between interrupt - * routing via the i8259 interrupt controller or the APIC. - * - * _PIC is called with a parameter of 0 for i8259 configuration and - * with a parameter of 1 for Local Apic/IOAPIC configuration. - */ - -Method (_PIC, 1) -{ - /* Remember the OS' IRQ routing choice. */ - PICM = Arg0 -} - -/* * The _PTS method (Prepare To Sleep) is called before the OS is * entering a sleep state. The sleep state number is passed in Arg0 */ diff --git a/src/soc/amd/picasso/acpi/pci_int.asl b/src/soc/amd/picasso/acpi/pci_int.asl index f95dcb0..06ba0cc 100644 --- a/src/soc/amd/picasso/acpi/pci_int.asl +++ b/src/soc/amd/picasso/acpi/pci_int.asl @@ -1,11 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
- Method(_PIC, 0x01, NotSerialized) - { - printf("PIC MODE: %o", Arg0) - PICM = Arg0 - } - /* PIC Possible Resource Values */ Name(IRQP, ResourceTemplate() { Interrupt(ResourceConsumer, Level, ActiveLow, Exclusive, , , PIC){ diff --git a/src/soc/amd/stoneyridge/acpi/pci_int.asl b/src/soc/amd/stoneyridge/acpi/pci_int.asl index 718fdb0..0f1feef 100644 --- a/src/soc/amd/stoneyridge/acpi/pci_int.asl +++ b/src/soc/amd/stoneyridge/acpi/pci_int.asl @@ -103,11 +103,6 @@ P3PR, 1, }
- Method(_PIC, 0x01, NotSerialized) - { - PICM = Arg0 - } - Name(IRQB, ResourceTemplate(){ IRQ(Level,ActiveLow,Shared){15} }) diff --git a/src/soc/intel/common/block/acpi/acpi/platform.asl b/src/soc/intel/common/block/acpi/acpi/platform.asl index 4b01aeb..8a26756 100644 --- a/src/soc/intel/common/block/acpi/acpi/platform.asl +++ b/src/soc/intel/common/block/acpi/acpi/platform.asl @@ -4,17 +4,3 @@ #include <soc/intel/common/acpi/acpi_wake_source.asl> /* Generic indicator for sleep state */ #include <soc/intel/common/acpi/platform.asl> - -/* - * The _PIC method is called by the OS to choose between interrupt - * routing via the i8259 interrupt controller or the APIC. - * - * _PIC is called with a parameter of 0 for i8259 configuration and - * with a parameter of 1 for Local Apic/IOAPIC configuration. - */ - -Method (_PIC, 1) -{ - /* Remember the OS' IRQ routing choice. */ - PICM = Arg0 -} diff --git a/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl b/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl index 199357c..37b2333 100644 --- a/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl +++ b/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl @@ -103,11 +103,6 @@ P3PR, 1, }
- Method(_PIC, 0x01, NotSerialized) - { - PICM = Arg0 - } - Name(IRQB, ResourceTemplate(){ IRQ(Level,ActiveLow,Shared){15} }) diff --git a/src/southbridge/amd/cimx/sb800/acpi/pcie.asl b/src/southbridge/amd/cimx/sb800/acpi/pcie.asl index c2f8406..65ac920 100644 --- a/src/southbridge/amd/cimx/sb800/acpi/pcie.asl +++ b/src/southbridge/amd/cimx/sb800/acpi/pcie.asl @@ -132,11 +132,6 @@ P3PR, 1, }
- Method(_PIC, 0x01, NotSerialized) - { - PICM = Arg0 - } - Name(IRQB, ResourceTemplate(){ IRQ(Level,ActiveLow,Shared){15} }) diff --git a/src/southbridge/amd/pi/hudson/acpi/pci_int.asl b/src/southbridge/amd/pi/hudson/acpi/pci_int.asl index 199357c..37b2333 100644 --- a/src/southbridge/amd/pi/hudson/acpi/pci_int.asl +++ b/src/southbridge/amd/pi/hudson/acpi/pci_int.asl @@ -103,11 +103,6 @@ P3PR, 1, }
- Method(_PIC, 0x01, NotSerialized) - { - PICM = Arg0 - } - Name(IRQB, ResourceTemplate(){ IRQ(Level,ActiveLow,Shared){15} }) diff --git a/src/southbridge/intel/common/acpi/platform.asl b/src/southbridge/intel/common/acpi/platform.asl index 342a4ef..5aec02c 100644 --- a/src/southbridge/intel/common/acpi/platform.asl +++ b/src/southbridge/intel/common/acpi/platform.asl @@ -27,19 +27,6 @@ } #endif /* ACPI_SOC_NVS */
-/* The _PIC method is called by the OS to choose between interrupt - * routing via the i8259 interrupt controller or the APIC. - * - * _PIC is called with a parameter of 0 for i8259 configuration and - * with a parameter of 1 for Local Apic/IOAPIC configuration. - */ - -Method(_PIC, 1) -{ - // Remember the OS' IRQ routing choice. - PICM = Arg0 -} - Method(GOS, 0) { /* Determine the Operating System and save the value in OSYS.