[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:
parent
e922842e08
commit
12f21059dc
|
@ -266,7 +266,7 @@ AddEventTCGLog (
|
||||||
|
|
||||||
// Copy the hash
|
// Copy the hash
|
||||||
CopyMem (Loc, & (EventHdr->Digests.digests[Idx].digest), GetHashSizeFromAlgo (HashAlg));
|
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);
|
Loc += GetHashSizeFromAlgo (HashAlg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -793,7 +793,7 @@ UpdateFspConfig (
|
||||||
TpmHashAndExtendPcrEventLog (0, (UINT8 *)TsnMacAddrBase, TsnMacAddrSize, EV_PLATFORM_CONFIG_FLAGS, sizeof(TsnCfgBlob), (UINT8 *)&TsnCfgBlob);
|
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 {
|
} else {
|
||||||
DEBUG ((DEBUG_ERROR, "TSN MAC subregion not found! %r\n", Status));
|
DEBUG ((DEBUG_ERROR, "TSN MAC subregion not found! %r\n", Status));
|
||||||
}
|
}
|
||||||
|
|
|
@ -905,7 +905,7 @@ TccModePostMemConfig (
|
||||||
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'T'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'T'),
|
||||||
(VOID **)&TccStreamBase, &TccStreamSize);
|
(VOID **)&TccStreamBase, &TccStreamSize);
|
||||||
if (EFI_ERROR (Status) || (TccStreamSize < sizeof (TCC_STREAM_CONFIGURATION))) {
|
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 {
|
} else {
|
||||||
FspsUpd->FspsConfig.TccStreamCfgBase = (UINT32)(UINTN)TccStreamBase;
|
FspsUpd->FspsConfig.TccStreamCfgBase = (UINT32)(UINTN)TccStreamBase;
|
||||||
FspsUpd->FspsConfig.TccStreamCfgSize = TccStreamSize;
|
FspsUpd->FspsConfig.TccStreamCfgSize = TccStreamSize;
|
||||||
|
@ -957,7 +957,7 @@ TccModePostMemConfig (
|
||||||
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'C'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'C'),
|
||||||
(VOID **)&TccCacheconfigBase, &TccCacheconfigSize);
|
(VOID **)&TccCacheconfigBase, &TccCacheconfigSize);
|
||||||
if (EFI_ERROR (Status)) {
|
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 {
|
} else {
|
||||||
FspsUpd->FspsConfig.TccCacheCfgBase = (UINT32)(UINTN)TccCacheconfigBase;
|
FspsUpd->FspsConfig.TccCacheCfgBase = (UINT32)(UINTN)TccCacheconfigBase;
|
||||||
FspsUpd->FspsConfig.TccCacheCfgSize = TccCacheconfigSize;
|
FspsUpd->FspsConfig.TccCacheCfgSize = TccCacheconfigSize;
|
||||||
|
@ -970,7 +970,7 @@ TccModePostMemConfig (
|
||||||
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'M'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'M'),
|
||||||
(VOID **)&TccCrlBase, &TccCrlSize);
|
(VOID **)&TccCrlBase, &TccCrlSize);
|
||||||
if (EFI_ERROR (Status)) {
|
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 {
|
} else {
|
||||||
FspsUpd->FspsConfig.TccCrlBinBase = (UINT32)(UINTN)TccCrlBase;
|
FspsUpd->FspsConfig.TccCrlBinBase = (UINT32)(UINTN)TccCrlBase;
|
||||||
FspsUpd->FspsConfig.TccCrlBinSize = TccCrlSize;
|
FspsUpd->FspsConfig.TccCrlBinSize = TccCrlSize;
|
||||||
|
@ -1580,9 +1580,14 @@ UpdateFspConfig (
|
||||||
if (MEASURED_BOOT_ENABLED() && (GetBootMode() != BOOT_ON_S3_RESUME)) {
|
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");
|
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'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'S', 'I', 'P'),
|
||||||
(VOID **)&PseTsnIpConfigBase, &PseTsnIpConfigSize);
|
(VOID **)&PseTsnIpConfigBase, &PseTsnIpConfigSize);
|
||||||
|
@ -1590,9 +1595,14 @@ UpdateFspConfig (
|
||||||
if (MEASURED_BOOT_ENABLED() && (GetBootMode() != BOOT_ON_S3_RESUME)) {
|
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");
|
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'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'S', 'N', 'C'),
|
||||||
(VOID **)&TsnConfigBase, &TsnConfigSize);
|
(VOID **)&TsnConfigBase, &TsnConfigSize);
|
||||||
|
@ -1600,9 +1610,14 @@ UpdateFspConfig (
|
||||||
if (MEASURED_BOOT_ENABLED() && (GetBootMode() != BOOT_ON_S3_RESUME)) {
|
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");
|
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->EnableTimedGpio0 = (UINT8)SiCfgData->EnableTimedGpio0;
|
||||||
Fspscfg->EnableTimedGpio1 = (UINT8)SiCfgData->EnableTimedGpio1;
|
Fspscfg->EnableTimedGpio1 = (UINT8)SiCfgData->EnableTimedGpio1;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/** @file
|
/** @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
|
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'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'T'),
|
||||||
(VOID **)&TccStreamBase, &TccStreamSize);
|
(VOID **)&TccStreamBase, &TccStreamSize);
|
||||||
if (EFI_ERROR (Status) || (TccStreamSize < sizeof (TCC_STREAM_CONFIGURATION))) {
|
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 {
|
} else {
|
||||||
FspsUpd->FspsConfig.TccStreamCfgBase = (UINT32)(UINTN)TccStreamBase;
|
FspsUpd->FspsConfig.TccStreamCfgBase = (UINT32)(UINTN)TccStreamBase;
|
||||||
FspsUpd->FspsConfig.TccStreamCfgSize = TccStreamSize;
|
FspsUpd->FspsConfig.TccStreamCfgSize = TccStreamSize;
|
||||||
|
@ -1250,7 +1250,7 @@ TccModePostMemConfig (
|
||||||
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'C'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'C'),
|
||||||
(VOID **)&TccCacheconfigBase, &TccCacheconfigSize);
|
(VOID **)&TccCacheconfigBase, &TccCacheconfigSize);
|
||||||
if (EFI_ERROR (Status)) {
|
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 {
|
} else {
|
||||||
FspsUpd->FspsConfig.TccCacheCfgBase = (UINT32)(UINTN)TccCacheconfigBase;
|
FspsUpd->FspsConfig.TccCacheCfgBase = (UINT32)(UINTN)TccCacheconfigBase;
|
||||||
FspsUpd->FspsConfig.TccCacheCfgSize = TccCacheconfigSize;
|
FspsUpd->FspsConfig.TccCacheCfgSize = TccCacheconfigSize;
|
||||||
|
@ -1263,7 +1263,7 @@ TccModePostMemConfig (
|
||||||
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'M'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'C', 'C', 'M'),
|
||||||
(VOID **)&TccCrlBase, &TccCrlSize);
|
(VOID **)&TccCrlBase, &TccCrlSize);
|
||||||
if (EFI_ERROR (Status)) {
|
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 {
|
} else {
|
||||||
FspsUpd->FspsConfig.TccCrlBinBase = (UINT32)(UINTN)TccCrlBase;
|
FspsUpd->FspsConfig.TccCrlBinBase = (UINT32)(UINTN)TccCrlBase;
|
||||||
FspsUpd->FspsConfig.TccCrlBinSize = TccCrlSize;
|
FspsUpd->FspsConfig.TccCrlBinSize = TccCrlSize;
|
||||||
|
@ -1520,13 +1520,18 @@ UpdateFspConfig (
|
||||||
FspsConfig->PchTsnMultiVcEnable = SiCfgData->PchTsnMultiVcEnable;
|
FspsConfig->PchTsnMultiVcEnable = SiCfgData->PchTsnMultiVcEnable;
|
||||||
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'M', 'A', 'C'),
|
Status = LoadComponent (SIGNATURE_32 ('I', 'P', 'F', 'W'), SIGNATURE_32 ('T', 'M', 'A', 'C'),
|
||||||
(VOID **)&TsnMacAddrBase, &TsnMacAddrSize);
|
(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];
|
DEBUG ((DEBUG_INFO, "Load TSN MAC subregion @0x%p, size = 0x%x\n", TsnMacAddrBase, TsnMacAddrSize));
|
||||||
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];
|
|
||||||
}
|
}
|
||||||
for (Index = 0; Index < (sizeof (FspsConfig->PortUsb20Enable) / sizeof (FspsConfig->PortUsb20Enable[0])); Index++) {
|
for (Index = 0; Index < (sizeof (FspsConfig->PortUsb20Enable) / sizeof (FspsConfig->PortUsb20Enable[0])); Index++) {
|
||||||
FspsConfig->PortUsb20Enable[Index] = ((*((UINT32*) (&SiCfgData->PortUsb20Enable))) >> Index) & 0x1;
|
FspsConfig->PortUsb20Enable[Index] = ((*((UINT32*) (&SiCfgData->PortUsb20Enable))) >> Index) & 0x1;
|
||||||
|
|
Loading…
Reference in New Issue