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>
This commit is contained in:
lushifex 2016-06-08 14:24:16 +08:00 committed by david wei
parent a0f3b02894
commit aa44e98dc2
9 changed files with 39 additions and 12 deletions

View File

@ -5,7 +5,7 @@
;* Family of Customer Reference Boards. *; ;* 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 ; This program and the accompanying materials are licensed and made available under
; the terms and conditions of the BSD License that accompanies this distribution. ; the terms and conditions of the BSD License that accompanies this distribution.
@ -349,5 +349,6 @@ Field(GNVS,AnyAcc,Lock,Preserve)
DIDX, 32, //(793) Device ID for eDP device DIDX, 32, //(793) Device ID for eDP device
IOT, 8, //(794) MinnowBoard Max JP1 is configured for MSFT IOT project. IOT, 8, //(794) MinnowBoard Max JP1 is configured for MSFT IOT project.
BATT, 8, //(795) The Flag of RTC Battery Prensent. BATT, 8, //(795) The Flag of RTC Battery Prensent.
LPAD, 8, //(796)
} }

View File

@ -5,7 +5,7 @@
;* Family of Customer Reference Boards. *; ;* 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 ; This program and the accompanying materials are licensed and made available under
; the terms and conditions of the BSD License that accompanies this distribution. ; the terms and conditions of the BSD License that accompanies this distribution.
@ -138,9 +138,12 @@ scope (\_SB)
Method (_STA, 0x0, NotSerialized) Method (_STA, 0x0, NotSerialized)
{ {
If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 0))) If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 0)))
{
If(LEqual(LPAD, 1))
{ {
Return (0xF) Return (0xF)
} }
}
Return (0x0) Return (0x0)
} }
@ -217,9 +220,12 @@ scope (\_SB)
Method (_STA, 0x0, NotSerialized) Method (_STA, 0x0, NotSerialized)
{ {
If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 1))) If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 1)))
{
If(LEqual(LPAD, 1))
{ {
Return (0xF) Return (0xF)
} }
}
Return (0x0) Return (0x0)
} }

View File

@ -5,7 +5,7 @@
;* Family of Customer Reference Boards. *; ;* 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 ; This program and the accompanying materials are licensed and made available under
; the terms and conditions of the BSD License that accompanies this distribution. ; the terms and conditions of the BSD License that accompanies this distribution.
@ -605,8 +605,11 @@ Device(I2C2)
{ {
If (LEqual(LPEE, 2)) { // LPE enable/disable If (LEqual(LPEE, 2)) { // LPE enable/disable
If (LEqual(LPAD, 1))
{
Return(0xF) Return(0xF)
} }
}
Return(0) Return(0)
} }

View File

@ -1,6 +1,6 @@
/** @file /** @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 This program and the accompanying materials are licensed and made available under
@ -1051,6 +1051,7 @@ AcpiPlatformEntryPoint (
mGlobalNvsArea.Area->BatteryChargingSolution = GLOBAL_NVS_DEVICE_DISABLE; mGlobalNvsArea.Area->BatteryChargingSolution = GLOBAL_NVS_DEVICE_DISABLE;
mGlobalNvsArea.Area->ISPDevSel = mSystemConfiguration.ISPDevSel; mGlobalNvsArea.Area->ISPDevSel = mSystemConfiguration.ISPDevSel;
mGlobalNvsArea.Area->LpeEnable = mSystemConfiguration.Lpe; mGlobalNvsArea.Area->LpeEnable = mSystemConfiguration.Lpe;
mGlobalNvsArea.Area->LpeAudioReportedByDSDT = mSystemConfiguration.LpeAudioReportedByDSDT;
if (mSystemConfiguration.ISPEn == 0) { if (mSystemConfiguration.ISPEn == 0) {
mGlobalNvsArea.Area->ISPDevSel = GLOBAL_NVS_DEVICE_DISABLE; mGlobalNvsArea.Area->ISPDevSel = GLOBAL_NVS_DEVICE_DISABLE;

View File

@ -1,6 +1,6 @@
/** @file /** @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 This program and the accompanying materials are licensed and made available under
@ -1309,6 +1309,7 @@ typedef struct {
UINT8 SdCardRemovable; // ACPI reporting MMC/SD media as: removable/non-removable UINT8 SdCardRemovable; // ACPI reporting MMC/SD media as: removable/non-removable
UINT8 GpioWakeCapability; UINT8 GpioWakeCapability;
UINT8 RtcBattery; UINT8 RtcBattery;
UINT8 LpeAudioReportedByDSDT;
} SYSTEM_CONFIGURATION; } SYSTEM_CONFIGURATION;
#pragma pack() #pragma pack()

View File

@ -1,6 +1,6 @@
/** @file /** @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 This program and the accompanying materials are licensed and made available under
@ -472,6 +472,7 @@ typedef struct {
UINT32 DIDX; // 793 Device ID for eDP device UINT32 DIDX; // 793 Device ID for eDP device
UINT8 MicrosoftIoT; // (794)JP1 pins are for Microsoft IoT project. UINT8 MicrosoftIoT; // (794)JP1 pins are for Microsoft IoT project.
UINT8 RtcBattery; // (795) The Flag of RTC Battery Present. UINT8 RtcBattery; // (795) The Flag of RTC Battery Present.
UINT8 LpeAudioReportedByDSDT; // (796)
} EFI_GLOBAL_NVS_AREA; } EFI_GLOBAL_NVS_AREA;
#pragma pack () #pragma pack ()

View File

@ -1,6 +1,6 @@
// /** @file // /** @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 // This program and the accompanying materials are licensed and made available under
@ -790,6 +790,15 @@ form formid = AZALIA_OPTIONS_FORM_ID,
option text = STRING_TOKEN(STR_LPE_ACPI_MODE), value=2, flags=0 | RESET_REQUIRED; option text = STRING_TOKEN(STR_LPE_ACPI_MODE), value=2, flags=0 | RESET_REQUIRED;
endoneof; 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); subtitle text = STRING_TOKEN(STR_NULL_STRING);
suppressif ideqval Setup.AzaliaDs == 0x1; suppressif ideqval Setup.AzaliaDs == 0x1;
oneof varid = Setup.PchAzalia, oneof varid = Setup.PchAzalia,

View File

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

View File

@ -1,5 +1,5 @@
// /** @file // /** @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 // This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License // are licensed and made available under the terms and conditions of the BSD License
// which accompanies this distribution. The full text of the license may be found at // which accompanies this distribution. The full text of the license may be found at
@ -726,6 +726,9 @@
#string STR_RTC_BATTERY_NOT_PRESENT #language en-US "Not Present" #string STR_RTC_BATTERY_NOT_PRESENT #language en-US "Not Present"
#string STR_RTC_BATTERY_HELP #language en-US "RTC Battery is Present or Not Present" #string STR_RTC_BATTERY_HELP #language en-US "RTC Battery is Present or Not Present"
#string STR_LPE_REPORTED_BY_DSDT_PROMPT #language en-US "LPE Audio Reported By DSDT"
#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"
// //
// PCI Express // PCI Express
// //