[coreboot-gerrit] New patch to review for coreboot: cpu/intel: Move Power notification ASL code into `common/acpi`
Paul Menzel (paulepanter@users.sourceforge.net)
gerrit at coreboot.org
Tue Oct 13 21:42:31 CEST 2015
Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11880
-gerrit
commit 737afca9967b1e0706f9b6b85432702f069fa637
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date: Tue Oct 13 21:07:32 2015 +0200
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 <paulepanter at users.sourceforge.net>
---
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(-)
diff --git a/src/cpu/intel/common/acpi/cpu.asl b/src/cpu/intel/common/acpi/cpu.asl
new file mode 100644
index 0000000..04438a2
--- /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 04438a2..0000000
--- 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 078f1d1..fdd4e36 100644
--- a/src/mainboard/apple/macbook21/dsdt.asl
+++ b/src/mainboard/apple/macbook21/dsdt.asl
@@ -38,7 +38,7 @@ DefinitionBlock(
#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
#include <southbridge/intel/i82801gx/acpi/platform.asl>
- #include <cpu/intel/model_6dx/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/getac/p470/dsdt.asl b/src/mainboard/getac/p470/dsdt.asl
index 27c4fe3..fa7a113 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 <cpu/intel/model_6dx/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/ibase/mb899/dsdt.asl b/src/mainboard/ibase/mb899/dsdt.asl
index 9b78f33..ef42039 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 <cpu/intel/model_6dx/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/intel/d945gclf/dsdt.asl b/src/mainboard/intel/d945gclf/dsdt.asl
index 8aa8881..8cd9c14 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 <cpu/intel/model_6dx/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/kontron/986lcd-m/dsdt.asl b/src/mainboard/kontron/986lcd-m/dsdt.asl
index 0740034..595c04e 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 <cpu/intel/model_6dx/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/lenovo/t60/dsdt.asl b/src/mainboard/lenovo/t60/dsdt.asl
index b746b69..bbdb842 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 <cpu/intel/model_6dx/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/lenovo/x60/dsdt.asl b/src/mainboard/lenovo/x60/dsdt.asl
index 40e5d05..c31bd6d 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 <cpu/intel/model_6dx/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)
diff --git a/src/mainboard/roda/rk886ex/dsdt.asl b/src/mainboard/roda/rk886ex/dsdt.asl
index 168cf6d..477425f 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 <cpu/intel/model_6dx/acpi/cpu.asl>
+ #include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)
More information about the coreboot-gerrit
mailing list