From: "Benjamin Doron" <benjamin.doron00@gmail.com>
To: devel@edk2.groups.io
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>,
Isaac Oram <isaac.w.oram@intel.com>,
Nate DeSimone <nathaniel.l.desimone@intel.com>,
Chasel Chiu <chasel.chiu@intel.com>
Subject: [edk2-devel][edk2-platforms][PATCH v1 7/7] KabylakeOpenBoardPkg/AspireVn7Dash572G: Align DEBUG() use
Date: Tue, 6 Sep 2022 13:42:58 -0400 [thread overview]
Message-ID: <015f0d3f13746835ca8d6299f858fc352132a4e6.1662485273.git.benjamin.doron00@gmail.com> (raw)
In-Reply-To: <cover.1662485273.git.benjamin.doron00@gmail.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Benjamin Doron <benjamin.doron00@gmail.com>
---
.../DxeAspireVn7Dash572GAcpiTableLib.c | 5 ++++
.../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 1 +
.../SmmAspireVn7Dash572GAcpiEnableLib.c | 8 ++++-
.../Library/BoardEcLib/EcCommands.c | 16 +++++-----
.../Library/BoardInitLib/DxeBoardConfigHii.c | 8 ++---
.../Library/BoardInitLib/DxeBoardInitLib.c | 23 +++++++++------
.../PeiAspireVn7Dash572GInitPostMemLib.c | 29 ++++++++++++++-----
.../PeiAspireVn7Dash572GInitPreMemLib.c | 20 ++++++++++---
.../BoardInitLib/PeiBoardInitPreMemLib.c | 2 ++
.../DxeSiliconPolicyUpdateLib.c | 6 ++--
10 files changed, 80 insertions(+), 38 deletions(-)
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeAspireVn7Dash572GAcpiTableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeAspireVn7Dash572GAcpiTableLib.c
index 131e6460279a..994f18b2dc0e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeAspireVn7Dash572GAcpiTableLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeAspireVn7Dash572GAcpiTableLib.c
@@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Base.h>
#include <PiDxe.h>
#include <Library/BoardAcpiTableLib.h>
+#include <Library/DebugLib.h>
#include <Library/EcLib.h>
#include <Library/PcdLib.h>
#include <Protocol/GlobalNvsArea.h>
@@ -23,6 +24,8 @@ AspireVn7Dash572GUpdateGlobalNvs (
EFI_STATUS Status;
UINT8 PowerRegister;
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
//
// Allocate and initialize the NVS area for SMM and ASL communication.
//
@@ -57,6 +60,8 @@ AspireVn7Dash572GUpdateGlobalNvs (
mGlobalNvsArea.Area->Ps2KbMsEnable = PcdGet8 (PcdPs2KbMsEnable);
mGlobalNvsArea.Area->BoardId = (UINT8) LibPcdGetSku ();
+
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
}
EFI_STATUS
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
index 660afe9292ec..dc5bc80d0380 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
@@ -23,6 +23,7 @@
[LibraryClasses]
PcdLib
+ DebugLib
EcLib
[Packages]
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmAspireVn7Dash572GAcpiEnableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmAspireVn7Dash572GAcpiEnableLib.c
index fa2ed9745ea6..22c9c76a62e0 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmAspireVn7Dash572GAcpiEnableLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmAspireVn7Dash572GAcpiEnableLib.c
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
-#include <PiDxe.h>
+#include <PiSmm.h>
#include <Library/DebugLib.h>
#include <Library/EcLib.h>
@@ -20,6 +20,8 @@ AspireVn7Dash572GBoardEnableAcpi (
{
EFI_STATUS Status;
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
/* Tests at runtime show this re-enables charging and battery reporting
* - Obtained from somewhere in vendor's SmmKbcDriver.
* Further information is needed */
@@ -36,6 +38,7 @@ AspireVn7Dash572GBoardEnableAcpi (
}
/* TODO: Set touchpad GPP owner to ACPI? */
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
return EFI_SUCCESS;
}
@@ -48,6 +51,8 @@ AspireVn7Dash572GBoardDisableAcpi (
{
EFI_STATUS Status;
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
/* Tests at runtime show this disables charging and battery reporting
* - Obtained from somewhere in vendor's SmmKbcDriver.
* Further information is needed */
@@ -64,6 +69,7 @@ AspireVn7Dash572GBoardDisableAcpi (
}
/* TODO: Set touchpad GPP owner to GPIO? */
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
return EFI_SUCCESS;
}
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c
index 182cda6f1933..24737d9ecb90 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c
@@ -65,19 +65,19 @@ EcCmd90Read (
Status = SendEcCommand (0x90);
if (EFI_ERROR (Status)) {
- DEBUG((DEBUG_ERROR, "%a(): SendEcCommand(0x90) failed!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a(): SendEcCommand(0x90) failed!\n", __FUNCTION__));
return Status;
}
Status = SendEcData (Address);
if (EFI_ERROR (Status)) {
- DEBUG((DEBUG_ERROR, "%a(): SendEcData(Address) failed!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a(): SendEcData(Address) failed!\n", __FUNCTION__));
return Status;
}
Status = ReceiveEcData (Data);
if (EFI_ERROR (Status)) {
- DEBUG((DEBUG_ERROR, "%a(): ReceiveEcData(Data) failed!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a(): ReceiveEcData(Data) failed!\n", __FUNCTION__));
return Status;
}
return EFI_SUCCESS;
@@ -103,19 +103,19 @@ EcCmd91Write (
Status = SendEcCommand (0x91);
if (EFI_ERROR (Status)) {
- DEBUG((DEBUG_ERROR, "%a(): SendEcCommand(0x91) failed!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a(): SendEcCommand(0x91) failed!\n", __FUNCTION__));
return Status;
}
Status = SendEcData (Address);
if (EFI_ERROR (Status)) {
- DEBUG((DEBUG_ERROR, "%a(): SendEcData(Address) failed!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a(): SendEcData(Address) failed!\n", __FUNCTION__));
return Status;
}
Status = SendEcData (Data);
if (EFI_ERROR (Status)) {
- DEBUG((DEBUG_ERROR, "%a(): SendEcData(Data) failed!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a(): SendEcData(Data) failed!\n", __FUNCTION__));
return Status;
}
return EFI_SUCCESS;
@@ -144,13 +144,13 @@ EcCmd94Query (
Status = SendEcCommand (0x94);
if (EFI_ERROR (Status)) {
- DEBUG((DEBUG_ERROR, "%a(): SendEcCommand(0x94) failed!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a(): SendEcCommand(0x94) failed!\n", __FUNCTION__));
return Status;
}
Status = ReceiveEcData (Data);
if (EFI_ERROR (Status)) {
- DEBUG((DEBUG_ERROR, "%a(): ReceiveEcData(Data) failed!\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a(): ReceiveEcData(Data) failed!\n", __FUNCTION__));
return Status;
}
return EFI_SUCCESS;
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardConfigHii.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardConfigHii.c
index 437d31698f7d..2c302684913a 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardConfigHii.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardConfigHii.c
@@ -261,7 +261,7 @@ InstallBoardConfigHiiForm (
UINTN DataSize;
BOOLEAN ActionFlag;
- DEBUG ((DEBUG_INFO, "%a() Starts\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
//
// Install Device Path and Config Access protocols to driver handle
@@ -335,7 +335,7 @@ InstallBoardConfigHiiForm (
FreePool (ConfigRequestHdr);
- DEBUG ((DEBUG_INFO, "%a() Ends\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
}
/**
@@ -350,7 +350,7 @@ UninstallBoardConfigHiiForm (
{
EFI_STATUS Status;
- DEBUG ((DEBUG_INFO, "%a() Starts\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
//
// Uninstall Device Path and Config Access protocols
@@ -370,5 +370,5 @@ UninstallBoardConfigHiiForm (
//
HiiRemovePackages (gBoardConfigPrivate.HiiHandle);
- DEBUG ((DEBUG_INFO, "%a() Ends\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
}
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c
index cc99240b5aaa..af91034d4701 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c
@@ -1,8 +1,8 @@
/** @file
Aspire VN7-572G Board Initialization DXE library
- Copyright (c) 2021, Baruch Binyamin Doron
Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2021, Baruch Binyamin Doron<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -33,7 +33,7 @@ EcSendTime (
INTN Index;
UINT8 EcResponse;
- DEBUG ((DEBUG_INFO, "%a() Starts\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
Status = gRT->GetTime (&EfiTime, NULL);
if (EFI_ERROR (Status)) {
@@ -61,7 +61,7 @@ EcSendTime (
DEBUG ((DEBUG_INFO, "EC: response 0x%x\n", EcResponse));
}
- DEBUG ((DEBUG_INFO, "%a() Ends\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
}
/**
@@ -76,7 +76,7 @@ EcRequestsTime (
{
UINT8 Dat;
- DEBUG ((DEBUG_INFO, "%a() Starts\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
/* This is executed as protocol notify in vendor's RtKbcDriver when *CommonService
* protocol is installed. Effectively, this code could execute from the entrypoint */
@@ -85,7 +85,7 @@ EcRequestsTime (
EcSendTime ();
}
- DEBUG ((DEBUG_INFO, "%a() Ends\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
}
/**
@@ -113,6 +113,8 @@ EcResetSystemHook (
IN VOID *ResetData OPTIONAL
)
{
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
// If boolean PCD tokens 0xBD, 0xBE and 0xBF are set in vendor FW,
// OEM also sends command 0x5A with argument 0xAA via ACPI "CMDB" method and stalls for
// 100000, then sets ResetType to EfiResetShutdown.
@@ -126,6 +128,8 @@ EcResetSystemHook (
// Now OEM calls function offset 2 in ACER_BOOT_DEVICE_SERVICE_PROTOCOL_GUID.
// TODO: What does this do?
}
+
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
}
VOID
@@ -148,7 +152,7 @@ BoardInitAfterPciEnumeration (
{
EFI_STATUS Status;
- DEBUG ((DEBUG_INFO, "%a() Starts\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
// Send EC the present time, if requested
EcRequestsTime ();
@@ -164,7 +168,7 @@ BoardInitAfterPciEnumeration (
InstallBoardConfigHiiForm ();
- DEBUG ((DEBUG_INFO, "%a() Ends\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
return EFI_SUCCESS;
}
@@ -180,6 +184,7 @@ BoardInitReadyToBoot (
VOID
)
{
+ DEBUG ((DEBUG_INFO, "%a()\n", __FUNCTION__));
return EFI_SUCCESS;
}
@@ -203,7 +208,7 @@ BoardInitEndOfFirmware (
{
EFI_STATUS Status;
- DEBUG ((DEBUG_INFO, "%a() Starts\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
// Remove ResetSystem callback. ACPI will be notifying EC of events
if (mResetNotify != NULL) {
@@ -214,6 +219,6 @@ BoardInitEndOfFirmware (
UninstallBoardConfigHiiForm ();
- DEBUG ((DEBUG_INFO, "%a() Ends\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
return EFI_SUCCESS;
}
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c
index 77722f5d6062..2ad2dd866829 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c
@@ -1,6 +1,7 @@
/** @file
Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2021, Baruch Binyamin Doron<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -34,28 +35,32 @@ EcInit (
VOID
)
{
+ EFI_STATUS Status;
EFI_BOOT_MODE BootMode;
- UINT8 PowerRegister;
+ UINT8 PowerState;
UINT8 OutData;
UINT16 ABase;
UINT16 Pm1Sts;
UINT32 GpeSts;
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
/* This is called via a "$FNC" in a PeiOemModule pointer table, with "$DPX" on SiInit */
IoWrite8 (0x6C, 0x5A); // 6Ch is the EC sideband port
- PeiServicesGetBootMode (&BootMode);
+ Status = PeiServicesGetBootMode (&BootMode);
+ ASSERT_EFI_ERROR (Status);
if (BootMode == BOOT_ON_S3_RESUME) {
/* "MLID" in LGMR-based memory map is equivalent to "ELID" in EC-based
* memory map. Vendor firmware accesses through LGMR; remapped
* - EcCmd* function calls will not remapped */
- EcRead (0x70, &PowerRegister);
- if (!(PowerRegister & BIT1)) { // Lid is closed
+ EcRead (0x70, &PowerState);
+ if (!(PowerState & BIT1)) { // Lid is closed
EcCmd90Read (0x0A, &OutData);
if (!(OutData & BIT1)) {
EcCmd91Write (0x0A, OutData | BIT1);
}
- /* Clear events and go back to sleep */
+ /* Clear below events and go back to sleep */
PchAcpiBaseGet (&ABase);
/* Clear ABase PM1_STS - RW/1C set bits */
Pm1Sts = IoRead16 (ABase + R_PCH_ACPI_PM1_STS);
@@ -78,6 +83,8 @@ EcInit (
CpuDeadLoop ();
}
}
+
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
}
/**
@@ -105,15 +112,15 @@ GpioInitPostMem (
{
EFI_STATUS Status;
- DEBUG ((DEBUG_INFO, "GpioInitPostMem() Start\n"));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
Status = GpioConfigurePads (mGpioTableAspireVn7Dash572GSize, mGpioTableAspireVn7Dash572G);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "Failed to configure early GPIOs!\n"));
+ DEBUG ((DEBUG_ERROR, "Failed to configure GPIOs!\n"));
return EFI_DEVICE_ERROR;
}
- DEBUG ((DEBUG_INFO, "GpioInitPostMem() End\n"));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
return EFI_SUCCESS;
}
@@ -128,6 +135,8 @@ AspireVn7Dash572GBoardInitBeforeSiliconInit (
VOID
)
{
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
GpioInitPostMem ();
AspireVn7Dash572GInit ();
@@ -136,6 +145,7 @@ AspireVn7Dash572GBoardInitBeforeSiliconInit (
///
LateSiliconInit ();
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
return EFI_SUCCESS;
}
@@ -150,7 +160,10 @@ AspireVn7Dash572GBoardInitAfterSiliconInit (
VOID
)
{
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
EcInit ();
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
return EFI_SUCCESS;
}
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPreMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPreMemLib.c
index d0125ebdbcb2..5be644fa72ae 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPreMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPreMemLib.c
@@ -106,7 +106,7 @@ GpioInitPreMem (
{
EFI_STATUS Status;
- DEBUG ((DEBUG_INFO, "GpioInitPreMem() Start\n"));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
Status = GpioConfigurePads (mGpioTableAspireVn7Dash572G_earlySize, mGpioTableAspireVn7Dash572G_early);
if (EFI_ERROR (Status)) {
@@ -114,7 +114,7 @@ GpioInitPreMem (
return EFI_DEVICE_ERROR;
}
- DEBUG ((DEBUG_INFO, "GpioInitPreMem() End\n"));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
return EFI_SUCCESS;
}
@@ -129,7 +129,7 @@ DgpuPowerOn (
{
UINT32 OutputVal;
- DEBUG ((DEBUG_INFO, "DgpuPowerOn() Start\n"));
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
GpioGetOutputValue (DGPU_PRESENT, &OutputVal);
if (!OutputVal) {
@@ -146,7 +146,7 @@ DgpuPowerOn (
GpioSetOutputValue (DGPU_PWR_EN, 1); // Deassert dGPU_PWR_EN#
}
- DEBUG ((DEBUG_INFO, "DgpuPowerOn() End\n"));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
}
/**
@@ -182,6 +182,8 @@ AspireVn7Dash572GBoardInitBeforeMemoryInit (
{
EFI_STATUS Status;
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
Status = GpioInitPreMem ();
if (!EFI_ERROR (Status)) {
DgpuPowerOn ();
@@ -206,6 +208,8 @@ AspireVn7Dash572GBoardInitBeforeMemoryInit (
Status = PchInitializeReset ();
ASSERT_EFI_ERROR (Status);
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
+
return EFI_SUCCESS;
}
@@ -222,6 +226,8 @@ AspireVn7Dash572GBoardInitAfterMemoryInit (
{
EFI_STATUS Status;
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
// BUGBUG: Workaround for a misbehaving system firmware not setting goIdle
// - Based on prior investigation for coreboot, I suspect FSP
if ((MmioRead32 (0xFED40044) & PTP_CRB_CONTROL_AREA_STATUS_TPM_IDLE) == 0) {
@@ -235,6 +241,8 @@ AspireVn7Dash572GBoardInitAfterMemoryInit (
DEBUG ((DEBUG_WARN, "Failed to enable LGMR. Were ACPI tables built for LGMR memory map?\n"));
}
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
+
return EFI_SUCCESS;
}
@@ -252,6 +260,8 @@ AspireVn7Dash572GBoardDebugInit (
{
UINT16 ABase;
+ DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
+
///
/// Do Early PCH init
///
@@ -272,6 +282,8 @@ AspireVn7Dash572GBoardDebugInit (
DEBUG ((DEBUG_INFO, "ABase PM1_EN= 0x%x\n", IoRead16 (ABase + R_PCH_ACPI_PM1_EN)));
DEBUG ((DEBUG_INFO, "ABase PM1_CNT= 0x%x\n", IoRead32 (ABase + R_PCH_ACPI_PM1_CNT)));
+ DEBUG ((DEBUG_INFO, "%a() End\n", __FUNCTION__));
+
return EFI_SUCCESS;
}
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPreMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPreMemLib.c
index 5f89d87e71f8..9a1b6bf47f0e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPreMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPreMemLib.c
@@ -86,6 +86,7 @@ BoardInitBeforeTempRamExit (
VOID
)
{
+ DEBUG ((DEBUG_INFO, "%a()\n", __FUNCTION__));
return EFI_SUCCESS;
}
@@ -95,5 +96,6 @@ BoardInitAfterTempRamExit (
VOID
)
{
+ DEBUG ((DEBUG_INFO, "%a()\n", __FUNCTION__));
return EFI_SUCCESS;
}
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
index 6840531da986..ef04ea2feebf 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
@@ -60,12 +60,10 @@ SiliconPolicyUpdateLate (
Status = gBS->LocateProtocol (&gGopPolicyProtocolGuid, NULL, (VOID **) &GopPolicy);
if (!EFI_ERROR (Status)) {
Status = GopPolicy->GetVbtData (&VbtAddress, &VbtSize);
- if (!EFI_ERROR (Status) && GraphicsDxeConfig != NULL) {
+ if (!EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_INFO, "Located VBT at 0x%x with size 0x%x\n", VbtAddress, VbtSize));
GraphicsDxeConfig->VbtAddress = VbtAddress;
GraphicsDxeConfig->Size = VbtSize;
- DEBUG ((DEBUG_INFO, "Located VBT at 0x%x with size 0x%x\n", VbtAddress, VbtSize));
- } else {
- DEBUG ((DEBUG_ERROR, "No VBT found, or Policy == NULL; Status - %r\n", Status));
}
}
--
2.37.2
prev parent reply other threads:[~2022-09-06 17:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 17:42 [edk2-devel][edk2-platforms][PATCH v1 0/7] Benjamin Doron
2022-09-06 17:42 ` [edk2-devel][edk2-platforms][PATCH v1 1/7] KabylakeOpenBoardPkg/AspireVn7Dash572G: Cleanup library includes Benjamin Doron
2022-09-09 21:41 ` Isaac Oram
2022-09-06 17:42 ` [edk2-devel][edk2-platforms][PATCH v1 2/7] KabylakeOpenBoardPkg/AspireVn7Dash572G: Enhance the build-logic Benjamin Doron
2022-09-06 17:42 ` [edk2-devel][edk2-platforms][PATCH v1 3/7] KabylakeOpenBoardPkg/AspireVn7Dash572G/Acpi: Improvements for EC ACPI Benjamin Doron
2022-09-06 17:42 ` [edk2-devel][edk2-platforms][PATCH v1 4/7] KabylakeOpenBoardPkg/AspireVn7Dash572G/DxeBoardInitLib: Resets notify EC Benjamin Doron
2022-09-06 17:42 ` [edk2-devel][edk2-platforms][PATCH v1 5/7] KabylakeOpenBoardPkg/AspireVn7Dash572G: Use Setup to control security Benjamin Doron
2022-09-06 17:42 ` [edk2-devel][edk2-platforms][PATCH v1 6/7] KabylakeOpenBoardPkg/AspireVn7Dash572G: Improve board detection Benjamin Doron
2022-09-06 17:42 ` Benjamin Doron [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=015f0d3f13746835ca8d6299f858fc352132a4e6.1662485273.git.benjamin.doron00@gmail.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox