Vlv2DeviceRefCodePkg&Vlv2TbltDevicePkg:Add setup option of LPE Audio.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>

diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
index 8702110d0297f4685bb2c58a0a5da7803a8fd369..9f949e176450dea58c9c5de53cbec6e489e7d8eb 100644 (file)
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
@@ -5,7 +5,7 @@
 ;*    Family of Customer Reference Boards.                                *;\r
 ;*                                                                        *;\r
 ;*                                                                        *;\r
-;*    Copyright (c)  1999  - 2015, Intel Corporation. All rights reserved   *;\r
+;*    Copyright (c)  1999  - 2016, Intel Corporation. All rights reserved   *;\r
 ;\r
 ; This program and the accompanying materials are licensed and made available under\r
 ; the terms and conditions of the BSD License that accompanies this distribution.\r
@@ -349,5 +349,6 @@ Field(GNVS,AnyAcc,Lock,Preserve)
   DIDX,     32,     //(793) Device ID for eDP device\r
   IOT,      8,      //(794) MinnowBoard Max JP1 is configured for MSFT IOT project.\r
   BATT,     8,      //(795) The Flag of RTC Battery Prensent.\r
+  LPAD,     8,      //(796)\r
 }\r
 \r

diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
index 506b1710a28afb92d6288a10dde73e72f8cd3f4d..8a5a6a38d42fb1e567734ca946a29380bd9e5f2e 100644 (file)
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
@@ -5,7 +5,7 @@
 ;*    Family of Customer Reference Boards.                                *;\r
 ;*                                                                        *;\r
 ;*                                                                        *;\r
-;*    Copyright (c) 2012  - 2014, Intel Corporation. All rights reserved    *;\r
+;*    Copyright (c) 2012  - 2016, Intel Corporation. All rights reserved    *;\r
 ;\r
 ; This program and the accompanying materials are licensed and made available under\r
 ; the terms and conditions of the BSD License that accompanies this distribution.\r
@@ -139,7 +139,10 @@ scope (\_SB)
     {\r
       If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 0)))\r
       {\r
-        Return (0xF)\r
+        If(LEqual(LPAD, 1))\r
+        {\r
+          Return (0xF)\r
+        }\r
       }\r
       Return (0x0)\r
     }\r
@@ -218,7 +221,10 @@ scope (\_SB)
     {\r
       If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 1)))\r
       {\r
-        Return (0xF)\r
+        If(LEqual(LPAD, 1))\r
+        {\r
+          Return (0xF)\r
+        }\r
       }\r
       Return (0x0)\r
     }\r

diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
index 3e61e7925b60cb9fe41bee5645a690c97afce138..a636440002c6778d0c9bd7894ca91f9db1dcffb1 100644 (file)
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
@@ -5,7 +5,7 @@
 ;*    Family of Customer Reference Boards.                                *;\r
 ;*                                                                        *;\r
 ;*                                                                        *;\r
-;*    Copyright (c) 2012  - 2014, Intel Corporation. All rights reserved    *;\r
+;*    Copyright (c) 2012  - 2016, Intel Corporation. All rights reserved    *;\r
 ;\r
 ; This program and the accompanying materials are licensed and made available under\r
 ; the terms and conditions of the BSD License that accompanies this distribution.\r
@@ -605,7 +605,10 @@ Device(I2C2)
     {\r
 \r
       If (LEqual(LPEE, 2)) { // LPE enable/disable\r
-        Return(0xF)\r
+        If (LEqual(LPAD, 1))\r
+        {\r
+          Return(0xF)\r
+        }\r
       }\r
       Return(0)\r
     }\r

diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index 0f536de7f7e0c66b6c522a414d1540e47540eeaf..db1b5a5eeb554e57789fecdf05bf2a050bd20913 100644 (file)
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
 \r
   This program and the accompanying materials are licensed and made available under\r
@@ -1051,6 +1051,7 @@ AcpiPlatformEntryPoint (
   mGlobalNvsArea.Area->BatteryChargingSolution          = GLOBAL_NVS_DEVICE_DISABLE;\r
   mGlobalNvsArea.Area->ISPDevSel                        = mSystemConfiguration.ISPDevSel;\r
   mGlobalNvsArea.Area->LpeEnable                        = mSystemConfiguration.Lpe;\r
+  mGlobalNvsArea.Area->LpeAudioReportedByDSDT           = mSystemConfiguration.LpeAudioReportedByDSDT;\r
 \r
   if (mSystemConfiguration.ISPEn == 0) {\r
     mGlobalNvsArea.Area->ISPDevSel                      = GLOBAL_NVS_DEVICE_DISABLE;\r

diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
index e2a88758f2431a8e398eb39b1eaa574d06a412c9..d9ac9f79e1a3e2582876b049db79ee20a025679e 100644 (file)
--- a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
 \r
   This program and the accompanying materials are licensed and made available under\r
@@ -1309,6 +1309,7 @@ typedef struct {
   UINT8   SdCardRemovable; // ACPI reporting MMC/SD media as: removable/non-removable\r
   UINT8   GpioWakeCapability;\r
   UINT8   RtcBattery;\r
+  UINT8   LpeAudioReportedByDSDT;\r
 \r
 } SYSTEM_CONFIGURATION;\r
 #pragma pack()\r

diff --git a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
index b7fb02211825ac42350c979c29a4d43c8d5da467..8f9948c2f803fc66cc67841698d3f5887b3a595d 100644 (file)
--- a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
 \r
   This program and the accompanying materials are licensed and made available under\r
@@ -472,6 +472,7 @@ typedef struct {
   UINT32      DIDX;                              // 793 Device ID for eDP device\r
   UINT8       MicrosoftIoT;                      // (794)JP1 pins are for Microsoft IoT project.\r
   UINT8       RtcBattery;                        // (795) The Flag of RTC Battery Present.\r
+  UINT8       LpeAudioReportedByDSDT;            // (796)\r
 } EFI_GLOBAL_NVS_AREA;\r
 #pragma pack ()\r
 \r

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
index a6a99be2b2ea4014d6bc03297452ce6ca399fd54..ce93500f6fa504fd0ba6295d5a838010b2d5a9e6 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
@@ -1,6 +1,6 @@
 // /** @file\r
 //\r
-// Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>\r
 //\r
 \r
 // This program and the accompanying materials are licensed and made available under\r
@@ -790,6 +790,15 @@ form formid = AZALIA_OPTIONS_FORM_ID,
       option text = STRING_TOKEN(STR_LPE_ACPI_MODE), value=2, flags=0 | RESET_REQUIRED;\r
   endoneof;\r
 \r
+  grayoutif NOT ideqval Setup.Lpe == 0x2;\r
+  oneof varid   = Setup.LpeAudioReportedByDSDT,\r
+      prompt      = STRING_TOKEN(STR_LPE_REPORTED_BY_DSDT_PROMPT),\r
+      help        = STRING_TOKEN(STR_LPE_REPORTED_BY_DSDT_HELP),\r
+      option text = STRING_TOKEN(STR_DISABLE), value=0, flags=DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
+      option text = STRING_TOKEN(STR_ENABLE), value=1, flags=RESET_REQUIRED;\r
+  endoneof;\r
+  endif;\r
+\r
   subtitle text = STRING_TOKEN(STR_NULL_STRING);\r
   suppressif ideqval Setup.AzaliaDs == 0x1;\r
     oneof varid  = Setup.PchAzalia,\r

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
index fb521e331a800d0d4306f6fdb0adb1be924cd862..4604df4d77c1d0fa865f151a1d673e5bd263d241 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
@@ -1,6 +1,6 @@
 // /** @file\r
 //\r
-// Copyright (c) 2013 - 2015 Intel Corporation. All rights reserved\r
+// Copyright (c) 2013 - 2016 Intel Corporation. All rights reserved\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
@@ -453,4 +453,6 @@
 #string STR_RTC_BATTERY_NOT_PRESENT                     #language uqi  "\x0182"\r
 #string STR_RTC_BATTERY_PRESENT                         #language uqi  "\x0183"\r
 #string STR_RTC_BATTERY_HELP                            #language uqi  "\x0184"\r
+#string STR_LPE_REPORTED_BY_DSDT_PROMPT                 #language uqi  "\x0185"\r
+#string STR_LPE_REPORTED_BY_DSDT_HELP                   #language uqi  "\x0186"\r
 \r

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
index da01ecbcec07fc3060e80b1f42305ce50a4252de..284d5befae2a7beffab9cb21b688ffeb75764f94 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
@@ -1,5 +1,5 @@
 // /** @file\r
-// Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
@@ -726,6 +726,9 @@
 #string STR_RTC_BATTERY_NOT_PRESENT                    #language en-US "Not Present"\r
 #string STR_RTC_BATTERY_HELP                           #language en-US "RTC Battery is Present or Not Present"\r
 \r
+#string STR_LPE_REPORTED_BY_DSDT_PROMPT                #language en-US  "LPE Audio Reported By DSDT"\r
+#string STR_LPE_REPORTED_BY_DSDT_HELP                  #language en-US  "Recommended solution is to keep option disabled and expose LPE Audio device with an EFI application that updates the SSDT"\r
+\r
 //\r
 // PCI Express\r
 //\r