* [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool
@ 2022-07-01 15:10 Lin, Jason1
2022-07-01 15:10 ` [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage Lin, Jason1
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Lin, Jason1 @ 2022-07-01 15:10 UTC (permalink / raw)
To: devel
Cc: Jason1 Lin, Bob Feng, Liming Gao, Yuwei Chen, Isaac W Oram,
Rangasai V Chaganty, Dakota Chiang
From: Jason1 Lin <jason1.lin@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
Within current FitGen tool there had limitation only allow
one S-ACM to generate the Type 2 entry.
This code change is used to support multiple type 2 entries up to 0x20.
Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Dakota Chiang <dakota.chiang@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 89 +++++++++++---------
Silicon/Intel/Tools/FitGen/FitGen.h | 4 +-
2 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index 4de72ea422..eac8fa8715 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -2,7 +2,7 @@
This utility is part of build process for IA32/X64 FD.
It generates FIT table.
-Copyright (c) 2010-2021, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010-2022, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -204,6 +204,7 @@ typedef struct {
#define MAX_BIOS_MODULE_ENTRY 0x20
#define MAX_MICROCODE_ENTRY 0x20
+#define MAX_STARTUP_ACM_ENTRY 0x20
#define MAX_OPTIONAL_ENTRY 0x20
#define MAX_PORT_ENTRY 0x20
@@ -255,11 +256,12 @@ typedef struct {
UINT32 FitEntryNumber;
UINT32 BiosModuleNumber;
UINT32 MicrocodeNumber;
+ UINT32 StartupAcmNumber;
UINT32 OptionalModuleNumber;
UINT32 PortModuleNumber;
UINT32 GlobalVersion;
UINT32 FitHeaderVersion;
- FIT_TABLE_CONTEXT_ENTRY StartupAcm;
+ FIT_TABLE_CONTEXT_ENTRY StartupAcm[MAX_STARTUP_ACM_ENTRY];
UINT32 StartupAcmVersion;
FIT_TABLE_CONTEXT_ENTRY DiagnstAcm;
UINT32 DiagnstAcmVersion;
@@ -1149,14 +1151,15 @@ Returns:
Error (NULL, 0, 0, "-I Parameter incorrect, Header Type unsupported!", NULL);
return 0;
case FIT_TABLE_TYPE_STARTUP_ACM:
- if (gFitTableContext.StartupAcm.Type != 0) {
- Error (NULL, 0, 0, "-I Parameter incorrect, Duplicated StartupAcm!", NULL);
+ if (gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {
+ Error (NULL, 0, 0, "-I Parameter incorrect, too many StartupAcm!", NULL);
return 0;
}
- gFitTableContext.StartupAcm.Type = FIT_TABLE_TYPE_STARTUP_ACM;
- gFitTableContext.StartupAcm.Address = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;
- gFitTableContext.StartupAcm.Size = (UINT32)BiosInfoStruct[BiosInfoIndex].Size;
- gFitTableContext.StartupAcmVersion = BiosInfoStruct[BiosInfoIndex].Version;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FIT_TABLE_TYPE_STARTUP_ACM;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = (UINT32)BiosInfoStruct[BiosInfoIndex].Size;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Version = BiosInfoStruct[BiosInfoIndex].Version;
+ gFitTableContext.StartupAcmNumber ++;
gFitTableContext.FitEntryNumber ++;
break;
case FIT_TABLE_TYPE_DIAGNST_ACM:
@@ -1351,16 +1354,15 @@ Returns:
//
// 1. StartupAcm
//
- do {
+ while (TRUE) {
if ((Index + 1 >= argc) ||
((strcmp (argv[Index], "-S") != 0) &&
(strcmp (argv[Index], "-s") != 0)) ) {
- if (BiosInfoExist && (gFitTableContext.StartupAcm.Type == FIT_TABLE_TYPE_STARTUP_ACM)) {
- break;
+ if (gFitTableContext.StartupAcmNumber == 0) {
+ printf ("-S not found. WARNING!\n");
}
// Error (NULL, 0, 0, "-S Parameter incorrect, expect -S!", NULL);
// return 0;
- printf ("-S not found. WARNING!\n");
break;
}
if (IsGuidData (argv[Index + 1], &Guid)) {
@@ -1381,14 +1383,13 @@ Returns:
FileSize = xtoi (argv[Index + 2]);
Index += 3;
}
- if (gFitTableContext.StartupAcm.Type != 0) {
- Error (NULL, 0, 0, "-S Parameter incorrect, Duplicated StartupAcm!", NULL);
+ if (gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {
+ Error (NULL, 0, 0, "-S Parameter incorrect, too many StartupAcm!", NULL);
return 0;
}
- gFitTableContext.StartupAcm.Type = FIT_TABLE_TYPE_STARTUP_ACM;
- gFitTableContext.StartupAcm.Address = (UINT32) (UINTN) FileBuffer;
- gFitTableContext.StartupAcm.Size = FileSize;
- gFitTableContext.FitEntryNumber ++;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FIT_TABLE_TYPE_STARTUP_ACM;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32) (UINTN) FileBuffer;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = FileSize;
//
// 1.1 StartupAcm version
@@ -1407,7 +1408,10 @@ Returns:
gFitTableContext.StartupAcmVersion = xtoi (argv[Index + 1]);
Index += 2;
}
- } while (FALSE);
+
+ gFitTableContext.StartupAcmNumber ++;
+ gFitTableContext.FitEntryNumber ++;
+ }
//
// 1.5. DiagnosticsAcm
@@ -1890,7 +1894,9 @@ Returns:
//
// Final: Check StartupAcm in BiosModule.
//
- CheckOverlap (gFitTableContext.StartupAcm.Address, gFitTableContext.StartupAcm.Size);
+ for (Index = 0; Index < (INTN)gFitTableContext.StartupAcmNumber; Index++) {
+ CheckOverlap (gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size);
+ }
FitEntryNumber = gFitTableContext.FitEntryNumber;
for (Index = 0; Index < (INTN)gFitTableContext.OptionalModuleNumber; Index++) {
if ((gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_POLICY) ||
@@ -2178,8 +2184,8 @@ Returns:
}
printf ("Total FIT Entry number: 0x%x\n", gFitTableContext.FitEntryNumber);
printf ("FitHeader version: 0x%04x\n", gFitTableContext.FitHeaderVersion);
- if (gFitTableContext.StartupAcm.Address != 0) {
- printf ("StartupAcm - (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.StartupAcm.Address, gFitTableContext.StartupAcm.Size, gFitTableContext.StartupAcmVersion);
+ for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {
+ printf ("StartupAcm[%d] - (0x%08x, 0x%08x, 0x%04x)\n", Index, gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size, gFitTableContext.StartupAcmVersion);
}
if (gFitTableContext.DiagnstAcm.Address != 0) {
printf ("DiagnosticAcm - (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.DiagnstAcm.Address, gFitTableContext.DiagnstAcm.Size, gFitTableContext.DiagnstAcmVersion);
@@ -2809,8 +2815,8 @@ Returns:
//
// 4. StartupAcm
//
- if (gFitTableContext.StartupAcm.Address != 0) {
- FitEntry[FitIndex].Address = gFitTableContext.StartupAcm.Address;
+ for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {
+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;
*(UINT32 *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.StartupAcm.Size / 16;
FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;
FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;
@@ -3110,7 +3116,7 @@ GetFitEntryInfo (
Routine Description:
- Fill the FIT table information to Fvrecovery
+ Get the FIT table information from Fvrecovery
Arguments:
@@ -3164,8 +3170,8 @@ Returns:
gFitTableContext.MicrocodeNumber ++;
break;
case FIT_TABLE_TYPE_STARTUP_ACM:
- gFitTableContext.StartupAcm.Address = (UINT32)FitEntry[FitIndex].Address;
- gFitTableContext.StartupAcmVersion = FitEntry[FitIndex].Version;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)FitEntry[FitIndex].Address;
+ gFitTableContext.StartupAcmVersion = FitEntry[FitIndex].Version;
break;
case FIT_TABLE_TYPE_BIOS_MODULE:
gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;
@@ -3232,6 +3238,7 @@ Returns:
UINT32 FdFileSize;
UINT8 *AcmBuffer;
+ INTN Index;
UINT32 FixedFitLocation;
FileBufferRaw = NULL;
@@ -3323,22 +3330,23 @@ Returns:
//
// Get ACM buffer
//
- if (gFitTableContext.StartupAcm.Address != 0) {
- AcmBuffer = FLASH_TO_MEMORY(gFitTableContext.StartupAcm.Address, FdFileBuffer, FdFileSize);
- if ((AcmBuffer < FdFileBuffer) || (AcmBuffer + gFitTableContext.StartupAcm.Size > FdFileBuffer + FdFileSize)) {
- printf ("ACM out of range - can not validate it\n");
- AcmBuffer = NULL;
- }
+ for (Index = 0; Index < (INTN)gFitTableContext.StartupAcmNumber; Index ++) {
+ if (gFitTableContext.StartupAcm[Index].Address != 0) {
+ AcmBuffer = FLASH_TO_MEMORY(gFitTableContext.StartupAcm[Index].Address, FdFileBuffer, FdFileSize);
+ if ((AcmBuffer < FdFileBuffer) || (AcmBuffer + gFitTableContext.StartupAcm[Index].Size > FdFileBuffer + FdFileSize)) {
+ printf ("ACM out of range - can not validate it\n");
+ AcmBuffer = NULL;
+ }
- if (AcmBuffer != NULL) {
- if (CheckAcm ((ACM_FORMAT *)AcmBuffer, gFitTableContext.StartupAcm.Size)) {
- DumpAcm ((ACM_FORMAT *)AcmBuffer);
- } else {
- Status = STATUS_ERROR;
- goto exitFunc;
+ if (AcmBuffer != NULL) {
+ if (CheckAcm ((ACM_FORMAT *)AcmBuffer, gFitTableContext.StartupAcm[Index].Size)) {
+ DumpAcm ((ACM_FORMAT *)AcmBuffer);
+ } else {
+ Status = STATUS_ERROR;
+ goto exitFunc;
+ }
}
}
-
}
//
@@ -3576,4 +3584,3 @@ Returns:
return u;
}
-
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h b/Silicon/Intel/Tools/FitGen/FitGen.h
index 5add6a8870..b7de0a6b2d 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.h
+++ b/Silicon/Intel/Tools/FitGen/FitGen.h
@@ -1,7 +1,7 @@
/**@file
Definitions for the FitGen utility.
-Copyright (c) 2010-2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010-2022, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Utility version information
//
#define UTILITY_MAJOR_VERSION 0
-#define UTILITY_MINOR_VERSION 64
+#define UTILITY_MINOR_VERSION 65
#define UTILITY_DATE __DATE__
//
--
2.37.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage
2022-07-01 15:10 [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Lin, Jason1
@ 2022-07-01 15:10 ` Lin, Jason1
2022-07-01 18:34 ` Oram, Isaac W
2022-07-04 1:37 ` Yuwei Chen
2022-07-01 15:10 ` [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version Lin, Jason1
` (3 subsequent siblings)
4 siblings, 2 replies; 10+ messages in thread
From: Lin, Jason1 @ 2022-07-01 15:10 UTC (permalink / raw)
To: devel
Cc: Jason1 Lin, Bob Feng, Liming Gao, Yuwei Chen, Isaac W Oram,
Rangasai V Chaganty, Dakota Chiang
From: Jason1 Lin <jason1.lin@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
FitGen tool exists lots of typecasting and pointer usage.
This code change is used to reduce these in FillFitTable ()
and GetFitEntryInfo ().
To make code more clearly and easy to read.
Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Dakota Chiang <dakota.chiang@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 125 ++++++++++++--------
1 file changed, 78 insertions(+), 47 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index eac8fa8715..01b4f82518 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -2768,6 +2768,7 @@ Returns:
{
FIRMWARE_INTERFACE_TABLE_ENTRY *FitEntry;
UINT32 FitIndex;
+ UINT32 FitEntrySizeValue;
UINT32 Index;
UINT8 Checksum;
UINTN SubIndex;
@@ -2788,27 +2789,35 @@ Returns:
//
// 2. FitHeader
//
- FitEntry[FitIndex].Address = *(UINT64 *)"_FIT_ ";
- *(UINT32 *)&FitEntry[FitIndex].Size[0] = gFitTableContext.FitEntryNumber;
- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.FitHeaderVersion;
- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_HEADER;
- FitEntry[FitIndex].C_V = 1;
+ FitEntrySizeValue = gFitTableContext.FitEntryNumber;
+ FitEntry[FitIndex].Address = *(UINT64 *)"_FIT_ ";
+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
+ FitEntry[FitIndex].Rsvd = 0;
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.FitHeaderVersion;
+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_HEADER;
+ FitEntry[FitIndex].C_V = 1;
//
// Checksum will be updated later...
//
- FitEntry[FitIndex].Checksum = 0;
+ FitEntry[FitIndex].Checksum = 0;
//
// 3. Microcode
//
FitIndex++;
for (Index = 0; Index < gFitTableContext.MicrocodeNumber; Index++) {
- FitEntry[FitIndex].Address = gFitTableContext.Microcode[Index].Address;
- *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.Microcode[Index].Size / 16;
- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.MicrocodeVersion;
- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_MICROCODE;
- FitEntry[FitIndex].C_V = 0;
- FitEntry[FitIndex].Checksum = 0;
+ FitEntrySizeValue = 0; // gFitTableContext.Microcode[Index].Size / 16
+ FitEntry[FitIndex].Address = gFitTableContext.Microcode[Index].Address;
+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
+ FitEntry[FitIndex].Rsvd = 0;
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.MicrocodeVersion;
+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_MICROCODE;
+ FitEntry[FitIndex].C_V = 0;
+ FitEntry[FitIndex].Checksum = 0;
FitIndex++;
}
@@ -2816,12 +2825,16 @@ Returns:
// 4. StartupAcm
//
for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {
- FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;
- *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.StartupAcm.Size / 16;
- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;
- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;
- FitEntry[FitIndex].C_V = 0;
- FitEntry[FitIndex].Checksum = 0;
+ FitEntrySizeValue = 0; // gFitTableContext.StartupAcm.Size / 16
+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;
+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
+ FitEntry[FitIndex].Rsvd = 0;
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;
+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;
+ FitEntry[FitIndex].C_V = 0;
+ FitEntry[FitIndex].Checksum = 0;
FitIndex++;
}
@@ -2829,19 +2842,23 @@ Returns:
// 4.5. DiagnosticAcm
//
if (gFitTableContext.DiagnstAcm.Address != 0) {
- FitEntry[FitIndex].Address = gFitTableContext.DiagnstAcm.Address;
- *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0;
- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.DiagnstAcmVersion;
- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_DIAGNST_ACM;
- FitEntry[FitIndex].C_V = 0;
- FitEntry[FitIndex].Checksum = 0;
+ FitEntrySizeValue = 0; // gFitTableContext.DiagnstAcmVersion.Size / 16
+ FitEntry[FitIndex].Address = gFitTableContext.DiagnstAcm.Address;
+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
+ FitEntry[FitIndex].Rsvd = 0;
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.DiagnstAcmVersion;
+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_DIAGNST_ACM;
+ FitEntry[FitIndex].C_V = 0;
+ FitEntry[FitIndex].Checksum = 0;
FitIndex++;
}
//
// 5. BiosModule
//
//
- // BiosModule segments order needs to be put from low addresss to high for Btg requirement
+ // BiosModule segments order needs to be put from low address to high for Btg requirement
//
if (gFitTableContext.BiosModuleNumber > 1) {
for (Index = 0; Index < (UINTN)gFitTableContext.BiosModuleNumber - 1; Index++){
@@ -2855,12 +2872,16 @@ Returns:
}
}
for (Index = 0; Index < gFitTableContext.BiosModuleNumber; Index++) {
- FitEntry[FitIndex].Address = gFitTableContext.BiosModule[Index].Address;
- *(UINT32 *)&FitEntry[FitIndex].Size[0] = gFitTableContext.BiosModule[Index].Size / 16;
- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.BiosModuleVersion;
- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_BIOS_MODULE;
- FitEntry[FitIndex].C_V = 0;
- FitEntry[FitIndex].Checksum = 0;
+ FitEntrySizeValue = gFitTableContext.BiosModule[Index].Size / 16;
+ FitEntry[FitIndex].Address = gFitTableContext.BiosModule[Index].Address;
+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
+ FitEntry[FitIndex].Rsvd = 0;
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.BiosModuleVersion;
+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_BIOS_MODULE;
+ FitEntry[FitIndex].C_V = 0;
+ FitEntry[FitIndex].Checksum = 0;
FitIndex++;
}
@@ -2868,15 +2889,18 @@ Returns:
// 6. Optional module
//
for (Index = 0; Index < gFitTableContext.OptionalModuleNumber; Index++) {
- FitEntry[FitIndex].Address = gFitTableContext.OptionalModule[Index].Address;
- *(UINT32 *)&FitEntry[FitIndex].Size[0] = gFitTableContext.OptionalModule[Index].Size;
- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.OptionalModule[Index].Version;
- FitEntry[FitIndex].Type = (UINT8)gFitTableContext.OptionalModule[Index].Type;
+ FitEntrySizeValue = gFitTableContext.OptionalModule[Index].Size;
+ FitEntry[FitIndex].Address = gFitTableContext.OptionalModule[Index].Address;
+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.OptionalModule[Index].Version;
+ FitEntry[FitIndex].Type = (UINT8)gFitTableContext.OptionalModule[Index].Type;
if (FitEntry[FitIndex].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT) {
- FitEntry[FitIndex].Rsvd = (UINT8)gFitTableContext.OptionalModule[Index].SubType;
+ FitEntry[FitIndex].Rsvd = (UINT8)gFitTableContext.OptionalModule[Index].SubType;
}
- FitEntry[FitIndex].C_V = 0;
- FitEntry[FitIndex].Checksum = 0;
+ FitEntry[FitIndex].C_V = 0;
+ FitEntry[FitIndex].Checksum = 0;
FitIndex++;
}
@@ -2884,12 +2908,16 @@ Returns:
// 7. Port module
//
for (Index = 0; Index < gFitTableContext.PortModuleNumber; Index++) {
- FitEntry[FitIndex].Address = gFitTableContext.PortModule[Index].Address + ((UINT64)gFitTableContext.PortModule[Index].Size << 32);
- *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0;
- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.PortModule[Index].Version;
- FitEntry[FitIndex].Type = (UINT8)gFitTableContext.PortModule[Index].Type;
- FitEntry[FitIndex].C_V = 0;
- FitEntry[FitIndex].Checksum = 0;
+ FitEntrySizeValue = 0;
+ FitEntry[FitIndex].Address = gFitTableContext.PortModule[Index].Address + ((UINT64)gFitTableContext.PortModule[Index].Size << 32);
+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
+ FitEntry[FitIndex].Rsvd = 0;
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.PortModule[Index].Version;
+ FitEntry[FitIndex].Type = (UINT8)gFitTableContext.PortModule[Index].Type;
+ FitEntry[FitIndex].C_V = 0;
+ FitEntry[FitIndex].Checksum = 0;
FitIndex++;
}
@@ -3130,6 +3158,7 @@ Returns:
--*/
{
FIRMWARE_INTERFACE_TABLE_ENTRY *FitEntry;
+ UINT32 FitEntrySizeValue;
UINT32 FitIndex;
UINT32 FitTableOffset;
@@ -3155,7 +3184,8 @@ Returns:
if (FitEntry[FitIndex].Type != FIT_TABLE_TYPE_HEADER) {
return 0;
}
- gFitTableContext.FitEntryNumber = *(UINT32 *)&FitEntry[FitIndex].Size[0];
+ FitEntrySizeValue = (((UINT32)FitEntry[FitIndex].Size[2]) << 16) + (((UINT32)FitEntry[FitIndex].Size[1]) << 8) + ((UINT32)FitEntry[FitIndex].Size[0]);
+ gFitTableContext.FitEntryNumber = FitEntrySizeValue;
gFitTableContext.FitHeaderVersion = FitEntry[FitIndex].Version;
//
@@ -3163,6 +3193,7 @@ Returns:
//
FitIndex++;
for (; FitIndex < gFitTableContext.FitEntryNumber; FitIndex++) {
+ FitEntrySizeValue = (((UINT32)FitEntry[FitIndex].Size[2]) << 16) + (((UINT32)FitEntry[FitIndex].Size[1]) << 8) + ((UINT32)FitEntry[FitIndex].Size[0]);
switch (FitEntry[FitIndex].Type) {
case FIT_TABLE_TYPE_MICROCODE:
gFitTableContext.Microcode[gFitTableContext.MicrocodeNumber].Address = (UINT32)FitEntry[FitIndex].Address;
@@ -3175,7 +3206,7 @@ Returns:
break;
case FIT_TABLE_TYPE_BIOS_MODULE:
gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;
- gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Size = *(UINT32 *)&FitEntry[FitIndex].Size[0] * 16;
+ gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Size = FitEntrySizeValue * 16;
gFitTableContext.BiosModuleVersion = FitEntry[FitIndex].Version;
gFitTableContext.BiosModuleNumber ++;
break;
@@ -3192,7 +3223,7 @@ Returns:
// Not Port Configure, pass through
default: // Others
gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;
- gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Size = *(UINT32 *)&FitEntry[FitIndex].Size[0];
+ gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Size = FitEntrySizeValue;
gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Version = FitEntry[FitIndex].Version;
gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Type = FitEntry[FitIndex].Type;
gFitTableContext.OptionalModuleNumber ++;
--
2.37.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version
2022-07-01 15:10 [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Lin, Jason1
2022-07-01 15:10 ` [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage Lin, Jason1
@ 2022-07-01 15:10 ` Lin, Jason1
2022-07-01 18:34 ` Oram, Isaac W
2022-07-04 1:37 ` Yuwei Chen
2022-07-01 18:34 ` [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Oram, Isaac W
` (2 subsequent siblings)
4 siblings, 2 replies; 10+ messages in thread
From: Lin, Jason1 @ 2022-07-01 15:10 UTC (permalink / raw)
To: devel
Cc: Jason1 Lin, Bob Feng, Liming Gao, Yuwei Chen, Isaac W Oram,
Rangasai V Chaganty, Dakota Chiang
From: Jason1 Lin <jason1.lin@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3959
As per FIT BIOS Specification 1.2 Rules, the size bytes (3 bytes) /
reserved byte (1 byte) / CheckSum byte (1 byte) in type 2 are
must-be-zero (MBZ).
These bytes could be override for the other usages.
This change is used to support the Type 02 (ACM) Ver. 0x200.
Command:
[-S <StartupAcmAddress StartupAcmSize>|<StartupAcmGuid>]
[-I <StartupAcmFMS StartupAcmFMSMask>]
[-V <StartupAcmVersion>]
Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Dakota Chiang <dakota.chiang@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 183 ++++++++++++++++++--
Silicon/Intel/Tools/FitGen/FitGen.h | 2 +-
2 files changed, 165 insertions(+), 20 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index 01b4f82518..577ce48b10 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -55,6 +55,7 @@ typedef struct {
#define ACM_MODULE_FLAG_PREPRODUCTION 0x4000
#define ACM_MODULE_FLAG_DEBUG_SIGN 0x8000
+#define NIBBLES_TO_BYTE(A, B) (UINT8)(((A & (0x0F)) << 4) | (B & 0x0F))
typedef struct {
UINT16 ModuleType;
@@ -149,6 +150,20 @@ typedef struct {
ACM_PROCESSOR_ID ProcessorID[1];
} PROCESSOR_ID_LIST;
+typedef union {
+ struct {
+ UINT32 Stepping : 4;
+ UINT32 Model : 4;
+ UINT32 Family : 4;
+ UINT32 Type : 2;
+ UINT32 Reserved1 : 2;
+ UINT32 ExtendedModel : 4;
+ UINT32 ExtendedFamily: 8;
+ UINT32 Reserved2 : 4;
+ } Bits;
+ UINT32 Uint32;
+} PROCESSOR_ID;
+
#pragma pack ()
@@ -210,6 +225,7 @@ typedef struct {
#define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40
#define DEFAULT_FIT_ENTRY_VERSION 0x0100
+#define STARTUP_ACM_FIT_ENTRY_200_VERSION 0x0200
#define TOP_FLASH_ADDRESS (gFitTableContext.TopFlashAddressRemapValue)
@@ -247,6 +263,8 @@ typedef struct {
UINT8 *Buffer; // Used by OptionalModule only
UINT32 Size;
UINT32 Version; // Used by OptionalModule and PortModule only
+ UINT32 FMS; // Used by Entry Type 02 (ACM) Ver. 0x200 only
+ UINT32 FMSMask; // Used by Entry Type 02 (ACM) Ver. 0x200 only
} FIT_TABLE_CONTEXT_ENTRY;
typedef struct {
@@ -262,7 +280,7 @@ typedef struct {
UINT32 GlobalVersion;
UINT32 FitHeaderVersion;
FIT_TABLE_CONTEXT_ENTRY StartupAcm[MAX_STARTUP_ACM_ENTRY];
- UINT32 StartupAcmVersion;
+ UINT32 StartupAcmVersion[MAX_STARTUP_ACM_ENTRY];
FIT_TABLE_CONTEXT_ENTRY DiagnstAcm;
UINT32 DiagnstAcmVersion;
FIT_TABLE_CONTEXT_ENTRY BiosModule[MAX_BIOS_MODULE_ENTRY];
@@ -341,7 +359,7 @@ Returns:
"\t[-L <MicrocodeSlotSize> <MicrocodeFfsGuid>]\n"
"\t[-LF <MicrocodeSlotSize>]\n"
"\t[-I <BiosInfoGuid>]\n"
- "\t[-S <StartupAcmAddress StartupAcmSize>|<StartupAcmGuid>] [-V <StartupAcmVersion>]\n"
+ "\t[-S <StartupAcmAddress StartupAcmSize>|<StartupAcmGuid>] [-I <StartupAcmFMS StartupAcmFMSMask>] [-V <StartupAcmVersion>]\n"
"\t[-U <DiagnstAcmAddress>|<DiagnstAcmGuid>]\n"
"\t[-B <BiosModuleAddress BiosModuleSize>] [-B ...] [-V <BiosModuleVersion>]\n"
"\t[-M <MicrocodeAddress MicrocodeSize>] [-M ...]|[-U <MicrocodeFv MicrocodeBase>|<MicrocodeRegionOffset MicrocodeRegionSize>|<MicrocodeGuid>] [-V <MicrocodeVersion>]\n"
@@ -356,8 +374,11 @@ Returns:
printf ("\tFitTablePointerOffset - FIT table pointer offset. 0x%x as default. 0x18 for current soon to be obsoleted CPUs. User can set both.\n", DEFAULT_FIT_TABLE_POINTER_OFFSET);
printf ("\tBiosInfoGuid - Guid of BiosInfo Module. If this module exists, StartupAcm/Bios/Microcode can be optional.\n");
printf ("\tStartupAcmAddress - Address of StartupAcm.\n");
- printf ("\tStartupAcmSize - Size of StartupAcm.\n");
+ printf ("\tStartupAcmSize - The maximum size value that could place the StartupAcm in.\n");
printf ("\tStartupAcmGuid - Guid of StartupAcm Module, if StartupAcm is in a BiosModule, it will be excluded form that.\n");
+ printf ("\tStartupAcmFMS - Value of PROCESSOR ID (Family/Model/Stepping value called \"FMS\") - see detail on FIT spec (1.3).\n");
+ printf ("\tStartupAcmFMSMask - Value use for uCode (if it recognizes 0x200 Type2 entry) to do bitmask logic operation with CPU processor ID.\n");
+ printf ("\t If the result match to StartupAcmFMS, corresponding ACM will be loaded - see detail on FIT spec (1.3).\n");
printf ("\tDiagnstAcmAddress - Address of DiagnstAcm.\n");
printf ("\tDiagnstAcmGuid - Guid of DiagnstAcm Module, if DiagnstAcm is in a BiosModule, it will be excluded from that.\n");
printf ("\tBiosModuleAddress - Address of BiosModule. User should ensure there is no overlap.\n");
@@ -1155,6 +1176,9 @@ Returns:
Error (NULL, 0, 0, "-I Parameter incorrect, too many StartupAcm!", NULL);
return 0;
}
+ //
+ // NOTE: BIOS INFO structure only support the default FIT entry format.
+ //
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FIT_TABLE_TYPE_STARTUP_ACM;
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = (UINT32)BiosInfoStruct[BiosInfoIndex].Size;
@@ -1392,7 +1416,37 @@ Returns:
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = FileSize;
//
- // 1.1 StartupAcm version
+ // 1.1 Support 0x200 StartupAcm Information
+ // With the -I parameter should assign the type 2 entry with 0x200 version format
+ //
+ if ((Index + 1 >= argc) ||
+ ((strcmp (argv[Index], "-I") != 0) &&
+ (strcmp (argv[Index], "-i") != 0)) ) {
+ //
+ // Bypass
+ //
+ gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] = gFitTableContext.GlobalVersion;
+ } else {
+ if (Index + 2 >= argc) {
+ //
+ // Should get two input value, but not sufficient
+ //
+ Error (NULL, 0, 0, "-I Parameter incorrect, Require two inputs value!", NULL);
+ return 0;
+ } else {
+ //
+ // With the -I parameter should assign the type 2 entry version as 0x200 format
+ //
+ gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] = STARTUP_ACM_FIT_ENTRY_200_VERSION;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMS = (UINT32)xtoi (argv[Index + 1]);
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMSMask = (UINT32)xtoi (argv[Index + 2]);
+
+ Index += 3;
+ }
+ }
+
+ //
+ // 1.2 StartupAcm version
//
if ((Index + 1 >= argc) ||
((strcmp (argv[Index], "-V") != 0) &&
@@ -1400,18 +1454,17 @@ Returns:
//
// Bypass
//
- gFitTableContext.StartupAcmVersion = gFitTableContext.GlobalVersion;
} else {
//
// Get offset from parameter
//
- gFitTableContext.StartupAcmVersion = xtoi (argv[Index + 1]);
+ gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] = xtoi (argv[Index + 1]);
Index += 2;
}
gFitTableContext.StartupAcmNumber ++;
gFitTableContext.FitEntryNumber ++;
- }
+ };
//
// 1.5. DiagnosticsAcm
@@ -2185,7 +2238,7 @@ Returns:
printf ("Total FIT Entry number: 0x%x\n", gFitTableContext.FitEntryNumber);
printf ("FitHeader version: 0x%04x\n", gFitTableContext.FitHeaderVersion);
for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {
- printf ("StartupAcm[%d] - (0x%08x, 0x%08x, 0x%04x)\n", Index, gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size, gFitTableContext.StartupAcmVersion);
+ printf ("StartupAcm[%d] - (0x%08x, 0x%08x, 0x%04x)\n", Index, gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size, gFitTableContext.StartupAcmVersion[Index]);
}
if (gFitTableContext.DiagnstAcm.Address != 0) {
printf ("DiagnosticAcm - (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.DiagnstAcm.Address, gFitTableContext.DiagnstAcm.Size, gFitTableContext.DiagnstAcmVersion);
@@ -2774,6 +2827,8 @@ Returns:
UINTN SubIndex;
FIT_TABLE_CONTEXT_ENTRY TempContextEntry;
FIRMWARE_INTERFACE_TABLE_ENTRY TempTableEntry;
+ PROCESSOR_ID FMS;
+ PROCESSOR_ID FMSMask;
//
// 1. FitPointer
@@ -2825,16 +2880,30 @@ Returns:
// 4. StartupAcm
//
for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {
- FitEntrySizeValue = 0; // gFitTableContext.StartupAcm.Size / 16
- FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;
- FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
- FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
- FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
- FitEntry[FitIndex].Rsvd = 0;
- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;
- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;
- FitEntry[FitIndex].C_V = 0;
- FitEntry[FitIndex].Checksum = 0;
+ if (gFitTableContext.StartupAcmVersion[Index] == STARTUP_ACM_FIT_ENTRY_200_VERSION) {
+ FMS.Uint32 = gFitTableContext.StartupAcm[Index].FMS;
+ FMSMask.Uint32 = gFitTableContext.StartupAcm[Index].FMSMask;
+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;
+ FitEntry[FitIndex].Size[0] = NIBBLES_TO_BYTE (FMS.Bits.Family, FMS.Bits.Model);
+ FitEntry[FitIndex].Size[1] = NIBBLES_TO_BYTE (FMS.Bits.ExtendedModel, FMS.Bits.Type);
+ FitEntry[FitIndex].Size[2] = NIBBLES_TO_BYTE (FMSMask.Bits.Family, FMSMask.Bits.Model);
+ FitEntry[FitIndex].Rsvd = NIBBLES_TO_BYTE (FMSMask.Bits.ExtendedModel, FMSMask.Bits.Type);
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion[Index];
+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;
+ FitEntry[FitIndex].C_V = 0;
+ FitEntry[FitIndex].Checksum = NIBBLES_TO_BYTE (FMSMask.Bits.ExtendedFamily, FMS.Bits.ExtendedFamily);
+ } else {
+ FitEntrySizeValue = 0; // gFitTableContext.StartupAcm.Size / 16
+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;
+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;
+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);
+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);
+ FitEntry[FitIndex].Rsvd = 0;
+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion[Index];
+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;
+ FitEntry[FitIndex].C_V = 0;
+ FitEntry[FitIndex].Checksum = 0;
+ }
FitIndex++;
}
@@ -3135,6 +3204,69 @@ Returns:
return FvRecoveryFileSize;
}
+void
+GetFMSFromFitEntry (
+ IN FIRMWARE_INTERFACE_TABLE_ENTRY FitEntry,
+ IN OUT PROCESSOR_ID *FMS,
+ IN OUT PROCESSOR_ID *FMSMask
+ )
+/*++
+
+Routine Description:
+
+ Get FMS information from FIT Entry.
+
+ Note: Since FIT entry not record all the processor ID information.
+ The value would not the same as the real value.
+
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+ | Byte | 15 | 14 | 13:12 | 11 |
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+ |Bit Fields| [7:4] | [3:0] | [7:7] | [6:0] | [7:4] | [3:0] | [7:4] | [3:0] |
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+ | Ver. 100 | Checksum | C_V | Type | Version | Reserved |
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+ | Ver. 200 | FMSMask | FMS | C_V | Type | Version | FMSMask | FMSMask |
+ | | ExtFamily | ExtFamily | | | | ExtModel | Type |
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+ | Byte | 10 | 9 | 8 | 7:0 |
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+ |Bit Fields| [7:4] | [3:0] | [7:4] | [3:0] | [7:4] | [3:0] | [7:4] | [3:0] |
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+ | Ver. 100 | Size[2] | Size[1] | Size[0] | Address |
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+ | Ver. 200 | FMSMask | FMSMask | FMS | FMS | FMS | FMS | Address |
+ | | Family | Model | ExtModel | Type | Family | Model | |
+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+
+
+
+Arguments:
+
+ FitEntry - FIT entry information.
+ FMS - Processor ID information.
+ FMSMask - Processor ID mask information.
+
+Returns:
+ None
+
+--*/
+{
+
+ FMS->Bits.Family = (FitEntry.Size[0] & 0xF0) >> 4;
+ FMS->Bits.Model = (FitEntry.Size[0] & 0x0F);
+ FMS->Bits.ExtendedModel = (FitEntry.Size[1] & 0xF0) >> 4;
+ FMS->Bits.Type = (FitEntry.Size[1] & 0x0F);
+ FMS->Bits.ExtendedFamily = (FitEntry.Checksum & 0x0F);
+
+ FMSMask->Bits.Family = (FitEntry.Size[2] & 0xF0) >> 4;
+ FMSMask->Bits.Model = (FitEntry.Size[2] & 0x0F);
+ FMSMask->Bits.ExtendedModel = (FitEntry.Rsvd & 0xF0) >> 4;
+ FMSMask->Bits.Type = (FitEntry.Rsvd & 0x0F);
+ FMSMask->Bits.ExtendedFamily = (FitEntry.Checksum & 0xF0) >> 4;
+}
+
UINT32
GetFitEntryInfo (
IN UINT8 *FvBuffer,
@@ -3161,6 +3293,11 @@ Returns:
UINT32 FitEntrySizeValue;
UINT32 FitIndex;
UINT32 FitTableOffset;
+ PROCESSOR_ID FMS;
+ PROCESSOR_ID FMSMask;
+
+ FMS.Uint32 = 0;
+ FMSMask.Uint32 = 0;
//
// 1. FitPointer
@@ -3202,7 +3339,15 @@ Returns:
break;
case FIT_TABLE_TYPE_STARTUP_ACM:
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)FitEntry[FitIndex].Address;
- gFitTableContext.StartupAcmVersion = FitEntry[FitIndex].Version;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = FitEntrySizeValue;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FitEntry[FitIndex].Type;
+ gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] = FitEntry[FitIndex].Version;
+ if (gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] == STARTUP_ACM_FIT_ENTRY_200_VERSION) {
+ GetFMSFromFitEntry (FitEntry[FitIndex], &FMS, &FMSMask);
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMS = FMS.Uint32;
+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMSMask = FMSMask.Uint32;
+ }
+ gFitTableContext.StartupAcmNumber++;
break;
case FIT_TABLE_TYPE_BIOS_MODULE:
gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h b/Silicon/Intel/Tools/FitGen/FitGen.h
index b7de0a6b2d..80a1423ceb 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.h
+++ b/Silicon/Intel/Tools/FitGen/FitGen.h
@@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Utility version information
//
#define UTILITY_MAJOR_VERSION 0
-#define UTILITY_MINOR_VERSION 65
+#define UTILITY_MINOR_VERSION 66
#define UTILITY_DATE __DATE__
//
--
2.37.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool
2022-07-01 15:10 [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Lin, Jason1
2022-07-01 15:10 ` [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage Lin, Jason1
2022-07-01 15:10 ` [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version Lin, Jason1
@ 2022-07-01 18:34 ` Oram, Isaac W
2022-07-04 1:35 ` [edk2-devel] " Yuwei Chen
2022-07-05 13:06 ` Bob Feng
4 siblings, 0 replies; 10+ messages in thread
From: Oram, Isaac W @ 2022-07-01 18:34 UTC (permalink / raw)
To: Lin, Jason1, devel@edk2.groups.io
Cc: Feng, Bob C, Gao, Liming, Chen, Christine, Chaganty, Rangasai V,
Chiang, Dakota
Reviewed-by: Isaac W Oram <isaac.w.oram@intel.com>
-----Original Message-----
From: Lin, Jason1 <jason1.lin@intel.com>
Sent: Friday, July 1, 2022 8:10 AM
To: devel@edk2.groups.io
Cc: Lin, Jason1 <jason1.lin@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Chiang, Dakota <dakota.chiang@intel.com>
Subject: [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool
From: Jason1 Lin <jason1.lin@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
Within current FitGen tool there had limitation only allow one S-ACM to generate the Type 2 entry.
This code change is used to support multiple type 2 entries up to 0x20.
Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Dakota Chiang <dakota.chiang@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 89 +++++++++++--------- Silicon/Intel/Tools/FitGen/FitGen.h | 4 +-
2 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index 4de72ea422..eac8fa8715 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -2,7 +2,7 @@
This utility is part of build process for IA32/X64 FD. It generates FIT table. -Copyright (c) 2010-2021, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2010-2022, Intel Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -204,6 +204,7 @@ typedef struct {
#define MAX_BIOS_MODULE_ENTRY 0x20 #define MAX_MICROCODE_ENTRY 0x20+#define MAX_STARTUP_ACM_ENTRY 0x20 #define MAX_OPTIONAL_ENTRY 0x20 #define MAX_PORT_ENTRY 0x20 @@ -255,11 +256,12 @@ typedef struct {
UINT32 FitEntryNumber; UINT32 BiosModuleNumber; UINT32 MicrocodeNumber;+ UINT32 StartupAcmNumber; UINT32 OptionalModuleNumber; UINT32 PortModuleNumber; UINT32 GlobalVersion; UINT32 FitHeaderVersion;- FIT_TABLE_CONTEXT_ENTRY StartupAcm;+ FIT_TABLE_CONTEXT_ENTRY StartupAcm[MAX_STARTUP_ACM_ENTRY]; UINT32 StartupAcmVersion; FIT_TABLE_CONTEXT_ENTRY DiagnstAcm; UINT32 DiagnstAcmVersion;@@ -1149,14 +1151,15 @@ Returns:
Error (NULL, 0, 0, "-I Parameter incorrect, Header Type unsupported!", NULL); return 0; case FIT_TABLE_TYPE_STARTUP_ACM:- if (gFitTableContext.StartupAcm.Type != 0) {- Error (NULL, 0, 0, "-I Parameter incorrect, Duplicated StartupAcm!", NULL);+ if (gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {+ Error (NULL, 0, 0, "-I Parameter incorrect, too many StartupAcm!", NULL); return 0; }- gFitTableContext.StartupAcm.Type = FIT_TABLE_TYPE_STARTUP_ACM;- gFitTableContext.StartupAcm.Address = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;- gFitTableContext.StartupAcm.Size = (UINT32)BiosInfoStruct[BiosInfoIndex].Size;- gFitTableContext.StartupAcmVersion = BiosInfoStruct[BiosInfoIndex].Version;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FIT_TABLE_TYPE_STARTUP_ACM;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = (UINT32)BiosInfoStruct[BiosInfoIndex].Size;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Version = BiosInfoStruct[BiosInfoIndex].Version;+ gFitTableContext.StartupAcmNumber ++; gFitTableContext.FitEntryNumber ++; break; case FIT_TABLE_TYPE_DIAGNST_ACM:@@ -1351,16 +1354,15 @@ Returns:
// // 1. StartupAcm //- do {+ while (TRUE) { if ((Index + 1 >= argc) || ((strcmp (argv[Index], "-S") != 0) && (strcmp (argv[Index], "-s") != 0)) ) {- if (BiosInfoExist && (gFitTableContext.StartupAcm.Type == FIT_TABLE_TYPE_STARTUP_ACM)) {- break;+ if (gFitTableContext.StartupAcmNumber == 0) {+ printf ("-S not found. WARNING!\n"); } // Error (NULL, 0, 0, "-S Parameter incorrect, expect -S!", NULL); // return 0;- printf ("-S not found. WARNING!\n"); break; } if (IsGuidData (argv[Index + 1], &Guid)) {@@ -1381,14 +1383,13 @@ Returns:
FileSize = xtoi (argv[Index + 2]); Index += 3; }- if (gFitTableContext.StartupAcm.Type != 0) {- Error (NULL, 0, 0, "-S Parameter incorrect, Duplicated StartupAcm!", NULL);+ if (gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {+ Error (NULL, 0, 0, "-S Parameter incorrect, too many StartupAcm!", NULL); return 0; }- gFitTableContext.StartupAcm.Type = FIT_TABLE_TYPE_STARTUP_ACM;- gFitTableContext.StartupAcm.Address = (UINT32) (UINTN) FileBuffer;- gFitTableContext.StartupAcm.Size = FileSize;- gFitTableContext.FitEntryNumber ++;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FIT_TABLE_TYPE_STARTUP_ACM;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32) (UINTN) FileBuffer;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = FileSize; // // 1.1 StartupAcm version@@ -1407,7 +1408,10 @@ Returns:
gFitTableContext.StartupAcmVersion = xtoi (argv[Index + 1]); Index += 2; }- } while (FALSE);++ gFitTableContext.StartupAcmNumber ++;+ gFitTableContext.FitEntryNumber ++;+ } // // 1.5. DiagnosticsAcm@@ -1890,7 +1894,9 @@ Returns:
// // Final: Check StartupAcm in BiosModule. //- CheckOverlap (gFitTableContext.StartupAcm.Address, gFitTableContext.StartupAcm.Size);+ for (Index = 0; Index < (INTN)gFitTableContext.StartupAcmNumber; Index++) {+ CheckOverlap (gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size);+ } FitEntryNumber = gFitTableContext.FitEntryNumber; for (Index = 0; Index < (INTN)gFitTableContext.OptionalModuleNumber; Index++) { if ((gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_POLICY) ||@@ -2178,8 +2184,8 @@ Returns:
} printf ("Total FIT Entry number: 0x%x\n", gFitTableContext.FitEntryNumber); printf ("FitHeader version: 0x%04x\n", gFitTableContext.FitHeaderVersion);- if (gFitTableContext.StartupAcm.Address != 0) {- printf ("StartupAcm - (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.StartupAcm.Address, gFitTableContext.StartupAcm.Size, gFitTableContext.StartupAcmVersion);+ for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {+ printf ("StartupAcm[%d] - (0x%08x, 0x%08x, 0x%04x)\n", Index, gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size, gFitTableContext.StartupAcmVersion); } if (gFitTableContext.DiagnstAcm.Address != 0) { printf ("DiagnosticAcm - (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.DiagnstAcm.Address, gFitTableContext.DiagnstAcm.Size, gFitTableContext.DiagnstAcmVersion);@@ -2809,8 +2815,8 @@ Returns:
// // 4. StartupAcm //- if (gFitTableContext.StartupAcm.Address != 0) {- FitEntry[FitIndex].Address = gFitTableContext.StartupAcm.Address;+ for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address; *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.StartupAcm.Size / 16; FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion; FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;@@ -3110,7 +3116,7 @@ GetFitEntryInfo (
Routine Description: - Fill the FIT table information to Fvrecovery+ Get the FIT table information from Fvrecovery Arguments: @@ -3164,8 +3170,8 @@ Returns:
gFitTableContext.MicrocodeNumber ++; break; case FIT_TABLE_TYPE_STARTUP_ACM:- gFitTableContext.StartupAcm.Address = (UINT32)FitEntry[FitIndex].Address;- gFitTableContext.StartupAcmVersion = FitEntry[FitIndex].Version;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)FitEntry[FitIndex].Address;+ gFitTableContext.StartupAcmVersion = FitEntry[FitIndex].Version; break; case FIT_TABLE_TYPE_BIOS_MODULE: gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;@@ -3232,6 +3238,7 @@ Returns:
UINT32 FdFileSize; UINT8 *AcmBuffer;+ INTN Index; UINT32 FixedFitLocation; FileBufferRaw = NULL;@@ -3323,22 +3330,23 @@ Returns:
// // Get ACM buffer //- if (gFitTableContext.StartupAcm.Address != 0) {- AcmBuffer = FLASH_TO_MEMORY(gFitTableContext.StartupAcm.Address, FdFileBuffer, FdFileSize);- if ((AcmBuffer < FdFileBuffer) || (AcmBuffer + gFitTableContext.StartupAcm.Size > FdFileBuffer + FdFileSize)) {- printf ("ACM out of range - can not validate it\n");- AcmBuffer = NULL;- }+ for (Index = 0; Index < (INTN)gFitTableContext.StartupAcmNumber; Index ++) {+ if (gFitTableContext.StartupAcm[Index].Address != 0) {+ AcmBuffer = FLASH_TO_MEMORY(gFitTableContext.StartupAcm[Index].Address, FdFileBuffer, FdFileSize);+ if ((AcmBuffer < FdFileBuffer) || (AcmBuffer + gFitTableContext.StartupAcm[Index].Size > FdFileBuffer + FdFileSize)) {+ printf ("ACM out of range - can not validate it\n");+ AcmBuffer = NULL;+ } - if (AcmBuffer != NULL) {- if (CheckAcm ((ACM_FORMAT *)AcmBuffer, gFitTableContext.StartupAcm.Size)) {- DumpAcm ((ACM_FORMAT *)AcmBuffer);- } else {- Status = STATUS_ERROR;- goto exitFunc;+ if (AcmBuffer != NULL) {+ if (CheckAcm ((ACM_FORMAT *)AcmBuffer, gFitTableContext.StartupAcm[Index].Size)) {+ DumpAcm ((ACM_FORMAT *)AcmBuffer);+ } else {+ Status = STATUS_ERROR;+ goto exitFunc;+ } } }- } //@@ -3576,4 +3584,3 @@ Returns:
return u; }-diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h b/Silicon/Intel/Tools/FitGen/FitGen.h
index 5add6a8870..b7de0a6b2d 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.h
+++ b/Silicon/Intel/Tools/FitGen/FitGen.h
@@ -1,7 +1,7 @@
/**@file Definitions for the FitGen utility. -Copyright (c) 2010-2020, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2010-2022, Intel Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Utility version information // #define UTILITY_MAJOR_VERSION 0-#define UTILITY_MINOR_VERSION 64+#define UTILITY_MINOR_VERSION 65 #define UTILITY_DATE __DATE__ //--
2.37.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage
2022-07-01 15:10 ` [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage Lin, Jason1
@ 2022-07-01 18:34 ` Oram, Isaac W
2022-07-04 1:37 ` Yuwei Chen
1 sibling, 0 replies; 10+ messages in thread
From: Oram, Isaac W @ 2022-07-01 18:34 UTC (permalink / raw)
To: Lin, Jason1, devel@edk2.groups.io
Cc: Feng, Bob C, Gao, Liming, Chen, Christine, Chaganty, Rangasai V,
Chiang, Dakota
Reviewed-by: Isaac W Oram <isaac.w.oram@intel.com>
-----Original Message-----
From: Lin, Jason1 <jason1.lin@intel.com>
Sent: Friday, July 1, 2022 8:10 AM
To: devel@edk2.groups.io
Cc: Lin, Jason1 <jason1.lin@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Chiang, Dakota <dakota.chiang@intel.com>
Subject: [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage
From: Jason1 Lin <jason1.lin@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
FitGen tool exists lots of typecasting and pointer usage.
This code change is used to reduce these in FillFitTable () and GetFitEntryInfo ().
To make code more clearly and easy to read.
Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Dakota Chiang <dakota.chiang@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 125 ++++++++++++--------
1 file changed, 78 insertions(+), 47 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index eac8fa8715..01b4f82518 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -2768,6 +2768,7 @@ Returns:
{ FIRMWARE_INTERFACE_TABLE_ENTRY *FitEntry; UINT32 FitIndex;+ UINT32 FitEntrySizeValue; UINT32 Index; UINT8 Checksum; UINTN SubIndex;@@ -2788,27 +2789,35 @@ Returns:
// // 2. FitHeader //- FitEntry[FitIndex].Address = *(UINT64 *)"_FIT_ ";- *(UINT32 *)&FitEntry[FitIndex].Size[0] = gFitTableContext.FitEntryNumber;- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.FitHeaderVersion;- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_HEADER;- FitEntry[FitIndex].C_V = 1;+ FitEntrySizeValue = gFitTableContext.FitEntryNumber;+ FitEntry[FitIndex].Address = *(UINT64 *)"_FIT_ ";+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.FitHeaderVersion;+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_HEADER;+ FitEntry[FitIndex].C_V = 1; // // Checksum will be updated later... //- FitEntry[FitIndex].Checksum = 0;+ FitEntry[FitIndex].Checksum = 0; // // 3. Microcode // FitIndex++; for (Index = 0; Index < gFitTableContext.MicrocodeNumber; Index++) {- FitEntry[FitIndex].Address = gFitTableContext.Microcode[Index].Address;- *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.Microcode[Index].Size / 16;- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.MicrocodeVersion;- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_MICROCODE;- FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = 0; // gFitTableContext.Microcode[Index].Size / 16+ FitEntry[FitIndex].Address = gFitTableContext.Microcode[Index].Address;+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.MicrocodeVersion;+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_MICROCODE;+ FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0; FitIndex++; } @@ -2816,12 +2825,16 @@ Returns:
// 4. StartupAcm // for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {- FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;- *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.StartupAcm.Size / 16;- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;- FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = 0; // gFitTableContext.StartupAcm.Size / 16+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;+ FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0; FitIndex++; } @@ -2829,19 +2842,23 @@ Returns:
// 4.5. DiagnosticAcm // if (gFitTableContext.DiagnstAcm.Address != 0) {- FitEntry[FitIndex].Address = gFitTableContext.DiagnstAcm.Address;- *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0;- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.DiagnstAcmVersion;- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_DIAGNST_ACM;- FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = 0; // gFitTableContext.DiagnstAcmVersion.Size / 16+ FitEntry[FitIndex].Address = gFitTableContext.DiagnstAcm.Address;+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.DiagnstAcmVersion;+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_DIAGNST_ACM;+ FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0; FitIndex++; } // // 5. BiosModule // //- // BiosModule segments order needs to be put from low addresss to high for Btg requirement+ // BiosModule segments order needs to be put from low address to high for Btg requirement // if (gFitTableContext.BiosModuleNumber > 1) { for (Index = 0; Index < (UINTN)gFitTableContext.BiosModuleNumber - 1; Index++){@@ -2855,12 +2872,16 @@ Returns:
} } for (Index = 0; Index < gFitTableContext.BiosModuleNumber; Index++) {- FitEntry[FitIndex].Address = gFitTableContext.BiosModule[Index].Address;- *(UINT32 *)&FitEntry[FitIndex].Size[0] = gFitTableContext.BiosModule[Index].Size / 16;- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.BiosModuleVersion;- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_BIOS_MODULE;- FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = gFitTableContext.BiosModule[Index].Size / 16;+ FitEntry[FitIndex].Address = gFitTableContext.BiosModule[Index].Address;+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.BiosModuleVersion;+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_BIOS_MODULE;+ FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0; FitIndex++; } @@ -2868,15 +2889,18 @@ Returns:
// 6. Optional module // for (Index = 0; Index < gFitTableContext.OptionalModuleNumber; Index++) {- FitEntry[FitIndex].Address = gFitTableContext.OptionalModule[Index].Address;- *(UINT32 *)&FitEntry[FitIndex].Size[0] = gFitTableContext.OptionalModule[Index].Size;- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.OptionalModule[Index].Version;- FitEntry[FitIndex].Type = (UINT8)gFitTableContext.OptionalModule[Index].Type;+ FitEntrySizeValue = gFitTableContext.OptionalModule[Index].Size;+ FitEntry[FitIndex].Address = gFitTableContext.OptionalModule[Index].Address;+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.OptionalModule[Index].Version;+ FitEntry[FitIndex].Type = (UINT8)gFitTableContext.OptionalModule[Index].Type; if (FitEntry[FitIndex].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT) {- FitEntry[FitIndex].Rsvd = (UINT8)gFitTableContext.OptionalModule[Index].SubType;+ FitEntry[FitIndex].Rsvd = (UINT8)gFitTableContext.OptionalModule[Index].SubType; }- FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+ FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0; FitIndex++; } @@ -2884,12 +2908,16 @@ Returns:
// 7. Port module // for (Index = 0; Index < gFitTableContext.PortModuleNumber; Index++) {- FitEntry[FitIndex].Address = gFitTableContext.PortModule[Index].Address + ((UINT64)gFitTableContext.PortModule[Index].Size << 32);- *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0;- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.PortModule[Index].Version;- FitEntry[FitIndex].Type = (UINT8)gFitTableContext.PortModule[Index].Type;- FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = 0;+ FitEntry[FitIndex].Address = gFitTableContext.PortModule[Index].Address + ((UINT64)gFitTableContext.PortModule[Index].Size << 32);+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.PortModule[Index].Version;+ FitEntry[FitIndex].Type = (UINT8)gFitTableContext.PortModule[Index].Type;+ FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0; FitIndex++; } @@ -3130,6 +3158,7 @@ Returns:
--*/ { FIRMWARE_INTERFACE_TABLE_ENTRY *FitEntry;+ UINT32 FitEntrySizeValue; UINT32 FitIndex; UINT32 FitTableOffset; @@ -3155,7 +3184,8 @@ Returns:
if (FitEntry[FitIndex].Type != FIT_TABLE_TYPE_HEADER) { return 0; }- gFitTableContext.FitEntryNumber = *(UINT32 *)&FitEntry[FitIndex].Size[0];+ FitEntrySizeValue = (((UINT32)FitEntry[FitIndex].Size[2]) << 16) + (((UINT32)FitEntry[FitIndex].Size[1]) << 8) + ((UINT32)FitEntry[FitIndex].Size[0]);+ gFitTableContext.FitEntryNumber = FitEntrySizeValue; gFitTableContext.FitHeaderVersion = FitEntry[FitIndex].Version; //@@ -3163,6 +3193,7 @@ Returns:
// FitIndex++; for (; FitIndex < gFitTableContext.FitEntryNumber; FitIndex++) {+ FitEntrySizeValue = (((UINT32)FitEntry[FitIndex].Size[2]) << 16) + (((UINT32)FitEntry[FitIndex].Size[1]) << 8) + ((UINT32)FitEntry[FitIndex].Size[0]); switch (FitEntry[FitIndex].Type) { case FIT_TABLE_TYPE_MICROCODE: gFitTableContext.Microcode[gFitTableContext.MicrocodeNumber].Address = (UINT32)FitEntry[FitIndex].Address;@@ -3175,7 +3206,7 @@ Returns:
break; case FIT_TABLE_TYPE_BIOS_MODULE: gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;- gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Size = *(UINT32 *)&FitEntry[FitIndex].Size[0] * 16;+ gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Size = FitEntrySizeValue * 16; gFitTableContext.BiosModuleVersion = FitEntry[FitIndex].Version; gFitTableContext.BiosModuleNumber ++; break;@@ -3192,7 +3223,7 @@ Returns:
// Not Port Configure, pass through default: // Others gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;- gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Size = *(UINT32 *)&FitEntry[FitIndex].Size[0];+ gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Size = FitEntrySizeValue; gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Version = FitEntry[FitIndex].Version; gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber].Type = FitEntry[FitIndex].Type; gFitTableContext.OptionalModuleNumber ++;--
2.37.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version
2022-07-01 15:10 ` [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version Lin, Jason1
@ 2022-07-01 18:34 ` Oram, Isaac W
2022-07-04 1:37 ` Yuwei Chen
1 sibling, 0 replies; 10+ messages in thread
From: Oram, Isaac W @ 2022-07-01 18:34 UTC (permalink / raw)
To: Lin, Jason1, devel@edk2.groups.io
Cc: Feng, Bob C, Gao, Liming, Chen, Christine, Chaganty, Rangasai V,
Chiang, Dakota
Reviewed-by: Isaac W Oram <isaac.w.oram@intel.com>
-----Original Message-----
From: Lin, Jason1 <jason1.lin@intel.com>
Sent: Friday, July 1, 2022 8:10 AM
To: devel@edk2.groups.io
Cc: Lin, Jason1 <jason1.lin@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Chiang, Dakota <dakota.chiang@intel.com>
Subject: [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version
From: Jason1 Lin <jason1.lin@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3959
As per FIT BIOS Specification 1.2 Rules, the size bytes (3 bytes) / reserved byte (1 byte) / CheckSum byte (1 byte) in type 2 are must-be-zero (MBZ).
These bytes could be override for the other usages.
This change is used to support the Type 02 (ACM) Ver. 0x200.
Command:
[-S <StartupAcmAddress StartupAcmSize>|<StartupAcmGuid>] [-I <StartupAcmFMS StartupAcmFMSMask>] [-V <StartupAcmVersion>]
Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Dakota Chiang <dakota.chiang@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 183 ++++++++++++++++++--
Silicon/Intel/Tools/FitGen/FitGen.h | 2 +-
2 files changed, 165 insertions(+), 20 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index 01b4f82518..577ce48b10 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -55,6 +55,7 @@ typedef struct {
#define ACM_MODULE_FLAG_PREPRODUCTION 0x4000 #define ACM_MODULE_FLAG_DEBUG_SIGN 0x8000 +#define NIBBLES_TO_BYTE(A, B) (UINT8)(((A & (0x0F)) << 4) | (B & 0x0F)) typedef struct { UINT16 ModuleType;@@ -149,6 +150,20 @@ typedef struct {
ACM_PROCESSOR_ID ProcessorID[1]; } PROCESSOR_ID_LIST; +typedef union {+ struct {+ UINT32 Stepping : 4;+ UINT32 Model : 4;+ UINT32 Family : 4;+ UINT32 Type : 2;+ UINT32 Reserved1 : 2;+ UINT32 ExtendedModel : 4;+ UINT32 ExtendedFamily: 8;+ UINT32 Reserved2 : 4;+ } Bits;+ UINT32 Uint32;+} PROCESSOR_ID;+ #pragma pack () @@ -210,6 +225,7 @@ typedef struct {
#define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40 #define DEFAULT_FIT_ENTRY_VERSION 0x0100+#define STARTUP_ACM_FIT_ENTRY_200_VERSION 0x0200 #define TOP_FLASH_ADDRESS (gFitTableContext.TopFlashAddressRemapValue) @@ -247,6 +263,8 @@ typedef struct {
UINT8 *Buffer; // Used by OptionalModule only UINT32 Size; UINT32 Version; // Used by OptionalModule and PortModule only+ UINT32 FMS; // Used by Entry Type 02 (ACM) Ver. 0x200 only+ UINT32 FMSMask; // Used by Entry Type 02 (ACM) Ver. 0x200 only } FIT_TABLE_CONTEXT_ENTRY; typedef struct {@@ -262,7 +280,7 @@ typedef struct {
UINT32 GlobalVersion; UINT32 FitHeaderVersion; FIT_TABLE_CONTEXT_ENTRY StartupAcm[MAX_STARTUP_ACM_ENTRY];- UINT32 StartupAcmVersion;+ UINT32 StartupAcmVersion[MAX_STARTUP_ACM_ENTRY]; FIT_TABLE_CONTEXT_ENTRY DiagnstAcm; UINT32 DiagnstAcmVersion; FIT_TABLE_CONTEXT_ENTRY BiosModule[MAX_BIOS_MODULE_ENTRY];@@ -341,7 +359,7 @@ Returns:
"\t[-L <MicrocodeSlotSize> <MicrocodeFfsGuid>]\n" "\t[-LF <MicrocodeSlotSize>]\n" "\t[-I <BiosInfoGuid>]\n"- "\t[-S <StartupAcmAddress StartupAcmSize>|<StartupAcmGuid>] [-V <StartupAcmVersion>]\n"+ "\t[-S <StartupAcmAddress StartupAcmSize>|<StartupAcmGuid>] [-I <StartupAcmFMS StartupAcmFMSMask>] [-V <StartupAcmVersion>]\n" "\t[-U <DiagnstAcmAddress>|<DiagnstAcmGuid>]\n" "\t[-B <BiosModuleAddress BiosModuleSize>] [-B ...] [-V <BiosModuleVersion>]\n" "\t[-M <MicrocodeAddress MicrocodeSize>] [-M ...]|[-U <MicrocodeFv MicrocodeBase>|<MicrocodeRegionOffset MicrocodeRegionSize>|<MicrocodeGuid>] [-V <MicrocodeVersion>]\n"@@ -356,8 +374,11 @@ Returns:
printf ("\tFitTablePointerOffset - FIT table pointer offset. 0x%x as default. 0x18 for current soon to be obsoleted CPUs. User can set both.\n", DEFAULT_FIT_TABLE_POINTER_OFFSET); printf ("\tBiosInfoGuid - Guid of BiosInfo Module. If this module exists, StartupAcm/Bios/Microcode can be optional.\n"); printf ("\tStartupAcmAddress - Address of StartupAcm.\n");- printf ("\tStartupAcmSize - Size of StartupAcm.\n");+ printf ("\tStartupAcmSize - The maximum size value that could place the StartupAcm in.\n"); printf ("\tStartupAcmGuid - Guid of StartupAcm Module, if StartupAcm is in a BiosModule, it will be excluded form that.\n");+ printf ("\tStartupAcmFMS - Value of PROCESSOR ID (Family/Model/Stepping value called \"FMS\") - see detail on FIT spec (1.3).\n");+ printf ("\tStartupAcmFMSMask - Value use for uCode (if it recognizes 0x200 Type2 entry) to do bitmask logic operation with CPU processor ID.\n");+ printf ("\t If the result match to StartupAcmFMS, corresponding ACM will be loaded - see detail on FIT spec (1.3).\n"); printf ("\tDiagnstAcmAddress - Address of DiagnstAcm.\n"); printf ("\tDiagnstAcmGuid - Guid of DiagnstAcm Module, if DiagnstAcm is in a BiosModule, it will be excluded from that.\n"); printf ("\tBiosModuleAddress - Address of BiosModule. User should ensure there is no overlap.\n");@@ -1155,6 +1176,9 @@ Returns:
Error (NULL, 0, 0, "-I Parameter incorrect, too many StartupAcm!", NULL); return 0; }+ //+ // NOTE: BIOS INFO structure only support the default FIT entry format.+ // gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FIT_TABLE_TYPE_STARTUP_ACM; gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)BiosInfoStruct[BiosInfoIndex].Address; gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = (UINT32)BiosInfoStruct[BiosInfoIndex].Size;@@ -1392,7 +1416,37 @@ Returns:
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = FileSize; //- // 1.1 StartupAcm version+ // 1.1 Support 0x200 StartupAcm Information+ // With the -I parameter should assign the type 2 entry with 0x200 version format+ //+ if ((Index + 1 >= argc) ||+ ((strcmp (argv[Index], "-I") != 0) &&+ (strcmp (argv[Index], "-i") != 0)) ) {+ //+ // Bypass+ //+ gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] = gFitTableContext.GlobalVersion;+ } else {+ if (Index + 2 >= argc) {+ //+ // Should get two input value, but not sufficient+ //+ Error (NULL, 0, 0, "-I Parameter incorrect, Require two inputs value!", NULL);+ return 0;+ } else {+ //+ // With the -I parameter should assign the type 2 entry version as 0x200 format+ //+ gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] = STARTUP_ACM_FIT_ENTRY_200_VERSION;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMS = (UINT32)xtoi (argv[Index + 1]);+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMSMask = (UINT32)xtoi (argv[Index + 2]);++ Index += 3;+ }+ }++ //+ // 1.2 StartupAcm version // if ((Index + 1 >= argc) || ((strcmp (argv[Index], "-V") != 0) &&@@ -1400,18 +1454,17 @@ Returns:
// // Bypass //- gFitTableContext.StartupAcmVersion = gFitTableContext.GlobalVersion; } else { // // Get offset from parameter //- gFitTableContext.StartupAcmVersion = xtoi (argv[Index + 1]);+ gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] = xtoi (argv[Index + 1]); Index += 2; } gFitTableContext.StartupAcmNumber ++; gFitTableContext.FitEntryNumber ++;- }+ }; // // 1.5. DiagnosticsAcm@@ -2185,7 +2238,7 @@ Returns:
printf ("Total FIT Entry number: 0x%x\n", gFitTableContext.FitEntryNumber); printf ("FitHeader version: 0x%04x\n", gFitTableContext.FitHeaderVersion); for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {- printf ("StartupAcm[%d] - (0x%08x, 0x%08x, 0x%04x)\n", Index, gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size, gFitTableContext.StartupAcmVersion);+ printf ("StartupAcm[%d] - (0x%08x, 0x%08x, 0x%04x)\n", Index, gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size, gFitTableContext.StartupAcmVersion[Index]); } if (gFitTableContext.DiagnstAcm.Address != 0) { printf ("DiagnosticAcm - (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.DiagnstAcm.Address, gFitTableContext.DiagnstAcm.Size, gFitTableContext.DiagnstAcmVersion);@@ -2774,6 +2827,8 @@ Returns:
UINTN SubIndex; FIT_TABLE_CONTEXT_ENTRY TempContextEntry; FIRMWARE_INTERFACE_TABLE_ENTRY TempTableEntry;+ PROCESSOR_ID FMS;+ PROCESSOR_ID FMSMask; // // 1. FitPointer@@ -2825,16 +2880,30 @@ Returns:
// 4. StartupAcm // for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {- FitEntrySizeValue = 0; // gFitTableContext.StartupAcm.Size / 16- FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;- FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;- FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);- FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);- FitEntry[FitIndex].Rsvd = 0;- FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;- FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;- FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+ if (gFitTableContext.StartupAcmVersion[Index] == STARTUP_ACM_FIT_ENTRY_200_VERSION) {+ FMS.Uint32 = gFitTableContext.StartupAcm[Index].FMS;+ FMSMask.Uint32 = gFitTableContext.StartupAcm[Index].FMSMask;+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;+ FitEntry[FitIndex].Size[0] = NIBBLES_TO_BYTE (FMS.Bits.Family, FMS.Bits.Model);+ FitEntry[FitIndex].Size[1] = NIBBLES_TO_BYTE (FMS.Bits.ExtendedModel, FMS.Bits.Type);+ FitEntry[FitIndex].Size[2] = NIBBLES_TO_BYTE (FMSMask.Bits.Family, FMSMask.Bits.Model);+ FitEntry[FitIndex].Rsvd = NIBBLES_TO_BYTE (FMSMask.Bits.ExtendedModel, FMSMask.Bits.Type);+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion[Index];+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;+ FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = NIBBLES_TO_BYTE (FMSMask.Bits.ExtendedFamily, FMS.Bits.ExtendedFamily);+ } else {+ FitEntrySizeValue = 0; // gFitTableContext.StartupAcm.Size / 16+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;+ FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion[Index];+ FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;+ FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0;+ } FitIndex++; } @@ -3135,6 +3204,69 @@ Returns:
return FvRecoveryFileSize; } +void+GetFMSFromFitEntry (+ IN FIRMWARE_INTERFACE_TABLE_ENTRY FitEntry,+ IN OUT PROCESSOR_ID *FMS,+ IN OUT PROCESSOR_ID *FMSMask+ )+/*++++Routine Description:++ Get FMS information from FIT Entry.++ Note: Since FIT entry not record all the processor ID information.+ The value would not the same as the real value.++ +----------+-----------------------+-----------------------+-----------------------+-----------------------++ | Byte | 15 | 14 | 13:12 | 11 |+ +----------+-----------------------+-----------------------+-----------------------+-----------------------++ |Bit Fields| [7:4] | [3:0] | [7:7] | [6:0] | [7:4] | [3:0] | [7:4] | [3:0] |+ +----------+-----------------------+-----------------------+-----------------------+-----------------------++ | Ver. 100 | Checksum | C_V | Type | Version | Reserved |+ +----------+-----------------------+-----------------------+-----------------------+-----------------------++ | Ver. 200 | FMSMask | FMS | C_V | Type | Version | FMSMask | FMSMask |+ | | ExtFamily | ExtFamily | | | | ExtModel | Type |+ +----------+-----------------------+-----------------------+-----------------------+-----------------------+++ +----------+-----------------------+-----------------------+-----------------------+-----------------------++ | Byte | 10 | 9 | 8 | 7:0 |+ +----------+-----------------------+-----------------------+-----------------------+-----------------------++ |Bit Fields| [7:4] | [3:0] | [7:4] | [3:0] | [7:4] | [3:0] | [7:4] | [3:0] |+ +----------+-----------------------+-----------------------+-----------------------+-----------------------++ | Ver. 100 | Size[2] | Size[1] | Size[0] | Address |+ +----------+-----------------------+-----------------------+-----------------------+-----------------------++ | Ver. 200 | FMSMask | FMSMask | FMS | FMS | FMS | FMS | Address |+ | | Family | Model | ExtModel | Type | Family | Model | |+ +----------+-----------------------+-----------------------+-----------------------+-----------------------++++Arguments:++ FitEntry - FIT entry information.+ FMS - Processor ID information.+ FMSMask - Processor ID mask information.++Returns:+ None++--*/+{++ FMS->Bits.Family = (FitEntry.Size[0] & 0xF0) >> 4;+ FMS->Bits.Model = (FitEntry.Size[0] & 0x0F);+ FMS->Bits.ExtendedModel = (FitEntry.Size[1] & 0xF0) >> 4;+ FMS->Bits.Type = (FitEntry.Size[1] & 0x0F);+ FMS->Bits.ExtendedFamily = (FitEntry.Checksum & 0x0F);++ FMSMask->Bits.Family = (FitEntry.Size[2] & 0xF0) >> 4;+ FMSMask->Bits.Model = (FitEntry.Size[2] & 0x0F);+ FMSMask->Bits.ExtendedModel = (FitEntry.Rsvd & 0xF0) >> 4;+ FMSMask->Bits.Type = (FitEntry.Rsvd & 0x0F);+ FMSMask->Bits.ExtendedFamily = (FitEntry.Checksum & 0xF0) >> 4;+}+ UINT32 GetFitEntryInfo ( IN UINT8 *FvBuffer,@@ -3161,6 +3293,11 @@ Returns:
UINT32 FitEntrySizeValue; UINT32 FitIndex; UINT32 FitTableOffset;+ PROCESSOR_ID FMS;+ PROCESSOR_ID FMSMask;++ FMS.Uint32 = 0;+ FMSMask.Uint32 = 0; // // 1. FitPointer@@ -3202,7 +3339,15 @@ Returns:
break; case FIT_TABLE_TYPE_STARTUP_ACM: gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)FitEntry[FitIndex].Address;- gFitTableContext.StartupAcmVersion = FitEntry[FitIndex].Version;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = FitEntrySizeValue;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FitEntry[FitIndex].Type;+ gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] = FitEntry[FitIndex].Version;+ if (gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber] == STARTUP_ACM_FIT_ENTRY_200_VERSION) {+ GetFMSFromFitEntry (FitEntry[FitIndex], &FMS, &FMSMask);+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMS = FMS.Uint32;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMSMask = FMSMask.Uint32;+ }+ gFitTableContext.StartupAcmNumber++; break; case FIT_TABLE_TYPE_BIOS_MODULE: gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h b/Silicon/Intel/Tools/FitGen/FitGen.h
index b7de0a6b2d..80a1423ceb 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.h
+++ b/Silicon/Intel/Tools/FitGen/FitGen.h
@@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Utility version information // #define UTILITY_MAJOR_VERSION 0-#define UTILITY_MINOR_VERSION 65+#define UTILITY_MINOR_VERSION 66 #define UTILITY_DATE __DATE__ //--
2.37.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [edk2-devel] [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool
2022-07-01 15:10 [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Lin, Jason1
` (2 preceding siblings ...)
2022-07-01 18:34 ` [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Oram, Isaac W
@ 2022-07-04 1:35 ` Yuwei Chen
2022-07-05 13:06 ` Bob Feng
4 siblings, 0 replies; 10+ messages in thread
From: Yuwei Chen @ 2022-07-04 1:35 UTC (permalink / raw)
To: devel@edk2.groups.io, Lin, Jason1
Cc: Feng, Bob C, Gao, Liming, Oram, Isaac W, Chaganty, Rangasai V,
Chiang, Dakota
Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Lin,
> Jason1
> Sent: Friday, July 1, 2022 11:10 PM
> To: devel@edk2.groups.io
> Cc: Lin, Jason1 <jason1.lin@intel.com>; Feng, Bob C <bob.c.feng@intel.com>;
> Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine
> <yuwei.chen@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Chiang, Dakota
> <dakota.chiang@intel.com>
> Subject: [edk2-devel] [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen:
> Support multiple Startup ACM Type 2 entries in FitGen tool
>
> From: Jason1 Lin <jason1.lin@intel.com>
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
>
> Within current FitGen tool there had limitation only allow one S-ACM to
> generate the Type 2 entry.
> This code change is used to support multiple type 2 entries up to 0x20.
>
> Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Dakota Chiang <dakota.chiang@intel.com>
> ---
> Silicon/Intel/Tools/FitGen/FitGen.c | 89 +++++++++++---------
> Silicon/Intel/Tools/FitGen/FitGen.h | 4 +-
> 2 files changed, 50 insertions(+), 43 deletions(-)
>
> diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
> b/Silicon/Intel/Tools/FitGen/FitGen.c
> index 4de72ea422..eac8fa8715 100644
> --- a/Silicon/Intel/Tools/FitGen/FitGen.c
> +++ b/Silicon/Intel/Tools/FitGen/FitGen.c
> @@ -2,7 +2,7 @@
> This utility is part of build process for IA32/X64 FD. It generates FIT table. -
> Copyright (c) 2010-2021, Intel Corporation. All rights
> reserved.<BR>+Copyright (c) 2010-2022, Intel Corporation. All rights
> reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -204,6
> +204,7 @@ typedef struct {
> #define MAX_BIOS_MODULE_ENTRY 0x20 #define
> MAX_MICROCODE_ENTRY 0x20+#define MAX_STARTUP_ACM_ENTRY 0x20
> #define MAX_OPTIONAL_ENTRY 0x20 #define MAX_PORT_ENTRY 0x20
> @@ -255,11 +256,12 @@ typedef struct {
> UINT32 FitEntryNumber; UINT32
> BiosModuleNumber; UINT32 MicrocodeNumber;+ UINT32
> StartupAcmNumber; UINT32 OptionalModuleNumber; UINT32
> PortModuleNumber; UINT32 GlobalVersion; UINT32
> FitHeaderVersion;- FIT_TABLE_CONTEXT_ENTRY StartupAcm;+
> FIT_TABLE_CONTEXT_ENTRY StartupAcm[MAX_STARTUP_ACM_ENTRY];
> UINT32 StartupAcmVersion; FIT_TABLE_CONTEXT_ENTRY
> DiagnstAcm; UINT32 DiagnstAcmVersion;@@ -1149,14 +1151,15
> @@ Returns:
> Error (NULL, 0, 0, "-I Parameter incorrect, Header Type unsupported!",
> NULL); return 0; case FIT_TABLE_TYPE_STARTUP_ACM:- if
> (gFitTableContext.StartupAcm.Type != 0) {- Error (NULL, 0, 0, "-I
> Parameter incorrect, Duplicated StartupAcm!", NULL);+ if
> (gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {+
> Error (NULL, 0, 0, "-I Parameter incorrect, too many StartupAcm!", NULL);
> return 0; }- gFitTableContext.StartupAcm.Type =
> FIT_TABLE_TYPE_STARTUP_ACM;-
> gFitTableContext.StartupAcm.Address =
> (UINT32)BiosInfoStruct[BiosInfoIndex].Address;-
> gFitTableContext.StartupAcm.Size =
> (UINT32)BiosInfoStruct[BiosInfoIndex].Size;-
> gFitTableContext.StartupAcmVersion =
> BiosInfoStruct[BiosInfoIndex].Version;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type =
> FIT_TABLE_TYPE_STARTUP_ACM;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address
> = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size =
> (UINT32)BiosInfoStruct[BiosInfoIndex].Size;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Version
> = BiosInfoStruct[BiosInfoIndex].Version;+
> gFitTableContext.StartupAcmNumber ++;
> gFitTableContext.FitEntryNumber ++; break; case
> FIT_TABLE_TYPE_DIAGNST_ACM:@@ -1351,16 +1354,15 @@ Returns:
> // // 1. StartupAcm //- do {+ while (TRUE) { if ((Index + 1 >= argc) ||
> ((strcmp (argv[Index], "-S") != 0) && (strcmp (argv[Index], "-s") != 0)) ) {-
> if (BiosInfoExist && (gFitTableContext.StartupAcm.Type ==
> FIT_TABLE_TYPE_STARTUP_ACM)) {- break;+ if
> (gFitTableContext.StartupAcmNumber == 0) {+ printf ("-S not found.
> WARNING!\n"); } // Error (NULL, 0, 0, "-S Parameter incorrect, expect -
> S!", NULL); // return 0;- printf ("-S not found. WARNING!\n");
> break; } if (IsGuidData (argv[Index + 1], &Guid)) {@@ -1381,14 +1383,13
> @@ Returns:
> FileSize = xtoi (argv[Index + 2]); Index += 3; }- if
> (gFitTableContext.StartupAcm.Type != 0) {- Error (NULL, 0, 0, "-S Parameter
> incorrect, Duplicated StartupAcm!", NULL);+ if
> (gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {+
> Error (NULL, 0, 0, "-S Parameter incorrect, too many StartupAcm!", NULL);
> return 0; }- gFitTableContext.StartupAcm.Type =
> FIT_TABLE_TYPE_STARTUP_ACM;- gFitTableContext.StartupAcm.Address =
> (UINT32) (UINTN) FileBuffer;- gFitTableContext.StartupAcm.Size = FileSize;-
> gFitTableContext.FitEntryNumber ++;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type =
> FIT_TABLE_TYPE_STARTUP_ACM;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address
> = (UINT32) (UINTN) FileBuffer;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size =
> FileSize; // // 1.1 StartupAcm version@@ -1407,7 +1408,10 @@ Returns:
> gFitTableContext.StartupAcmVersion = xtoi (argv[Index + 1]); Index +=
> 2; }- } while (FALSE);++ gFitTableContext.StartupAcmNumber ++;+
> gFitTableContext.FitEntryNumber ++;+ } // // 1.5. DiagnosticsAcm@@ -
> 1890,7 +1894,9 @@ Returns:
> // // Final: Check StartupAcm in BiosModule. //- CheckOverlap
> (gFitTableContext.StartupAcm.Address, gFitTableContext.StartupAcm.Size);+
> for (Index = 0; Index < (INTN)gFitTableContext.StartupAcmNumber; Index++)
> {+ CheckOverlap (gFitTableContext.StartupAcm[Index].Address,
> gFitTableContext.StartupAcm[Index].Size);+ } FitEntryNumber =
> gFitTableContext.FitEntryNumber; for (Index = 0; Index <
> (INTN)gFitTableContext.OptionalModuleNumber; Index++) { if
> ((gFitTableContext.OptionalModule[Index].Type ==
> FIT_TABLE_TYPE_BIOS_POLICY) ||@@ -2178,8 +2184,8 @@ Returns:
> } printf ("Total FIT Entry number: 0x%x\n",
> gFitTableContext.FitEntryNumber); printf ("FitHeader version: 0x%04x\n",
> gFitTableContext.FitHeaderVersion);- if
> (gFitTableContext.StartupAcm.Address != 0) {- printf ("StartupAcm -
> (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.StartupAcm.Address,
> gFitTableContext.StartupAcm.Size, gFitTableContext.StartupAcmVersion);+
> for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {+
> printf ("StartupAcm[%d] - (0x%08x, 0x%08x, 0x%04x)\n", Index,
> gFitTableContext.StartupAcm[Index].Address,
> gFitTableContext.StartupAcm[Index].Size,
> gFitTableContext.StartupAcmVersion); } if
> (gFitTableContext.DiagnstAcm.Address != 0) { printf ("DiagnosticAcm -
> (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.DiagnstAcm.Address,
> gFitTableContext.DiagnstAcm.Size,
> gFitTableContext.DiagnstAcmVersion);@@ -2809,8 +2815,8 @@ Returns:
> // // 4. StartupAcm //- if (gFitTableContext.StartupAcm.Address != 0) {-
> FitEntry[FitIndex].Address = gFitTableContext.StartupAcm.Address;+
> for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {+
> FitEntry[FitIndex].Address =
> gFitTableContext.StartupAcm[Index].Address; *(UINT32
> *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.StartupAcm.Size / 16;
> FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.StartupAcmVersion; FitEntry[FitIndex].Type
> = FIT_TABLE_TYPE_STARTUP_ACM;@@ -3110,7 +3116,7 @@ GetFitEntryInfo
> (
> Routine Description: - Fill the FIT table information to Fvrecovery+ Get the
> FIT table information from Fvrecovery Arguments: @@ -3164,8 +3170,8 @@
> Returns:
> gFitTableContext.MicrocodeNumber ++; break; case
> FIT_TABLE_TYPE_STARTUP_ACM:- gFitTableContext.StartupAcm.Address =
> (UINT32)FitEntry[FitIndex].Address;- gFitTableContext.StartupAcmVersion
> = FitEntry[FitIndex].Version;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address
> = (UINT32)FitEntry[FitIndex].Address;+
> gFitTableContext.StartupAcmVersion =
> FitEntry[FitIndex].Version; break; case FIT_TABLE_TYPE_BIOS_MODULE:
> gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address
> = (UINT32)FitEntry[FitIndex].Address;@@ -3232,6 +3238,7 @@ Returns:
> UINT32 FdFileSize; UINT8 *AcmBuffer;+ INTN
> Index; UINT32 FixedFitLocation; FileBufferRaw = NULL;@@ -
> 3323,22 +3330,23 @@ Returns:
> // // Get ACM buffer //- if (gFitTableContext.StartupAcm.Address !=
> 0) {- AcmBuffer =
> FLASH_TO_MEMORY(gFitTableContext.StartupAcm.Address, FdFileBuffer,
> FdFileSize);- if ((AcmBuffer < FdFileBuffer) || (AcmBuffer +
> gFitTableContext.StartupAcm.Size > FdFileBuffer + FdFileSize)) {- printf
> ("ACM out of range - can not validate it\n");- AcmBuffer = NULL;- }+
> for (Index = 0; Index < (INTN)gFitTableContext.StartupAcmNumber; Index ++)
> {+ if (gFitTableContext.StartupAcm[Index].Address != 0) {+ AcmBuffer =
> FLASH_TO_MEMORY(gFitTableContext.StartupAcm[Index].Address,
> FdFileBuffer, FdFileSize);+ if ((AcmBuffer < FdFileBuffer) || (AcmBuffer +
> gFitTableContext.StartupAcm[Index].Size > FdFileBuffer + FdFileSize)) {+
> printf ("ACM out of range - can not validate it\n");+ AcmBuffer =
> NULL;+ } - if (AcmBuffer != NULL) {- if (CheckAcm ((ACM_FORMAT
> *)AcmBuffer, gFitTableContext.StartupAcm.Size)) {- DumpAcm
> ((ACM_FORMAT *)AcmBuffer);- } else {- Status = STATUS_ERROR;-
> goto exitFunc;+ if (AcmBuffer != NULL) {+ if (CheckAcm
> ((ACM_FORMAT *)AcmBuffer, gFitTableContext.StartupAcm[Index].Size)) {+
> DumpAcm ((ACM_FORMAT *)AcmBuffer);+ } else {+ Status =
> STATUS_ERROR;+ goto exitFunc;+ } } }- } //@@ -
> 3576,4 +3584,3 @@ Returns:
> return u; }-diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h
> b/Silicon/Intel/Tools/FitGen/FitGen.h
> index 5add6a8870..b7de0a6b2d 100644
> --- a/Silicon/Intel/Tools/FitGen/FitGen.h
> +++ b/Silicon/Intel/Tools/FitGen/FitGen.h
> @@ -1,7 +1,7 @@
> /**@file Definitions for the FitGen utility. -Copyright (c) 2010-2020, Intel
> Corporation. All rights reserved.<BR>+Copyright (c) 2010-2022, Intel
> Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-
> Patent **/@@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> // Utility version information // #define UTILITY_MAJOR_VERSION 0-#define
> UTILITY_MINOR_VERSION 64+#define UTILITY_MINOR_VERSION 65 #define
> UTILITY_DATE __DATE__ //--
> 2.37.0.windows.1
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#90988): https://edk2.groups.io/g/devel/message/90988
> Mute This Topic: https://groups.io/mt/92111640/4546272
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [yuwei.chen@intel.com]
> -=-=-=-=-=-=
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage
2022-07-01 15:10 ` [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage Lin, Jason1
2022-07-01 18:34 ` Oram, Isaac W
@ 2022-07-04 1:37 ` Yuwei Chen
1 sibling, 0 replies; 10+ messages in thread
From: Yuwei Chen @ 2022-07-04 1:37 UTC (permalink / raw)
To: Lin, Jason1, devel@edk2.groups.io
Cc: Feng, Bob C, Gao, Liming, Oram, Isaac W, Chaganty, Rangasai V,
Chiang, Dakota
Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>
> -----Original Message-----
> From: Lin, Jason1 <jason1.lin@intel.com>
> Sent: Friday, July 1, 2022 11:10 PM
> To: devel@edk2.groups.io
> Cc: Lin, Jason1 <jason1.lin@intel.com>; Feng, Bob C <bob.c.feng@intel.com>;
> Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine
> <yuwei.chen@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Chiang, Dakota
> <dakota.chiang@intel.com>
> Subject: [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the
> typecasting and pointer usage
>
> From: Jason1 Lin <jason1.lin@intel.com>
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
>
> FitGen tool exists lots of typecasting and pointer usage.
> This code change is used to reduce these in FillFitTable () and GetFitEntryInfo
> ().
> To make code more clearly and easy to read.
>
> Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Dakota Chiang <dakota.chiang@intel.com>
> ---
> Silicon/Intel/Tools/FitGen/FitGen.c | 125 ++++++++++++--------
> 1 file changed, 78 insertions(+), 47 deletions(-)
>
> diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
> b/Silicon/Intel/Tools/FitGen/FitGen.c
> index eac8fa8715..01b4f82518 100644
> --- a/Silicon/Intel/Tools/FitGen/FitGen.c
> +++ b/Silicon/Intel/Tools/FitGen/FitGen.c
> @@ -2768,6 +2768,7 @@ Returns:
> { FIRMWARE_INTERFACE_TABLE_ENTRY *FitEntry; UINT32
> FitIndex;+ UINT32 FitEntrySizeValue; UINT32
> Index; UINT8 Checksum; UINTN SubIndex;@@
> -2788,27 +2789,35 @@ Returns:
> // // 2. FitHeader //- FitEntry[FitIndex].Address = *(UINT64
> *)"_FIT_ ";- *(UINT32 *)&FitEntry[FitIndex].Size[0] =
> gFitTableContext.FitEntryNumber;- FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.FitHeaderVersion;- FitEntry[FitIndex].Type
> = FIT_TABLE_TYPE_HEADER;- FitEntry[FitIndex].C_V = 1;+
> FitEntrySizeValue = gFitTableContext.FitEntryNumber;+
> FitEntry[FitIndex].Address = *(UINT64 *)"_FIT_ ";+ FitEntry[FitIndex].Size[0]
> = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] =
> (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] =
> (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+
> FitEntry[FitIndex].Version = (UINT16)gFitTableContext.FitHeaderVersion;+
> FitEntry[FitIndex].Type = FIT_TABLE_TYPE_HEADER;+
> FitEntry[FitIndex].C_V = 1; // // Checksum will be updated later... //-
> FitEntry[FitIndex].Checksum = 0;+ FitEntry[FitIndex].Checksum = 0; //
> // 3. Microcode // FitIndex++; for (Index = 0; Index <
> gFitTableContext.MicrocodeNumber; Index++) {- FitEntry[FitIndex].Address
> = gFitTableContext.Microcode[Index].Address;- *(UINT32
> *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.Microcode[Index].Size /
> 16;- FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.MicrocodeVersion;- FitEntry[FitIndex].Type
> = FIT_TABLE_TYPE_MICROCODE;- FitEntry[FitIndex].C_V = 0;-
> FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = 0; //
> gFitTableContext.Microcode[Index].Size / 16+ FitEntry[FitIndex].Address =
> gFitTableContext.Microcode[Index].Address;+ FitEntry[FitIndex].Size[0] =
> (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] =
> (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] =
> (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+
> FitEntry[FitIndex].Version = (UINT16)gFitTableContext.MicrocodeVersion;+
> FitEntry[FitIndex].Type = FIT_TABLE_TYPE_MICROCODE;+
> FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0;
> FitIndex++; } @@ -2816,12 +2825,16 @@ Returns:
> // 4. StartupAcm // for (Index = 0; Index <
> gFitTableContext.StartupAcmNumber; Index++) {-
> FitEntry[FitIndex].Address =
> gFitTableContext.StartupAcm[Index].Address;- *(UINT32
> *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.StartupAcm.Size / 16;-
> FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.StartupAcmVersion;- FitEntry[FitIndex].Type
> = FIT_TABLE_TYPE_STARTUP_ACM;- FitEntry[FitIndex].C_V = 0;-
> FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = 0; //
> gFitTableContext.StartupAcm.Size / 16+ FitEntry[FitIndex].Address =
> gFitTableContext.StartupAcm[Index].Address;+ FitEntry[FitIndex].Size[0] =
> (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] =
> (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] =
> (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+
> FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;+
> FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;+
> FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0;
> FitIndex++; } @@ -2829,19 +2842,23 @@ Returns:
> // 4.5. DiagnosticAcm // if (gFitTableContext.DiagnstAcm.Address != 0) {-
> FitEntry[FitIndex].Address = gFitTableContext.DiagnstAcm.Address;-
> *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0;- FitEntry[FitIndex].Version
> = (UINT16)gFitTableContext.DiagnstAcmVersion;- FitEntry[FitIndex].Type
> = FIT_TABLE_TYPE_DIAGNST_ACM;- FitEntry[FitIndex].C_V = 0;-
> FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = 0; //
> gFitTableContext.DiagnstAcmVersion.Size / 16+ FitEntry[FitIndex].Address
> = gFitTableContext.DiagnstAcm.Address;+ FitEntry[FitIndex].Size[0] =
> (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] =
> (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] =
> (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+
> FitEntry[FitIndex].Version = (UINT16)gFitTableContext.DiagnstAcmVersion;+
> FitEntry[FitIndex].Type = FIT_TABLE_TYPE_DIAGNST_ACM;+
> FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0;
> FitIndex++; } // // 5. BiosModule // //- // BiosModule segments order
> needs to be put from low addresss to high for Btg requirement+ //
> BiosModule segments order needs to be put from low address to high for Btg
> requirement // if (gFitTableContext.BiosModuleNumber > 1) { for (Index
> = 0; Index < (UINTN)gFitTableContext.BiosModuleNumber - 1; Index++){@@ -
> 2855,12 +2872,16 @@ Returns:
> } } for (Index = 0; Index < gFitTableContext.BiosModuleNumber; Index++)
> {- FitEntry[FitIndex].Address =
> gFitTableContext.BiosModule[Index].Address;- *(UINT32
> *)&FitEntry[FitIndex].Size[0] = gFitTableContext.BiosModule[Index].Size / 16;-
> FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.BiosModuleVersion;- FitEntry[FitIndex].Type
> = FIT_TABLE_TYPE_BIOS_MODULE;- FitEntry[FitIndex].C_V = 0;-
> FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue =
> gFitTableContext.BiosModule[Index].Size / 16;+ FitEntry[FitIndex].Address
> = gFitTableContext.BiosModule[Index].Address;+ FitEntry[FitIndex].Size[0]
> = (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] =
> (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] =
> (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+
> FitEntry[FitIndex].Version = (UINT16)gFitTableContext.BiosModuleVersion;+
> FitEntry[FitIndex].Type = FIT_TABLE_TYPE_BIOS_MODULE;+
> FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0;
> FitIndex++; } @@ -2868,15 +2889,18 @@ Returns:
> // 6. Optional module // for (Index = 0; Index <
> gFitTableContext.OptionalModuleNumber; Index++) {-
> FitEntry[FitIndex].Address =
> gFitTableContext.OptionalModule[Index].Address;- *(UINT32
> *)&FitEntry[FitIndex].Size[0] = gFitTableContext.OptionalModule[Index].Size;-
> FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.OptionalModule[Index].Version;-
> FitEntry[FitIndex].Type =
> (UINT8)gFitTableContext.OptionalModule[Index].Type;+ FitEntrySizeValue
> = gFitTableContext.OptionalModule[Index].Size;+ FitEntry[FitIndex].Address
> = gFitTableContext.OptionalModule[Index].Address;+
> FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+
> FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+
> FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+
> FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.OptionalModule[Index].Version;+
> FitEntry[FitIndex].Type =
> (UINT8)gFitTableContext.OptionalModule[Index].Type; if
> (FitEntry[FitIndex].Type == FIT_TABLE_TYPE_CSE_SECURE_BOOT) {-
> FitEntry[FitIndex].Rsvd =
> (UINT8)gFitTableContext.OptionalModule[Index].SubType;+
> FitEntry[FitIndex].Rsvd =
> (UINT8)gFitTableContext.OptionalModule[Index].SubType; }-
> FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+
> FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0;
> FitIndex++; } @@ -2884,12 +2908,16 @@ Returns:
> // 7. Port module // for (Index = 0; Index <
> gFitTableContext.PortModuleNumber; Index++) {-
> FitEntry[FitIndex].Address =
> gFitTableContext.PortModule[Index].Address +
> ((UINT64)gFitTableContext.PortModule[Index].Size << 32);- *(UINT32
> *)&FitEntry[FitIndex].Size[0] = 0;- FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.PortModule[Index].Version;-
> FitEntry[FitIndex].Type =
> (UINT8)gFitTableContext.PortModule[Index].Type;- FitEntry[FitIndex].C_V
> = 0;- FitEntry[FitIndex].Checksum = 0;+ FitEntrySizeValue = 0;+
> FitEntry[FitIndex].Address = gFitTableContext.PortModule[Index].Address +
> ((UINT64)gFitTableContext.PortModule[Index].Size << 32);+
> FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+
> FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+
> FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+
> FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.PortModule[Index].Version;+
> FitEntry[FitIndex].Type =
> (UINT8)gFitTableContext.PortModule[Index].Type;+ FitEntry[FitIndex].C_V
> = 0;+ FitEntry[FitIndex].Checksum = 0; FitIndex++; } @@ -3130,6 +3158,7
> @@ Returns:
> --*/ { FIRMWARE_INTERFACE_TABLE_ENTRY *FitEntry;+ UINT32
> FitEntrySizeValue; UINT32 FitIndex; UINT32
> FitTableOffset; @@ -3155,7 +3184,8 @@ Returns:
> if (FitEntry[FitIndex].Type != FIT_TABLE_TYPE_HEADER) { return 0; }-
> gFitTableContext.FitEntryNumber = *(UINT32 *)&FitEntry[FitIndex].Size[0];+
> FitEntrySizeValue = (((UINT32)FitEntry[FitIndex].Size[2]) << 16) +
> (((UINT32)FitEntry[FitIndex].Size[1]) << 8) +
> ((UINT32)FitEntry[FitIndex].Size[0]);+ gFitTableContext.FitEntryNumber =
> FitEntrySizeValue; gFitTableContext.FitHeaderVersion =
> FitEntry[FitIndex].Version; //@@ -3163,6 +3193,7 @@ Returns:
> // FitIndex++; for (; FitIndex < gFitTableContext.FitEntryNumber;
> FitIndex++) {+ FitEntrySizeValue = (((UINT32)FitEntry[FitIndex].Size[2]) << 16)
> + (((UINT32)FitEntry[FitIndex].Size[1]) << 8) +
> ((UINT32)FitEntry[FitIndex].Size[0]); switch (FitEntry[FitIndex].Type)
> { case FIT_TABLE_TYPE_MICROCODE:
> gFitTableContext.Microcode[gFitTableContext.MicrocodeNumber].Address =
> (UINT32)FitEntry[FitIndex].Address;@@ -3175,7 +3206,7 @@ Returns:
> break; case FIT_TABLE_TYPE_BIOS_MODULE:
> gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address
> = (UINT32)FitEntry[FitIndex].Address;-
> gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Size =
> *(UINT32 *)&FitEntry[FitIndex].Size[0] * 16;+
> gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Size =
> FitEntrySizeValue * 16; gFitTableContext.BiosModuleVersion
> = FitEntry[FitIndex].Version; gFitTableContext.BiosModuleNumber ++;
> break;@@ -3192,7 +3223,7 @@ Returns:
> // Not Port Configure, pass through default: // Others
> gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber
> ].Address = (UINT32)FitEntry[FitIndex].Address;-
> gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber
> ].Size = *(UINT32 *)&FitEntry[FitIndex].Size[0];+
> gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber
> ].Size = FitEntrySizeValue;
> gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber
> ].Version = FitEntry[FitIndex].Version;
> gFitTableContext.OptionalModule[gFitTableContext.OptionalModuleNumber
> ].Type = FitEntry[FitIndex].Type;
> gFitTableContext.OptionalModuleNumber ++;--
> 2.37.0.windows.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version
2022-07-01 15:10 ` [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version Lin, Jason1
2022-07-01 18:34 ` Oram, Isaac W
@ 2022-07-04 1:37 ` Yuwei Chen
1 sibling, 0 replies; 10+ messages in thread
From: Yuwei Chen @ 2022-07-04 1:37 UTC (permalink / raw)
To: Lin, Jason1, devel@edk2.groups.io
Cc: Feng, Bob C, Gao, Liming, Oram, Isaac W, Chaganty, Rangasai V,
Chiang, Dakota
Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>
> -----Original Message-----
> From: Lin, Jason1 <jason1.lin@intel.com>
> Sent: Friday, July 1, 2022 11:10 PM
> To: devel@edk2.groups.io
> Cc: Lin, Jason1 <jason1.lin@intel.com>; Feng, Bob C <bob.c.feng@intel.com>;
> Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine
> <yuwei.chen@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Chiang, Dakota
> <dakota.chiang@intel.com>
> Subject: [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support
> Startup ACM entries (Type 2) 0x200 Version
>
> From: Jason1 Lin <jason1.lin@intel.com>
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3959
>
> As per FIT BIOS Specification 1.2 Rules, the size bytes (3 bytes) / reserved
> byte (1 byte) / CheckSum byte (1 byte) in type 2 are must-be-zero (MBZ).
> These bytes could be override for the other usages.
> This change is used to support the Type 02 (ACM) Ver. 0x200.
>
> Command:
> [-S <StartupAcmAddress StartupAcmSize>|<StartupAcmGuid>] [-I
> <StartupAcmFMS StartupAcmFMSMask>] [-V <StartupAcmVersion>]
>
> Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Dakota Chiang <dakota.chiang@intel.com>
> ---
> Silicon/Intel/Tools/FitGen/FitGen.c | 183 ++++++++++++++++++--
> Silicon/Intel/Tools/FitGen/FitGen.h | 2 +-
> 2 files changed, 165 insertions(+), 20 deletions(-)
>
> diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
> b/Silicon/Intel/Tools/FitGen/FitGen.c
> index 01b4f82518..577ce48b10 100644
> --- a/Silicon/Intel/Tools/FitGen/FitGen.c
> +++ b/Silicon/Intel/Tools/FitGen/FitGen.c
> @@ -55,6 +55,7 @@ typedef struct {
> #define ACM_MODULE_FLAG_PREPRODUCTION 0x4000 #define
> ACM_MODULE_FLAG_DEBUG_SIGN 0x8000 +#define
> NIBBLES_TO_BYTE(A, B) (UINT8)(((A & (0x0F)) << 4) | (B & 0x0F)) typedef
> struct { UINT16 ModuleType;@@ -149,6 +150,20 @@ typedef struct {
> ACM_PROCESSOR_ID ProcessorID[1]; } PROCESSOR_ID_LIST; +typedef
> union {+ struct {+ UINT32 Stepping : 4;+ UINT32 Model : 4;+
> UINT32 Family : 4;+ UINT32 Type : 2;+ UINT32 Reserved1 : 2;+
> UINT32 ExtendedModel : 4;+ UINT32 ExtendedFamily: 8;+ UINT32
> Reserved2 : 4;+ } Bits;+ UINT32 Uint32;+} PROCESSOR_ID;+ #pragma pack
> () @@ -210,6 +225,7 @@ typedef struct {
> #define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40 #define
> DEFAULT_FIT_ENTRY_VERSION 0x0100+#define
> STARTUP_ACM_FIT_ENTRY_200_VERSION 0x0200 #define
> TOP_FLASH_ADDRESS (gFitTableContext.TopFlashAddressRemapValue) @@
> -247,6 +263,8 @@ typedef struct {
> UINT8 *Buffer; // Used by OptionalModule only UINT32 Size; UINT32
> Version; // Used by OptionalModule and PortModule only+ UINT32 FMS;
> // Used by Entry Type 02 (ACM) Ver. 0x200 only+ UINT32 FMSMask; // Used
> by Entry Type 02 (ACM) Ver. 0x200 only } FIT_TABLE_CONTEXT_ENTRY;
> typedef struct {@@ -262,7 +280,7 @@ typedef struct {
> UINT32 GlobalVersion; UINT32 FitHeaderVersion;
> FIT_TABLE_CONTEXT_ENTRY StartupAcm[MAX_STARTUP_ACM_ENTRY];-
> UINT32 StartupAcmVersion;+ UINT32
> StartupAcmVersion[MAX_STARTUP_ACM_ENTRY];
> FIT_TABLE_CONTEXT_ENTRY DiagnstAcm; UINT32
> DiagnstAcmVersion; FIT_TABLE_CONTEXT_ENTRY
> BiosModule[MAX_BIOS_MODULE_ENTRY];@@ -341,7 +359,7 @@ Returns:
> "\t[-L <MicrocodeSlotSize> <MicrocodeFfsGuid>]\n" "\t[-LF
> <MicrocodeSlotSize>]\n" "\t[-I <BiosInfoGuid>]\n"- "\t[-S
> <StartupAcmAddress StartupAcmSize>|<StartupAcmGuid>] [-V
> <StartupAcmVersion>]\n"+ "\t[-S <StartupAcmAddress
> StartupAcmSize>|<StartupAcmGuid>] [-I <StartupAcmFMS
> StartupAcmFMSMask>] [-V <StartupAcmVersion>]\n" "\t[-U
> <DiagnstAcmAddress>|<DiagnstAcmGuid>]\n" "\t[-B
> <BiosModuleAddress BiosModuleSize>] [-B ...] [-V <BiosModuleVersion>]\n"
> "\t[-M <MicrocodeAddress MicrocodeSize>] [-M ...]|[-U <MicrocodeFv
> MicrocodeBase>|<MicrocodeRegionOffset
> MicrocodeRegionSize>|<MicrocodeGuid>] [-V <MicrocodeVersion>]\n"@@ -
> 356,8 +374,11 @@ Returns:
> printf ("\tFitTablePointerOffset - FIT table pointer offset. 0x%x as default.
> 0x18 for current soon to be obsoleted CPUs. User can set both.\n",
> DEFAULT_FIT_TABLE_POINTER_OFFSET); printf ("\tBiosInfoGuid - Guid
> of BiosInfo Module. If this module exists, StartupAcm/Bios/Microcode can be
> optional.\n"); printf ("\tStartupAcmAddress - Address of
> StartupAcm.\n");- printf ("\tStartupAcmSize - Size of StartupAcm.\n");+
> printf ("\tStartupAcmSize - The maximum size value that could place the
> StartupAcm in.\n"); printf ("\tStartupAcmGuid - Guid of StartupAcm
> Module, if StartupAcm is in a BiosModule, it will be excluded form that.\n");+
> printf ("\tStartupAcmFMS - Value of PROCESSOR ID
> (Family/Model/Stepping value called \"FMS\") - see detail on FIT spec
> (1.3).\n");+ printf ("\tStartupAcmFMSMask - Value use for uCode (if it
> recognizes 0x200 Type2 entry) to do bitmask logic operation with CPU
> processor ID.\n");+ printf ("\t If the result match to
> StartupAcmFMS, corresponding ACM will be loaded - see detail on FIT spec
> (1.3).\n"); printf ("\tDiagnstAcmAddress - Address of DiagnstAcm.\n");
> printf ("\tDiagnstAcmGuid - Guid of DiagnstAcm Module, if DiagnstAcm
> is in a BiosModule, it will be excluded from that.\n"); printf
> ("\tBiosModuleAddress - Address of BiosModule. User should ensure
> there is no overlap.\n");@@ -1155,6 +1176,9 @@ Returns:
> Error (NULL, 0, 0, "-I Parameter incorrect, too many StartupAcm!",
> NULL); return 0; }+ //+ // NOTE: BIOS INFO structure
> only support the default FIT entry format.+ //
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type =
> FIT_TABLE_TYPE_STARTUP_ACM;
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address
> = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size =
> (UINT32)BiosInfoStruct[BiosInfoIndex].Size;@@ -1392,7 +1416,37 @@
> Returns:
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size =
> FileSize; //- // 1.1 StartupAcm version+ // 1.1 Support 0x200
> StartupAcm Information+ // With the -I parameter should assign the type
> 2 entry with 0x200 version format+ //+ if ((Index + 1 >= argc) ||+
> ((strcmp (argv[Index], "-I") != 0) &&+ (strcmp (argv[Index], "-i") != 0)) ) {+
> //+ // Bypass+ //+
> gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber]
> = gFitTableContext.GlobalVersion;+ } else {+ if (Index + 2 >= argc) {+
> //+ // Should get two input value, but not sufficient+ //+ Error
> (NULL, 0, 0, "-I Parameter incorrect, Require two inputs value!", NULL);+
> return 0;+ } else {+ //+ // With the -I parameter should assign the
> type 2 entry version as 0x200 format+ //+
> gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber]
> = STARTUP_ACM_FIT_ENTRY_200_VERSION;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMS =
> (UINT32)xtoi (argv[Index + 1]);+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMSMas
> k = (UINT32)xtoi (argv[Index + 2]);++ Index += 3;+ }+ }++ //+ // 1.2
> StartupAcm version // if ((Index + 1 >= argc) || ((strcmp (argv[Index],
> "-V") != 0) &&@@ -1400,18 +1454,17 @@ Returns:
> // // Bypass //- gFitTableContext.StartupAcmVersion =
> gFitTableContext.GlobalVersion; } else { // // Get offset from
> parameter //- gFitTableContext.StartupAcmVersion = xtoi (argv[Index +
> 1]);+
> gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber]
> = xtoi (argv[Index + 1]); Index += 2; }
> gFitTableContext.StartupAcmNumber ++; gFitTableContext.FitEntryNumber
> ++;- }+ }; // // 1.5. DiagnosticsAcm@@ -2185,7 +2238,7 @@ Returns:
> printf ("Total FIT Entry number: 0x%x\n",
> gFitTableContext.FitEntryNumber); printf ("FitHeader version: 0x%04x\n",
> gFitTableContext.FitHeaderVersion); for (Index = 0; Index <
> gFitTableContext.StartupAcmNumber; Index++) {- printf ("StartupAcm[%d] -
> (0x%08x, 0x%08x, 0x%04x)\n", Index,
> gFitTableContext.StartupAcm[Index].Address,
> gFitTableContext.StartupAcm[Index].Size,
> gFitTableContext.StartupAcmVersion);+ printf ("StartupAcm[%d] - (0x%08x,
> 0x%08x, 0x%04x)\n", Index, gFitTableContext.StartupAcm[Index].Address,
> gFitTableContext.StartupAcm[Index].Size,
> gFitTableContext.StartupAcmVersion[Index]); } if
> (gFitTableContext.DiagnstAcm.Address != 0) { printf ("DiagnosticAcm -
> (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.DiagnstAcm.Address,
> gFitTableContext.DiagnstAcm.Size,
> gFitTableContext.DiagnstAcmVersion);@@ -2774,6 +2827,8 @@ Returns:
> UINTN SubIndex; FIT_TABLE_CONTEXT_ENTRY
> TempContextEntry; FIRMWARE_INTERFACE_TABLE_ENTRY
> TempTableEntry;+ PROCESSOR_ID FMS;+ PROCESSOR_ID
> FMSMask; // // 1. FitPointer@@ -2825,16 +2880,30 @@ Returns:
> // 4. StartupAcm // for (Index = 0; Index <
> gFitTableContext.StartupAcmNumber; Index++) {- FitEntrySizeValue =
> 0; // gFitTableContext.StartupAcm.Size / 16- FitEntry[FitIndex].Address =
> gFitTableContext.StartupAcm[Index].Address;- FitEntry[FitIndex].Size[0] =
> (UINT8)FitEntrySizeValue;- FitEntry[FitIndex].Size[1] =
> (UINT8)(FitEntrySizeValue >> 8);- FitEntry[FitIndex].Size[2] =
> (UINT8)(FitEntrySizeValue >> 16);- FitEntry[FitIndex].Rsvd = 0;-
> FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion;-
> FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;-
> FitEntry[FitIndex].C_V = 0;- FitEntry[FitIndex].Checksum = 0;+ if
> (gFitTableContext.StartupAcmVersion[Index] ==
> STARTUP_ACM_FIT_ENTRY_200_VERSION) {+ FMS.Uint32 =
> gFitTableContext.StartupAcm[Index].FMS;+ FMSMask.Uint32 =
> gFitTableContext.StartupAcm[Index].FMSMask;+
> FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;+
> FitEntry[FitIndex].Size[0] = NIBBLES_TO_BYTE (FMS.Bits.Family,
> FMS.Bits.Model);+ FitEntry[FitIndex].Size[1] = NIBBLES_TO_BYTE
> (FMS.Bits.ExtendedModel, FMS.Bits.Type);+ FitEntry[FitIndex].Size[2] =
> NIBBLES_TO_BYTE (FMSMask.Bits.Family, FMSMask.Bits.Model);+
> FitEntry[FitIndex].Rsvd = NIBBLES_TO_BYTE (FMSMask.Bits.ExtendedModel,
> FMSMask.Bits.Type);+ FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.StartupAcmVersion[Index];+
> FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;+
> FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum =
> NIBBLES_TO_BYTE (FMSMask.Bits.ExtendedFamily,
> FMS.Bits.ExtendedFamily);+ } else {+ FitEntrySizeValue = 0; //
> gFitTableContext.StartupAcm.Size / 16+ FitEntry[FitIndex].Address =
> gFitTableContext.StartupAcm[Index].Address;+ FitEntry[FitIndex].Size[0] =
> (UINT8)FitEntrySizeValue;+ FitEntry[FitIndex].Size[1] =
> (UINT8)(FitEntrySizeValue >> 8);+ FitEntry[FitIndex].Size[2] =
> (UINT8)(FitEntrySizeValue >> 16);+ FitEntry[FitIndex].Rsvd = 0;+
> FitEntry[FitIndex].Version =
> (UINT16)gFitTableContext.StartupAcmVersion[Index];+
> FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;+
> FitEntry[FitIndex].C_V = 0;+ FitEntry[FitIndex].Checksum = 0;+ }
> FitIndex++; } @@ -3135,6 +3204,69 @@ Returns:
> return FvRecoveryFileSize; } +void+GetFMSFromFitEntry (+ IN
> FIRMWARE_INTERFACE_TABLE_ENTRY FitEntry,+ IN OUT PROCESSOR_ID
> *FMS,+ IN OUT PROCESSOR_ID *FMSMask+ )+/*++++Routine
> Description:++ Get FMS information from FIT Entry.++ Note: Since FIT entry
> not record all the processor ID information.+ The value would not the
> same as the real value.++ +----------+-----------------------+-----------------------+----
> -------------------+-----------------------++ | Byte | 15 | 14 |
> 13:12 | 11 |+ +----------+-----------------------+-----------------------
> +-----------------------+-----------------------++ |Bit Fields| [7:4] | [3:0] | [7:7]
> | [6:0] | [7:4] | [3:0] | [7:4] | [3:0] |+ +----------+-----------------------
> +-----------------------+-----------------------+-----------------------++ | Ver. 100 |
> Checksum | C_V | Type | Version | Reserved |+ +---
> -------+-----------------------+-----------------------+-----------------------+------------------
> -----++ | Ver. 200 | FMSMask | FMS | C_V | Type | Version
> | FMSMask | FMSMask |+ | | ExtFamily | ExtFamily | | |
> | ExtModel | Type |+ +----------+-----------------------+-----------------------+-----
> ------------------+-----------------------+++ +----------+-----------------------+--------------
> ---------+-----------------------+-----------------------++ | Byte | 10 |
> 9 | 8 | 7:0 |+ +----------+-----------------------+----------
> -------------+-----------------------+-----------------------++ |Bit Fields| [7:4] | [3:0]
> | [7:4] | [3:0] | [7:4] | [3:0] | [7:4] | [3:0] |+ +----------+------------
> -----------+-----------------------+-----------------------+-----------------------++ | Ver.
> 100 | Size[2] | Size[1] | Size[0] | Address |+ +-
> ---------+-----------------------+-----------------------+-----------------------+----------------
> -------++ | Ver. 200 | FMSMask | FMSMask | FMS | FMS | FMS |
> FMS | Address |+ | | Family | Model | ExtModel | Type
> | Family | Model | |+ +----------+-----------------------+-------------
> ----------+-----------------------+-----------------------++++Arguments:++ FitEntry -
> FIT entry information.+ FMS - Processor ID information.+ FMSMask -
> Processor ID mask information.++Returns:+ None++--*/+{++ FMS-
> >Bits.Family = (FitEntry.Size[0] & 0xF0) >> 4;+ FMS->Bits.Model =
> (FitEntry.Size[0] & 0x0F);+ FMS->Bits.ExtendedModel = (FitEntry.Size[1] &
> 0xF0) >> 4;+ FMS->Bits.Type = (FitEntry.Size[1] & 0x0F);+ FMS-
> >Bits.ExtendedFamily = (FitEntry.Checksum & 0x0F);++ FMSMask-
> >Bits.Family = (FitEntry.Size[2] & 0xF0) >> 4;+ FMSMask->Bits.Model
> = (FitEntry.Size[2] & 0x0F);+ FMSMask->Bits.ExtendedModel =
> (FitEntry.Rsvd & 0xF0) >> 4;+ FMSMask->Bits.Type = (FitEntry.Rsvd
> & 0x0F);+ FMSMask->Bits.ExtendedFamily = (FitEntry.Checksum & 0xF0) >>
> 4;+}+ UINT32 GetFitEntryInfo ( IN UINT8 *FvBuffer,@@ -3161,6 +3293,11
> @@ Returns:
> UINT32 FitEntrySizeValue; UINT32 FitIndex;
> UINT32 FitTableOffset;+ PROCESSOR_ID FMS;+
> PROCESSOR_ID FMSMask;++ FMS.Uint32 = 0;+ FMSMask.Uint32
> = 0; // // 1. FitPointer@@ -3202,7 +3339,15 @@ Returns:
> break; case FIT_TABLE_TYPE_STARTUP_ACM:
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address
> = (UINT32)FitEntry[FitIndex].Address;-
> gFitTableContext.StartupAcmVersion =
> FitEntry[FitIndex].Version;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size =
> FitEntrySizeValue;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type =
> FitEntry[FitIndex].Type;+
> gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber]
> = FitEntry[FitIndex].Version;+ if
> (gFitTableContext.StartupAcmVersion[gFitTableContext.StartupAcmNumber]
> == STARTUP_ACM_FIT_ENTRY_200_VERSION) {+ GetFMSFromFitEntry
> (FitEntry[FitIndex], &FMS, &FMSMask);+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMS =
> FMS.Uint32;+
> gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].FMSMas
> k = FMSMask.Uint32;+ }+ gFitTableContext.StartupAcmNumber++;
> break; case FIT_TABLE_TYPE_BIOS_MODULE:
> gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address
> = (UINT32)FitEntry[FitIndex].Address;diff --git
> a/Silicon/Intel/Tools/FitGen/FitGen.h b/Silicon/Intel/Tools/FitGen/FitGen.h
> index b7de0a6b2d..80a1423ceb 100644
> --- a/Silicon/Intel/Tools/FitGen/FitGen.h
> +++ b/Silicon/Intel/Tools/FitGen/FitGen.h
> @@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> // Utility version information // #define UTILITY_MAJOR_VERSION 0-#define
> UTILITY_MINOR_VERSION 65+#define UTILITY_MINOR_VERSION 66 #define
> UTILITY_DATE __DATE__ //--
> 2.37.0.windows.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool
2022-07-01 15:10 [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Lin, Jason1
` (3 preceding siblings ...)
2022-07-04 1:35 ` [edk2-devel] " Yuwei Chen
@ 2022-07-05 13:06 ` Bob Feng
4 siblings, 0 replies; 10+ messages in thread
From: Bob Feng @ 2022-07-05 13:06 UTC (permalink / raw)
To: Lin, Jason1, devel@edk2.groups.io
Cc: Gao, Liming, Chen, Christine, Oram, Isaac W, Chaganty, Rangasai V,
Chiang, Dakota
This patch series was pushed.
Thanks,
Bob
-----Original Message-----
From: Lin, Jason1 <jason1.lin@intel.com>
Sent: Friday, July 1, 2022 11:10 PM
To: devel@edk2.groups.io
Cc: Lin, Jason1 <jason1.lin@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Chiang, Dakota <dakota.chiang@intel.com>
Subject: [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool
From: Jason1 Lin <jason1.lin@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
Within current FitGen tool there had limitation only allow one S-ACM to generate the Type 2 entry.
This code change is used to support multiple type 2 entries up to 0x20.
Signed-off-by: Jason1 Lin <jason1.lin@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Dakota Chiang <dakota.chiang@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 89 +++++++++++--------- Silicon/Intel/Tools/FitGen/FitGen.h | 4 +-
2 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index 4de72ea422..eac8fa8715 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -2,7 +2,7 @@
This utility is part of build process for IA32/X64 FD. It generates FIT table. -Copyright (c) 2010-2021, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2010-2022, Intel Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -204,6 +204,7 @@ typedef struct {
#define MAX_BIOS_MODULE_ENTRY 0x20 #define MAX_MICROCODE_ENTRY 0x20+#define MAX_STARTUP_ACM_ENTRY 0x20 #define MAX_OPTIONAL_ENTRY 0x20 #define MAX_PORT_ENTRY 0x20 @@ -255,11 +256,12 @@ typedef struct {
UINT32 FitEntryNumber; UINT32 BiosModuleNumber; UINT32 MicrocodeNumber;+ UINT32 StartupAcmNumber; UINT32 OptionalModuleNumber; UINT32 PortModuleNumber; UINT32 GlobalVersion; UINT32 FitHeaderVersion;- FIT_TABLE_CONTEXT_ENTRY StartupAcm;+ FIT_TABLE_CONTEXT_ENTRY StartupAcm[MAX_STARTUP_ACM_ENTRY]; UINT32 StartupAcmVersion; FIT_TABLE_CONTEXT_ENTRY DiagnstAcm; UINT32 DiagnstAcmVersion;@@ -1149,14 +1151,15 @@ Returns:
Error (NULL, 0, 0, "-I Parameter incorrect, Header Type unsupported!", NULL); return 0; case FIT_TABLE_TYPE_STARTUP_ACM:- if (gFitTableContext.StartupAcm.Type != 0) {- Error (NULL, 0, 0, "-I Parameter incorrect, Duplicated StartupAcm!", NULL);+ if (gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {+ Error (NULL, 0, 0, "-I Parameter incorrect, too many StartupAcm!", NULL); return 0; }- gFitTableContext.StartupAcm.Type = FIT_TABLE_TYPE_STARTUP_ACM;- gFitTableContext.StartupAcm.Address = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;- gFitTableContext.StartupAcm.Size = (UINT32)BiosInfoStruct[BiosInfoIndex].Size;- gFitTableContext.StartupAcmVersion = BiosInfoStruct[BiosInfoIndex].Version;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FIT_TABLE_TYPE_STARTUP_ACM;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)BiosInfoStruct[BiosInfoIndex].Address;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = (UINT32)BiosInfoStruct[BiosInfoIndex].Size;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Version = BiosInfoStruct[BiosInfoIndex].Version;+ gFitTableContext.StartupAcmNumber ++; gFitTableContext.FitEntryNumber ++; break; case FIT_TABLE_TYPE_DIAGNST_ACM:@@ -1351,16 +1354,15 @@ Returns:
// // 1. StartupAcm //- do {+ while (TRUE) { if ((Index + 1 >= argc) || ((strcmp (argv[Index], "-S") != 0) && (strcmp (argv[Index], "-s") != 0)) ) {- if (BiosInfoExist && (gFitTableContext.StartupAcm.Type == FIT_TABLE_TYPE_STARTUP_ACM)) {- break;+ if (gFitTableContext.StartupAcmNumber == 0) {+ printf ("-S not found. WARNING!\n"); } // Error (NULL, 0, 0, "-S Parameter incorrect, expect -S!", NULL); // return 0;- printf ("-S not found. WARNING!\n"); break; } if (IsGuidData (argv[Index + 1], &Guid)) {@@ -1381,14 +1383,13 @@ Returns:
FileSize = xtoi (argv[Index + 2]); Index += 3; }- if (gFitTableContext.StartupAcm.Type != 0) {- Error (NULL, 0, 0, "-S Parameter incorrect, Duplicated StartupAcm!", NULL);+ if (gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {+ Error (NULL, 0, 0, "-S Parameter incorrect, too many StartupAcm!", NULL); return 0; }- gFitTableContext.StartupAcm.Type = FIT_TABLE_TYPE_STARTUP_ACM;- gFitTableContext.StartupAcm.Address = (UINT32) (UINTN) FileBuffer;- gFitTableContext.StartupAcm.Size = FileSize;- gFitTableContext.FitEntryNumber ++;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type = FIT_TABLE_TYPE_STARTUP_ACM;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32) (UINTN) FileBuffer;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size = FileSize; // // 1.1 StartupAcm version@@ -1407,7 +1408,10 @@ Returns:
gFitTableContext.StartupAcmVersion = xtoi (argv[Index + 1]); Index += 2; }- } while (FALSE);++ gFitTableContext.StartupAcmNumber ++;+ gFitTableContext.FitEntryNumber ++;+ } // // 1.5. DiagnosticsAcm@@ -1890,7 +1894,9 @@ Returns:
// // Final: Check StartupAcm in BiosModule. //- CheckOverlap (gFitTableContext.StartupAcm.Address, gFitTableContext.StartupAcm.Size);+ for (Index = 0; Index < (INTN)gFitTableContext.StartupAcmNumber; Index++) {+ CheckOverlap (gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size);+ } FitEntryNumber = gFitTableContext.FitEntryNumber; for (Index = 0; Index < (INTN)gFitTableContext.OptionalModuleNumber; Index++) { if ((gFitTableContext.OptionalModule[Index].Type == FIT_TABLE_TYPE_BIOS_POLICY) ||@@ -2178,8 +2184,8 @@ Returns:
} printf ("Total FIT Entry number: 0x%x\n", gFitTableContext.FitEntryNumber); printf ("FitHeader version: 0x%04x\n", gFitTableContext.FitHeaderVersion);- if (gFitTableContext.StartupAcm.Address != 0) {- printf ("StartupAcm - (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.StartupAcm.Address, gFitTableContext.StartupAcm.Size, gFitTableContext.StartupAcmVersion);+ for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {+ printf ("StartupAcm[%d] - (0x%08x, 0x%08x, 0x%04x)\n", Index, gFitTableContext.StartupAcm[Index].Address, gFitTableContext.StartupAcm[Index].Size, gFitTableContext.StartupAcmVersion); } if (gFitTableContext.DiagnstAcm.Address != 0) { printf ("DiagnosticAcm - (0x%08x, 0x%08x, 0x%04x)\n", gFitTableContext.DiagnstAcm.Address, gFitTableContext.DiagnstAcm.Size, gFitTableContext.DiagnstAcmVersion);@@ -2809,8 +2815,8 @@ Returns:
// // 4. StartupAcm //- if (gFitTableContext.StartupAcm.Address != 0) {- FitEntry[FitIndex].Address = gFitTableContext.StartupAcm.Address;+ for (Index = 0; Index < gFitTableContext.StartupAcmNumber; Index++) {+ FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address; *(UINT32 *)&FitEntry[FitIndex].Size[0] = 0; //gFitTableContext.StartupAcm.Size / 16; FitEntry[FitIndex].Version = (UINT16)gFitTableContext.StartupAcmVersion; FitEntry[FitIndex].Type = FIT_TABLE_TYPE_STARTUP_ACM;@@ -3110,7 +3116,7 @@ GetFitEntryInfo (
Routine Description: - Fill the FIT table information to Fvrecovery+ Get the FIT table information from Fvrecovery Arguments: @@ -3164,8 +3170,8 @@ Returns:
gFitTableContext.MicrocodeNumber ++; break; case FIT_TABLE_TYPE_STARTUP_ACM:- gFitTableContext.StartupAcm.Address = (UINT32)FitEntry[FitIndex].Address;- gFitTableContext.StartupAcmVersion = FitEntry[FitIndex].Version;+ gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address = (UINT32)FitEntry[FitIndex].Address;+ gFitTableContext.StartupAcmVersion = FitEntry[FitIndex].Version; break; case FIT_TABLE_TYPE_BIOS_MODULE: gFitTableContext.BiosModule[gFitTableContext.BiosModuleNumber].Address = (UINT32)FitEntry[FitIndex].Address;@@ -3232,6 +3238,7 @@ Returns:
UINT32 FdFileSize; UINT8 *AcmBuffer;+ INTN Index; UINT32 FixedFitLocation; FileBufferRaw = NULL;@@ -3323,22 +3330,23 @@ Returns:
// // Get ACM buffer //- if (gFitTableContext.StartupAcm.Address != 0) {- AcmBuffer = FLASH_TO_MEMORY(gFitTableContext.StartupAcm.Address, FdFileBuffer, FdFileSize);- if ((AcmBuffer < FdFileBuffer) || (AcmBuffer + gFitTableContext.StartupAcm.Size > FdFileBuffer + FdFileSize)) {- printf ("ACM out of range - can not validate it\n");- AcmBuffer = NULL;- }+ for (Index = 0; Index < (INTN)gFitTableContext.StartupAcmNumber; Index ++) {+ if (gFitTableContext.StartupAcm[Index].Address != 0) {+ AcmBuffer = FLASH_TO_MEMORY(gFitTableContext.StartupAcm[Index].Address, FdFileBuffer, FdFileSize);+ if ((AcmBuffer < FdFileBuffer) || (AcmBuffer + gFitTableContext.StartupAcm[Index].Size > FdFileBuffer + FdFileSize)) {+ printf ("ACM out of range - can not validate it\n");+ AcmBuffer = NULL;+ } - if (AcmBuffer != NULL) {- if (CheckAcm ((ACM_FORMAT *)AcmBuffer, gFitTableContext.StartupAcm.Size)) {- DumpAcm ((ACM_FORMAT *)AcmBuffer);- } else {- Status = STATUS_ERROR;- goto exitFunc;+ if (AcmBuffer != NULL) {+ if (CheckAcm ((ACM_FORMAT *)AcmBuffer, gFitTableContext.StartupAcm[Index].Size)) {+ DumpAcm ((ACM_FORMAT *)AcmBuffer);+ } else {+ Status = STATUS_ERROR;+ goto exitFunc;+ } } }- } //@@ -3576,4 +3584,3 @@ Returns:
return u; }-diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h b/Silicon/Intel/Tools/FitGen/FitGen.h
index 5add6a8870..b7de0a6b2d 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.h
+++ b/Silicon/Intel/Tools/FitGen/FitGen.h
@@ -1,7 +1,7 @@
/**@file Definitions for the FitGen utility. -Copyright (c) 2010-2020, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2010-2022, Intel Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Utility version information // #define UTILITY_MAJOR_VERSION 0-#define UTILITY_MINOR_VERSION 64+#define UTILITY_MINOR_VERSION 65 #define UTILITY_DATE __DATE__ //--
2.37.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-07-05 13:07 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-01 15:10 [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Lin, Jason1
2022-07-01 15:10 ` [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage Lin, Jason1
2022-07-01 18:34 ` Oram, Isaac W
2022-07-04 1:37 ` Yuwei Chen
2022-07-01 15:10 ` [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version Lin, Jason1
2022-07-01 18:34 ` Oram, Isaac W
2022-07-04 1:37 ` Yuwei Chen
2022-07-01 18:34 ` [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool Oram, Isaac W
2022-07-04 1:35 ` [edk2-devel] " Yuwei Chen
2022-07-05 13:06 ` Bob Feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox