OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[TGL/EHL] add debug prints for TSN components loading 

It was not easy to figure out from boot log whether TSN
components are loaded successfully or not. Add debug prints
to indicate the loading status.

Signed-off-by: Vincent Chen <vincent.chen@intel.com>
This commit is contained in:
Vincent Chen 2023-05-10 10:16:42 +08:00 committed by Guo Dong
parent e922842e08
commit 12f21059dc
4 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BootloaderCommonPkg/Library/TpmLib/TpmEventLog.c
View File

@ -266,7 +266,7 @@ AddEventTCGLog (
// Copy the hash
CopyMem (Loc, & (EventHdr->Digests.digests[Idx].digest), GetHashSizeFromAlgo (HashAlg));
DEBUG ((DEBUG_INFO, "HASH Extended %llx", EventHdr->Digests.digests[Idx].digest));
DEBUG ((DEBUG_INFO, "HASH Extended %llx\n", EventHdr->Digests.digests[Idx].digest));
Loc += GetHashSizeFromAlgo (HashAlg);
}

2
Platform/AlderlakeBoardPkg/Library/FspsUpdUpdateLib/FspsUpdUpdateLib.c
View File

@ -793,7 +793,7 @@ UpdateFspConfig (
TpmHashAndExtendPcrEventLog (0, (UINT8 *)TsnMacAddrBase, TsnMacAddrSize, EV_PLATFORM_CONFIG_FLAGS, sizeof(TsnCfgBlob), (UINT8 *)&TsnCfgBlob);
}
DEBUG ((DEBUG_ERROR, "TSN MAC subregion completed %r\n", Status));
DEBUG ((DEBUG_INFO, "TSN MAC subregion completed %r\n", Status));
} else {
DEBUG ((DEBUG_ERROR, "TSN MAC subregion not found! %r\n", Status));
}

33
Platform/ElkhartlakeBoardPkg/Library/Stage2BoardInitLib/Stage2BoardInitLib.c
View File

@ -905,7 +905,7 @@ TccModePostMemConfig (
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'T'),
(VOID **)&TccStreamBase, &TccStreamSize);
if (EFI_ERROR (Status) || (TccStreamSize < sizeof (TCC_STREAM_CONFIGURATION))) {
DEBUG ((DEBUG_INFO, "Load TCC Stream %r, size = 0x%x\n", Status, TccStreamSize));
DEBUG ((DEBUG_ERROR, "Load TCC Stream %r, size = 0x%x\n", Status, TccStreamSize));
} else {
FspsUpd->FspsConfig.TccStreamCfgBase = (UINT32)(UINTN)TccStreamBase;
FspsUpd->FspsConfig.TccStreamCfgSize = TccStreamSize;
@ -957,7 +957,7 @@ TccModePostMemConfig (
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'C'),
(VOID **)&TccCacheconfigBase, &TccCacheconfigSize);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "TCC Cache config not found! %r\n", Status));
DEBUG ((DEBUG_ERROR, "TCC Cache config not found! %r\n", Status));
} else {
FspsUpd->FspsConfig.TccCacheCfgBase = (UINT32)(UINTN)TccCacheconfigBase;
FspsUpd->FspsConfig.TccCacheCfgSize = TccCacheconfigSize;
@ -970,7 +970,7 @@ TccModePostMemConfig (
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'M'),
(VOID **)&TccCrlBase, &TccCrlSize);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "TCC CRL not found! %r\n", Status));
DEBUG ((DEBUG_ERROR, "TCC CRL not found! %r\n", Status));
} else {
FspsUpd->FspsConfig.TccCrlBinBase = (UINT32)(UINTN)TccCrlBase;
FspsUpd->FspsConfig.TccCrlBinSize = TccCrlSize;
@ -1580,9 +1580,14 @@ UpdateFspConfig (
if (MEASURED_BOOT_ENABLED() && (GetBootMode() != BOOT_ON_S3_RESUME)) {
TpmHashAndExtendPcrEventLog (1, (UINT8 *)TsnMacAddrBase, TsnMacAddrSize, EV_EFI_VARIABLE_DRIVER_CONFIG, sizeof("TMAC Config"), (UINT8 *)"TMAC Config");
}
Fspscfg->TsnMacAddrBase = (UINT32)(UINTN)TsnMacAddrBase;
Fspscfg->TsnMacAddrSize = TsnMacAddrSize;
DEBUG ((DEBUG_INFO, "Load TSN MAC subregion @0x%p, size = 0x%x\n", TsnMacAddrBase, TsnMacAddrSize));
} else {
DEBUG ((DEBUG_ERROR, "Failed to load TSN MAC subregion %r\n", Status));
}
Fspscfg->TsnMacAddrBase = (UINT32)(UINTN)TsnMacAddrBase;
Fspscfg->TsnMacAddrSize = TsnMacAddrSize;
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'S', 'I', 'P'),
(VOID **)&PseTsnIpConfigBase, &PseTsnIpConfigSize);
@ -1590,9 +1595,14 @@ UpdateFspConfig (
if (MEASURED_BOOT_ENABLED() && (GetBootMode() != BOOT_ON_S3_RESUME)) {
TpmHashAndExtendPcrEventLog (1, (UINT8 *)PseTsnIpConfigBase, PseTsnIpConfigSize, EV_EFI_VARIABLE_DRIVER_CONFIG, sizeof("TSIP Config"), (UINT8 *)"TSIP Config");
}
Fspscfg->PseTsnIpConfigBase = (UINT32)(UINTN)PseTsnIpConfigBase;
Fspscfg->PseTsnIpConfigSize = PseTsnIpConfigSize;
DEBUG ((DEBUG_INFO, "Load TSN IP config @0x%p, size = 0x%x\n", PseTsnIpConfigBase, PseTsnIpConfigSize));
} else {
DEBUG ((DEBUG_ERROR, "Failed to load TSN IP config %r\n", Status));
}
Fspscfg->PseTsnIpConfigBase = (UINT32)(UINTN)PseTsnIpConfigBase;
Fspscfg->PseTsnIpConfigSize = PseTsnIpConfigSize;
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'S', 'N', 'C'),
(VOID **)&TsnConfigBase, &TsnConfigSize);
@ -1600,9 +1610,14 @@ UpdateFspConfig (
if (MEASURED_BOOT_ENABLED() && (GetBootMode() != BOOT_ON_S3_RESUME)) {
TpmHashAndExtendPcrEventLog (1, (UINT8 *)TsnConfigBase, TsnConfigSize, EV_EFI_VARIABLE_DRIVER_CONFIG, sizeof("TSNC Config"), (UINT8 *)"TSNC Config");
}
Fspscfg->TsnConfigBase = (UINT32)(UINTN)TsnConfigBase;
Fspscfg->TsnConfigSize = TsnConfigSize;
DEBUG ((DEBUG_INFO, "Load TSN config @0x%p, size = 0x%x\n", TsnConfigBase, TsnConfigSize));
} else {
DEBUG ((DEBUG_ERROR, "Failed to load TSN config %r\n", Status));
}
Fspscfg->TsnConfigBase = (UINT32)(UINTN)TsnConfigBase;
Fspscfg->TsnConfigSize = TsnConfigSize;
Fspscfg->EnableTimedGpio0 = (UINT8)SiCfgData->EnableTimedGpio0;
Fspscfg->EnableTimedGpio1 = (UINT8)SiCfgData->EnableTimedGpio1;

23
Platform/TigerlakeBoardPkg/Library/Stage2BoardInitLib/Stage2BoardInitLib.c
View File

@ -1,6 +1,6 @@
/** @file
Copyright (c) 2008 - 2022, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2008 - 2023, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@ -1212,7 +1212,7 @@ TccModePostMemConfig (
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'T'),
(VOID **)&TccStreamBase, &TccStreamSize);
if (EFI_ERROR (Status) || (TccStreamSize < sizeof (TCC_STREAM_CONFIGURATION))) {
DEBUG ((DEBUG_INFO, "Load TCC Stream %r, size = 0x%x\n", Status, TccStreamSize));
DEBUG ((DEBUG_ERROR, "Load TCC Stream %r, size = 0x%x\n", Status, TccStreamSize));
} else {
FspsUpd->FspsConfig.TccStreamCfgBase = (UINT32)(UINTN)TccStreamBase;
FspsUpd->FspsConfig.TccStreamCfgSize = TccStreamSize;
@ -1250,7 +1250,7 @@ TccModePostMemConfig (
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'C'),
(VOID **)&TccCacheconfigBase, &TccCacheconfigSize);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "TCC Cache config not found! %r\n", Status));
DEBUG ((DEBUG_ERROR, "TCC Cache config not found! %r\n", Status));
} else {
FspsUpd->FspsConfig.TccCacheCfgBase = (UINT32)(UINTN)TccCacheconfigBase;
FspsUpd->FspsConfig.TccCacheCfgSize = TccCacheconfigSize;
@ -1263,7 +1263,7 @@ TccModePostMemConfig (
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'M'),
(VOID **)&TccCrlBase, &TccCrlSize);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "TCC CRL not found! %r\n", Status));
DEBUG ((DEBUG_ERROR, "TCC CRL not found! %r\n", Status));
} else {
FspsUpd->FspsConfig.TccCrlBinBase = (UINT32)(UINTN)TccCrlBase;
FspsUpd->FspsConfig.TccCrlBinSize = TccCrlSize;
@ -1520,13 +1520,18 @@ UpdateFspConfig (
FspsConfig->PchTsnMultiVcEnable = SiCfgData->PchTsnMultiVcEnable;
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'M', 'A', 'C'),
(VOID **)&TsnMacAddrBase, &TsnMacAddrSize);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Failed to load TSN MAC subregion %r\n", Status));
} else {
TsnSubRegion = (TSN_MAC_ADDR_SUB_REGION*) TsnMacAddrBase;
TsnSubRegion = (TSN_MAC_ADDR_SUB_REGION*) TsnMacAddrBase;
FspsConfig->PchTsn0MacAddressHigh = TsnSubRegion->Config.Port[0].MacAddr.U32MacAddr[1];
FspsConfig->PchTsn0MacAddressLow = TsnSubRegion->Config.Port[0].MacAddr.U32MacAddr[0];
FspsConfig->PchTsn1MacAddressHigh = TsnSubRegion->Config.Port[1].MacAddr.U32MacAddr[1];
FspsConfig->PchTsn1MacAddressLow = TsnSubRegion->Config.Port[1].MacAddr.U32MacAddr[0];
FspsConfig->PchTsn0MacAddressHigh = TsnSubRegion->Config.Port[0].MacAddr.U32MacAddr[1];
FspsConfig->PchTsn0MacAddressLow = TsnSubRegion->Config.Port[0].MacAddr.U32MacAddr[0];
FspsConfig->PchTsn1MacAddressHigh = TsnSubRegion->Config.Port[1].MacAddr.U32MacAddr[1];
FspsConfig->PchTsn1MacAddressLow = TsnSubRegion->Config.Port[1].MacAddr.U32MacAddr[0];
DEBUG ((DEBUG_INFO, "Load TSN MAC subregion @0x%p, size = 0x%x\n", TsnMacAddrBase, TsnMacAddrSize));
}
}
for (Index = 0; Index < (sizeof (FspsConfig->PortUsb20Enable) / sizeof (FspsConfig->PortUsb20Enable[0])); Index++) {
FspsConfig->PortUsb20Enable[Index] = ((*((UINT32*) (&SiCfgData->PortUsb20Enable))) >> Index) & 0x1;