From 6a09eee4ade53d31e966ee9ca4c531e4dc9aea73 Mon Sep 17 00:00:00 2001
From: Lijian Zhao <lijian.zhao@intel.com>
Date: Thu, 19 Oct 2017 11:55:29 -0700
Subject: [PATCH] soc/intel/cannonlake: Add platform.asl

Include common platform.asl to have generic indication of power
transition state of system.

TEST=Enter and resume from S3, check the post code had been changed to
0096 and 0097.

Change-Id: Ic38ac6d7e60441caeba5c088c9dbe4d901355782
Signed-off-by: Lijian Zhao <lijian.zhao@intel.com>
Reviewed-on: https://review.coreboot.org/22111
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Pratikkumar V Prajapati <pratikkumar.v.prajapati@intel.com>
---
 src/mainboard/intel/cannonlake_rvp/dsdt.asl |  3 +++
 src/soc/intel/cannonlake/acpi/platform.asl  | 26 ++-------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/mainboard/intel/cannonlake_rvp/dsdt.asl b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
index 46d41e1656..5c4b31c2e9 100644
--- a/src/mainboard/intel/cannonlake_rvp/dsdt.asl
+++ b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
@@ -24,6 +24,9 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
+	// Some generic macros
+	#include <soc/intel/cannonlake/acpi/platform.asl>
+
 	// global NVS and variables
 	#include <soc/intel/cannonlake/acpi/globalnvs.asl>
 
diff --git a/src/soc/intel/cannonlake/acpi/platform.asl b/src/soc/intel/cannonlake/acpi/platform.asl
index 17a19d91fe..773cdcb14b 100644
--- a/src/soc/intel/cannonlake/acpi/platform.asl
+++ b/src/soc/intel/cannonlake/acpi/platform.asl
@@ -17,6 +17,8 @@
 
 /* Enable ACPI _SWS methods */
 #include <soc/intel/common/acpi/acpi_wake_source.asl>
+/* Generic indicator for sleep state */
+#include <soc/intel/common/acpi/platform.asl>
 
 /* The APM port can be used for generating software SMIs */
 
@@ -27,14 +29,6 @@ Field (APMP, ByteAcc, NoLock, Preserve)
 	APMS, 8		// APM status
 }
 
-/* Port 80 POST */
-
-OperationRegion (POST, SystemIO, 0x80, 1)
-Field (POST, ByteAcc, Lock, Preserve)
-{
-	DBG0, 8
-}
-
 /*
  * The _PIC method is called by the OS to choose between interrupt
  * routing via the i8259 interrupt controller or the APIC.
@@ -48,19 +42,3 @@ 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
- */
-
-Method (_PTS, 1)
-{
-}
-
-/* The _WAK method is called on system wakeup */
-
-Method (_WAK, 1)
-{
-	Return (Package (){ 0, 0 })
-}