ACPI: Move common _PIC method

Change-Id: I659835354570fb1d4860fcbddf2a51831170a374
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50470
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Kyösti Mälkki 2021-01-25 17:05:35 +02:00
parent fa6a85c850
commit d591a5a328
13 changed files with 14 additions and 104 deletions

View File

@ -16,3 +16,17 @@ Name (PICM, Zero)
/* Power state (AC = 1) */ /* Power state (AC = 1) */
Name (PWRS, One) 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
}

View File

@ -3,20 +3,6 @@
/* Enable ACPI _SWS methods */ /* Enable ACPI _SWS methods */
#include <soc/intel/common/acpi/acpi_wake_source.asl> #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 * The _PTS method (Prepare To Sleep) is called before the OS is
* entering a sleep state. The sleep state number is passed in Arg0 * entering a sleep state. The sleep state number is passed in Arg0

View File

@ -142,10 +142,6 @@ DefinitionBlock (
* PCI IRQs * PCI IRQs
****************************************************************/ ****************************************************************/
Method(\_PIC, 1, NotSerialized) {
\PICM = Arg0
}
Scope(\_SB) { Scope(\_SB) {
Scope(PCI0) { Scope(PCI0) {
#define prt_slot_lnk(nr, lnk0, lnk1, lnk2, lnk3) \ #define prt_slot_lnk(nr, lnk0, lnk1, lnk2, lnk3) \

View File

@ -19,11 +19,6 @@ Field (POST, ByteAcc, Lock, Preserve)
Name(\APC1, Zero) // IIO IOAPIC Name(\APC1, Zero) // IIO IOAPIC
Method(_PIC, 1)
{
Store(Arg0, PICM)
}
/* /*
* The _PTS method (Prepare To Sleep) is called before the OS is * The _PTS method (Prepare To Sleep) is called before the OS is
* entering a sleep state. The sleep state number is passed in Arg0 * entering a sleep state. The sleep state number is passed in Arg0

View File

@ -334,20 +334,6 @@ Method (TRAP, 1, Serialized)
Return (SMIF) // Return value of SMI handler 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 * The _PTS method (Prepare To Sleep) is called before the OS is
* entering a sleep state. The sleep state number is passed in Arg0 * entering a sleep state. The sleep state number is passed in Arg0

View File

@ -334,20 +334,6 @@ Method (TRAP, 1, Serialized)
Return (SMIF) // Return value of SMI handler 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 * The _PTS method (Prepare To Sleep) is called before the OS is
* entering a sleep state. The sleep state number is passed in Arg0 * entering a sleep state. The sleep state number is passed in Arg0

View File

@ -1,11 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
Method(\_PIC, 0x01, NotSerialized)
{
printf("PIC MODE: %o", Arg0)
PICM = Arg0
}
/* PIC Possible Resource Values */ /* PIC Possible Resource Values */
Name(IRQP, ResourceTemplate() { Name(IRQP, ResourceTemplate() {
Interrupt(ResourceConsumer, Level, ActiveLow, Exclusive, , , PIC){ Interrupt(ResourceConsumer, Level, ActiveLow, Exclusive, , , PIC){

View File

@ -103,11 +103,6 @@
P3PR, 1, P3PR, 1,
} }
Method(\_PIC, 0x01, NotSerialized)
{
PICM = Arg0
}
Name(IRQB, ResourceTemplate(){ Name(IRQB, ResourceTemplate(){
IRQ(Level,ActiveLow,Shared){15} IRQ(Level,ActiveLow,Shared){15}
}) })

View File

@ -4,17 +4,3 @@
#include <soc/intel/common/acpi/acpi_wake_source.asl> #include <soc/intel/common/acpi/acpi_wake_source.asl>
/* Generic indicator for sleep state */ /* Generic indicator for sleep state */
#include <soc/intel/common/acpi/platform.asl> #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
}

View File

@ -103,11 +103,6 @@
P3PR, 1, P3PR, 1,
} }
Method(\_PIC, 0x01, NotSerialized)
{
PICM = Arg0
}
Name(IRQB, ResourceTemplate(){ Name(IRQB, ResourceTemplate(){
IRQ(Level,ActiveLow,Shared){15} IRQ(Level,ActiveLow,Shared){15}
}) })

View File

@ -132,11 +132,6 @@ Scope(\_SB) {
P3PR, 1, P3PR, 1,
} }
Method(\_PIC, 0x01, NotSerialized)
{
PICM = Arg0
}
Name(IRQB, ResourceTemplate(){ Name(IRQB, ResourceTemplate(){
IRQ(Level,ActiveLow,Shared){15} IRQ(Level,ActiveLow,Shared){15}
}) })

View File

@ -103,11 +103,6 @@
P3PR, 1, P3PR, 1,
} }
Method(\_PIC, 0x01, NotSerialized)
{
PICM = Arg0
}
Name(IRQB, ResourceTemplate(){ Name(IRQB, ResourceTemplate(){
IRQ(Level,ActiveLow,Shared){15} IRQ(Level,ActiveLow,Shared){15}
}) })

View File

@ -27,19 +27,6 @@ Method(TRAP, 1, Serialized)
} }
#endif /* ACPI_SOC_NVS */ #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) Method(GOS, 0)
{ {
/* Determine the Operating System and save the value in OSYS. /* Determine the Operating System and save the value in OSYS.