Revision: 19704
http://sourceforge.net/p/edk2/code/19704
Author: timhe
Date: 2016-01-21 07:11:59 +0000 (Thu, 21 Jan 2016)
Log Message:
-----------
Vlv2TbltDevicePkg/Vlv2DeviceRefCodePkg:
Add setup option to control _STA of LPE Audio.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Shifei Lu <[email protected]>
Reviewed-by: David Wei <[email protected]>
Modified Paths:
--------------
branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
branches/UDK2014.SP1/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin
Modified: branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
===================================================================
--- branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
2016-01-21 02:15:02 UTC (rev 19703)
+++ branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
2016-01-21 07:11:59 UTC (rev 19704)
@@ -5,7 +5,7 @@
;* Family of Customer Reference Boards. *;
;* *;
;* *;
-;* Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved *;
+;* Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved *;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
@@ -349,5 +349,6 @@
DIDX, 32, //(793) Device ID for eDP device
IOT, 8, //(794) MinnowBoard Max JP1 is configured for MSFT IOT
project.
BATT, 8, //(795) The Flag of RTC Battery Prensent.
+ LPAD, 8, //(796)
}
Modified: branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
===================================================================
--- branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
2016-01-21 02:15:02 UTC (rev 19703)
+++ branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
2016-01-21 07:11:59 UTC (rev 19704)
@@ -5,7 +5,7 @@
;* Family of Customer Reference Boards. *;
;* *;
;* *;
-;* Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved *;
+;* Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved *;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
@@ -139,7 +139,10 @@
{
If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 0)))
{
- Return (0xF)
+ If(LEqual(LPAD, 1))
+ {
+ Return (0xF)
+ }
}
Return (0x0)
}
@@ -218,7 +221,10 @@
{
If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 1)))
{
- Return (0xF)
+ If(LEqual(LPAD, 1))
+ {
+ Return (0xF)
+ }
}
Return (0x0)
}
Modified: branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
===================================================================
--- branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
2016-01-21 02:15:02 UTC (rev 19703)
+++ branches/UDK2014.SP1/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
2016-01-21 07:11:59 UTC (rev 19704)
@@ -5,7 +5,7 @@
;* Family of Customer Reference Boards. *;
;* *;
;* *;
-;* Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved *;
+;* Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved *;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
@@ -605,7 +605,10 @@
{
If (LEqual(LPEE, 2)) { // LPE enable/disable
- Return(0xF)
+ If (LEqual(LPAD, 1))
+ {
+ Return(0xF)
+ }
}
Return(0)
}
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
2016-01-21 02:15:02 UTC (rev 19703)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
2016-01-21 07:11:59 UTC (rev 19704)
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under
@@ -1056,6 +1056,7 @@
mGlobalNvsArea.Area->BatteryChargingSolution =
GLOBAL_NVS_DEVICE_DISABLE;
mGlobalNvsArea.Area->ISPDevSel =
mSystemConfiguration.ISPDevSel;
mGlobalNvsArea.Area->LpeEnable =
mSystemConfiguration.Lpe;
+ mGlobalNvsArea.Area->LpeAudioReportedByDSDT =
mSystemConfiguration.LpeAudioReportedByDSDT;
if (mSystemConfiguration.ISPEn == 0) {
mGlobalNvsArea.Area->ISPDevSel =
GLOBAL_NVS_DEVICE_DISABLE;
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
2016-01-21 02:15:02 UTC (rev 19703)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
2016-01-21 07:11:59 UTC (rev 19704)
@@ -1,6 +1,6 @@
/*++
- Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under
@@ -1309,6 +1309,7 @@
UINT8 SdCardRemovable; // ACPI reporting MMC/SD media as:
removable/non-removable
UINT8 GpioWakeCapability;
UINT8 RtcBattery;
+ UINT8 LpeAudioReportedByDSDT;
} SYSTEM_CONFIGURATION;
#pragma pack()
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
2016-01-21 02:15:02 UTC (rev 19703)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
2016-01-21 07:11:59 UTC (rev 19704)
@@ -1,6 +1,6 @@
/*++
- Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under
@@ -472,6 +472,7 @@
UINT32 DIDX; // 793 Device ID for eDP
device
UINT8 MicrosoftIoT; // (794)JP1 pins are for
Microsoft IoT project.
UINT8 RtcBattery; // (795) The Flag of RTC
Battery Present.
+ UINT8 LpeAudioReportedByDSDT; // (796)
} EFI_GLOBAL_NVS_AREA;
#pragma pack ()
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
2016-01-21 02:15:02 UTC (rev 19703)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
2016-01-21 07:11:59 UTC (rev 19704)
@@ -1,6 +1,6 @@
//
//
-// Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are licensed and made available
under
@@ -790,6 +790,15 @@
option text = STRING_TOKEN(STR_LPE_ACPI_MODE), value=2, flags=0 |
RESET_REQUIRED;
endoneof;
+ grayoutif NOT ideqval Setup.Lpe == 0x2;
+ oneof varid = Setup.LpeAudioReportedByDSDT,
+ prompt = STRING_TOKEN(STR_LPE_REPORTED_BY_DSDT_PROMPT),
+ help = STRING_TOKEN(STR_LPE_REPORTED_BY_DSDT_HELP),
+ option text = STRING_TOKEN(STR_DISABLE), value=0, flags=DEFAULT |
MANUFACTURING | RESET_REQUIRED;
+ option text = STRING_TOKEN(STR_ENABLE), value=1, flags=RESET_REQUIRED;
+ endoneof;
+ endif;
+
subtitle text = STRING_TOKEN(STR_NULL_STRING);
suppressif ideqval Setup.AzaliaDs == 0x1;
oneof varid = Setup.PchAzalia,
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
===================================================================
(Binary files differ)
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
===================================================================
(Binary files differ)
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin
===================================================================
(Binary files differ)
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits