From 469f593498cabf0bf205833bab4218e409929cf8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 13 Oct 2015 21:07:32 +0200 Subject: cpu/intel: Move Power notification ASL code into `common/acpi` Commit 24813c14 (i945: Consolidate acpi/platform.asl) creates the file in the directory `src/cpu/intel/model_6dx/acpi`, although the devices can also use different Intel CPU models like, for example, `intel/model_6ex` on the Lenovo T60. Therefore move the file to the directory `src/cpu/intel/common/acpi` so that other devices, like Intel GM45 based devices, can also include it. Change-Id: I90126b66a4d70468923622a8e3aebadeafcbf96f Signed-off-by: Paul Menzel Reviewed-on: http://review.coreboot.org/11880 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/cpu/intel/common/acpi/cpu.asl | 37 +++++++++++++++++++++++++++++++++ src/cpu/intel/model_6dx/acpi/cpu.asl | 37 --------------------------------- src/mainboard/apple/macbook21/dsdt.asl | 2 +- src/mainboard/getac/p470/dsdt.asl | 2 +- src/mainboard/ibase/mb899/dsdt.asl | 2 +- src/mainboard/intel/d945gclf/dsdt.asl | 2 +- src/mainboard/kontron/986lcd-m/dsdt.asl | 2 +- src/mainboard/lenovo/t60/dsdt.asl | 2 +- src/mainboard/lenovo/x60/dsdt.asl | 2 +- src/mainboard/roda/rk886ex/dsdt.asl | 2 +- 10 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 src/cpu/intel/common/acpi/cpu.asl delete mode 100644 src/cpu/intel/model_6dx/acpi/cpu.asl diff --git a/src/cpu/intel/common/acpi/cpu.asl b/src/cpu/intel/common/acpi/cpu.asl new file mode 100644 index 000000000000..04438a227aa0 --- /dev/null +++ b/src/cpu/intel/common/acpi/cpu.asl @@ -0,0 +1,37 @@ +/* These come from the dynamically created CPU SSDT */ +External(PDC0) +External(PDC1) + +// Power notification + +External (\_PR_.CP00, DeviceObj) +External (\_PR_.CP01, DeviceObj) +External (\_PR_.CP00._PPC) +External (\_PR_.CP01._PPC) + +Method (PNOT) +{ + If (MPEN) { + If(And(PDC0, 0x08)) { + Notify (\_PR_.CP00, 0x80) // _PPC + + If (And(PDC0, 0x10)) { + Sleep(100) + Notify(\_PR_.CP00, 0x81) // _CST + } + } + + If(And(PDC1, 0x08)) { + Notify (\_PR_.CP01, 0x80) // _PPC + If (And(PDC1, 0x10)) { + Sleep(100) + Notify(\_PR_.CP01, 0x81) // _CST + } + } + + } Else { // UP + Notify (\_PR_.CP00, 0x80) + Sleep(0x64) + Notify(\_PR_.CP00, 0x81) + } +} diff --git a/src/cpu/intel/model_6dx/acpi/cpu.asl b/src/cpu/intel/model_6dx/acpi/cpu.asl deleted file mode 100644 index 04438a227aa0..000000000000 --- a/src/cpu/intel/model_6dx/acpi/cpu.asl +++ /dev/null @@ -1,37 +0,0 @@ -/* These come from the dynamically created CPU SSDT */ -External(PDC0) -External(PDC1) - -// Power notification - -External (\_PR_.CP00, DeviceObj) -External (\_PR_.CP01, DeviceObj) -External (\_PR_.CP00._PPC) -External (\_PR_.CP01._PPC) - -Method (PNOT) -{ - If (MPEN) { - If(And(PDC0, 0x08)) { - Notify (\_PR_.CP00, 0x80) // _PPC - - If (And(PDC0, 0x10)) { - Sleep(100) - Notify(\_PR_.CP00, 0x81) // _CST - } - } - - If(And(PDC1, 0x08)) { - Notify (\_PR_.CP01, 0x80) // _PPC - If (And(PDC1, 0x10)) { - Sleep(100) - Notify(\_PR_.CP01, 0x81) // _CST - } - } - - } Else { // UP - Notify (\_PR_.CP00, 0x80) - Sleep(0x64) - Notify(\_PR_.CP00, 0x81) - } -} diff --git a/src/mainboard/apple/macbook21/dsdt.asl b/src/mainboard/apple/macbook21/dsdt.asl index 078f1d13ab7b..fdd4e3601e4a 100644 --- a/src/mainboard/apple/macbook21/dsdt.asl +++ b/src/mainboard/apple/macbook21/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( #include #include - #include + #include Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/getac/p470/dsdt.asl b/src/mainboard/getac/p470/dsdt.asl index 27c4fe39890b..fa7a113dbf76 100644 --- a/src/mainboard/getac/p470/dsdt.asl +++ b/src/mainboard/getac/p470/dsdt.asl @@ -47,7 +47,7 @@ DefinitionBlock( // Thermal Zone #include "acpi/thermal.asl" - #include + #include Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/ibase/mb899/dsdt.asl b/src/mainboard/ibase/mb899/dsdt.asl index 9b78f338c163..ef42039f4033 100644 --- a/src/mainboard/ibase/mb899/dsdt.asl +++ b/src/mainboard/ibase/mb899/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( //#include "acpi/thermal.asl" - #include + #include Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/d945gclf/dsdt.asl b/src/mainboard/intel/d945gclf/dsdt.asl index 8aa8881b8601..8cd9c14f1610 100644 --- a/src/mainboard/intel/d945gclf/dsdt.asl +++ b/src/mainboard/intel/d945gclf/dsdt.asl @@ -42,7 +42,7 @@ DefinitionBlock( // Thermal Zone //#include "acpi/thermal.asl" - #include + #include Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/kontron/986lcd-m/dsdt.asl b/src/mainboard/kontron/986lcd-m/dsdt.asl index 0740034b7e02..595c04e80466 100644 --- a/src/mainboard/kontron/986lcd-m/dsdt.asl +++ b/src/mainboard/kontron/986lcd-m/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( //#include "acpi/thermal.asl" - #include + #include Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/t60/dsdt.asl b/src/mainboard/lenovo/t60/dsdt.asl index b746b69f989e..bbdb842e95d4 100644 --- a/src/mainboard/lenovo/t60/dsdt.asl +++ b/src/mainboard/lenovo/t60/dsdt.asl @@ -51,7 +51,7 @@ DefinitionBlock( #include "acpi/video.asl" } - #include + #include Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/x60/dsdt.asl b/src/mainboard/lenovo/x60/dsdt.asl index 40e5d0550294..c31bd6d71bb8 100644 --- a/src/mainboard/lenovo/x60/dsdt.asl +++ b/src/mainboard/lenovo/x60/dsdt.asl @@ -47,7 +47,7 @@ DefinitionBlock( // mainboard specific devices #include "acpi/mainboard.asl" - #include + #include Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/roda/rk886ex/dsdt.asl b/src/mainboard/roda/rk886ex/dsdt.asl index 168cf6d590a7..477425ff1f35 100644 --- a/src/mainboard/roda/rk886ex/dsdt.asl +++ b/src/mainboard/roda/rk886ex/dsdt.asl @@ -43,7 +43,7 @@ DefinitionBlock( // Thermal Zone #include "acpi/thermal.asl" - #include + #include Scope (\_SB) { Device (PCI0) -- cgit v1.2.3