From d591a5a328b7185f7e6e4ff755f74594e7232dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 25 Jan 2021 17:05:35 +0200 Subject: ACPI: Move common _PIC method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I659835354570fb1d4860fcbddf2a51831170a374 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/50470 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Angel Pons Reviewed-by: Felix Held --- src/acpi/dsdt_top.asl | 14 ++++++++++++++ src/mainboard/51nb/x210/acpi/platform.asl | 14 -------------- src/mainboard/emulation/qemu-q35/dsdt.asl | 4 ---- src/mainboard/intel/cedarisland_crb/acpi/platform.asl | 5 ----- src/mainboard/ocp/deltalake/acpi/platform.asl | 14 -------------- src/mainboard/ocp/tiogapass/acpi/platform.asl | 14 -------------- src/soc/amd/picasso/acpi/pci_int.asl | 6 ------ src/soc/amd/stoneyridge/acpi/pci_int.asl | 5 ----- src/soc/intel/common/block/acpi/acpi/platform.asl | 14 -------------- src/southbridge/amd/agesa/hudson/acpi/pci_int.asl | 5 ----- src/southbridge/amd/cimx/sb800/acpi/pcie.asl | 5 ----- src/southbridge/amd/pi/hudson/acpi/pci_int.asl | 5 ----- src/southbridge/intel/common/acpi/platform.asl | 13 ------------- 13 files changed, 14 insertions(+), 104 deletions(-) diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl index 4300f0a65e..3e6bb1c530 100644 --- a/src/acpi/dsdt_top.asl +++ b/src/acpi/dsdt_top.asl @@ -16,3 +16,17 @@ Name (PICM, Zero) /* 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 6cf3f32f23..dbf6241a7d 100644 --- a/src/mainboard/51nb/x210/acpi/platform.asl +++ b/src/mainboard/51nb/x210/acpi/platform.asl @@ -3,20 +3,6 @@ /* Enable ACPI _SWS methods */ #include -/* - * 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 25cc549eba..d65f2de0ec 100644 --- a/src/mainboard/emulation/qemu-q35/dsdt.asl +++ b/src/mainboard/emulation/qemu-q35/dsdt.asl @@ -142,10 +142,6 @@ DefinitionBlock ( * 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 6ac38dd937..3bebbff940 100644 --- a/src/mainboard/intel/cedarisland_crb/acpi/platform.asl +++ b/src/mainboard/intel/cedarisland_crb/acpi/platform.asl @@ -19,11 +19,6 @@ Field (POST, ByteAcc, Lock, Preserve) 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/ocp/deltalake/acpi/platform.asl b/src/mainboard/ocp/deltalake/acpi/platform.asl index 286cc6cb99..fa6a4510bb 100644 --- a/src/mainboard/ocp/deltalake/acpi/platform.asl +++ b/src/mainboard/ocp/deltalake/acpi/platform.asl @@ -334,20 +334,6 @@ Method (TRAP, 1, Serialized) Return (SMIF) // Return value of SMI handler } -/* - * 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 02c32f93b7..9f51fdf12f 100644 --- a/src/mainboard/ocp/tiogapass/acpi/platform.asl +++ b/src/mainboard/ocp/tiogapass/acpi/platform.asl @@ -334,20 +334,6 @@ Method (TRAP, 1, Serialized) Return (SMIF) // Return value of SMI handler } -/* - * 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 f95dcb0659..06ba0ccbf7 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 d558e651f5..0f1feef05a 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 4b01aeb464..8a26756911 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 /* Generic indicator for sleep state */ #include - -/* - * 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 35f403cd81..37b2333b29 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 d143554c7b..65ac920efa 100644 --- a/src/southbridge/amd/cimx/sb800/acpi/pcie.asl +++ b/src/southbridge/amd/cimx/sb800/acpi/pcie.asl @@ -132,11 +132,6 @@ Scope(\_SB) { 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 35f403cd81..37b2333b29 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 b5da2b4af4..ec7d680ded 100644 --- a/src/southbridge/intel/common/acpi/platform.asl +++ b/src/southbridge/intel/common/acpi/platform.asl @@ -27,19 +27,6 @@ Method(TRAP, 1, Serialized) } #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. -- cgit v1.2.3