Address comments on 2024/11/14

microsoft · Nov 14, 2024 · d135b1d · d135b1d
1 parent 05d3f94
commit d135b1d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 125 deletions.
diff --git a/SetupDataPkg/Include/Library/PlatformConfigDataLib.h b/SetupDataPkg/Include/Library/PlatformConfigDataLib.h
@@ -16,6 +16,10 @@
 #include <Uefi.h>
 #include <ConfigStdStructDefs.h>
 
+#define SCHEMA_XML_HASH_VAR_NAME  L"SCHEMA_XML_HASH"
+#define SCHEMA_XML_HASH_GUID      = {0x1321e012, 0x14c5, 0x42db, { 0x8c, 0xa9, 0xe7, 0x97, 0x1d, 0x88, 0x15, 0x18 }}
+
+extern CHAR8      *gSchemaXmlHash;
 extern KNOB_DATA  gKnobData[];
 extern UINTN      gNumKnobs;
 extern PROFILE    gProfileData[];

diff --git a/SetupDataPkg/SetupDataDxe/SchemaXmlHashDriver/SchemaXmlHash.c b/SetupDataPkg/SetupDataDxe/SchemaXmlHashDriver/SchemaXmlHash.c
diff --git a/SetupDataPkg/SetupDataDxe/SchemaXmlHashDriver/SchemaXmlHash.inf b/SetupDataPkg/SetupDataDxe/SchemaXmlHashDriver/SchemaXmlHash.inf
diff --git a/SetupDataPkg/SetupDataPkg.dsc b/SetupDataPkg/SetupDataPkg.dsc
@@ -87,7 +87,6 @@
 
 [Components.X64, Components.AARCH64]
   SetupDataPkg/ConfApp/ConfApp.inf
-  SetupDataPkg/SetupDataDxe/SchemaXmlHashDriver/SchemaXmlHash.inf
 
 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
diff --git a/SetupDataPkg/Tools/BoardMiscInfo.py b/SetupDataPkg/Tools/BoardMiscInfo.py
@@ -41,7 +41,7 @@ def get_schema_xml_hash_from_bios():
     UefiVar = UefiVariable()
     (errorcode, data) = UefiVar.GetUefiVar(SCHEMA_XML_HASH_VAR_NAME, SCHEMA_XML_HASH_GUID)
 
-    result = "Unknown"
+    result = None
     if errorcode == 0:
         result = data.decode("utf-8")
 

diff --git a/SetupDataPkg/Tools/ConfigEditor.py b/SetupDataPkg/Tools/ConfigEditor.py
@@ -394,7 +394,7 @@ def __init__(self, master=None):
         # self.page_cfg_map[page_id] = cfg_data_idx
         self.page_cfg_map = {}
 
-        self.bios_schema_xml_hash = "Unknown"
+        self.bios_schema_xml_hash = None
 
         # Check if current directory contains a file with a .yaml extension
         # if not default self.last_dir to a Platform directory where it is
@@ -977,8 +977,8 @@ def load_cfg_file(self, path, file_id, clear_config):
         # load xml file and get the hash value of all xml nodes
         config_xml_hash = get_xml_full_hash(self.config_xml_path)
 
-        # compare the xml version with self.bios_git_info, 7 digits should be enough
-        if self.bios_schema_xml_hash != "Unknown" and config_xml_hash != self.bios_schema_xml_hash:
+        # Compare the xml hash and the hash claimed in FW.
+        if self.bios_schema_xml_hash is not None and config_xml_hash != self.bios_schema_xml_hash:
             self.output_current_status("WARNING: Config xml file hash mismatches with system FW", color="red")
             self.output_current_status(f"FW ConfigXml Hash = {self.bios_schema_xml_hash}", color="red")
             self.output_current_status(f"{self.config_xml_path} Hash  = {config_xml_hash}", color="red")

diff --git a/SetupDataPkg/Tools/KnobService.py b/SetupDataPkg/Tools/KnobService.py
@@ -633,10 +633,7 @@ def generate_cached_implementation(schema, header_path, efi_type=False, no_chang
         out.write("// Generated Header" + get_line_ending(efi_type))
         out.write("//  Script: {}".format(sys.argv[0]) + get_line_ending(efi_type))
         out.write("//  Schema: {}".format(schema.path) + get_line_ending(efi_type))
-        out.write('#define SCHEMA_XML_HASH "' + get_xml_full_hash(schema.path) + '"' + get_line_ending(efi_type))
-        out.write('#define SCHEMA_XML_HASH_VAR_NAME L"SCHEMA_XML_HASH"' + get_line_ending(efi_type))
-        xml_hash_guid = "{0x1321e012, 0x14c5, 0x42db, { 0x8c, 0xa9, 0xe7, 0x97, 0x1d, 0x88, 0x15, 0x18 }}"
-        out.write('#define SCHEMA_XML_HASH_GUID ' + xml_hash_guid + get_line_ending(efi_type))
+        out.write('CHAR8 *gSchemaXmlHash = "' + get_xml_full_hash(schema.path) + '";' + get_line_ending(efi_type))
         out.write("" + get_line_ending(efi_type))
 
         out.write("typedef struct {" + get_line_ending(efi_type))