From 4e7aff6a1434396beddc1889e2f6a1c20182edcc Mon Sep 17 00:00:00 2001 From: Abdul Lateef Attar Date: Tue, 17 Sep 2024 06:54:23 +0000 Subject: [PATCH 1/5] AmdPlatformPkg: Adds stuart ci.yaml file Adds ci.yaml file for AmdPlatformPkg to enable stuart CI build. Cc: Abner Chang Cc: Paul Grimes Signed-off-by: Abdul Lateef Attar --- .../AMD/AmdPlatformPkg/AmdPlatformPkg.ci.yaml | 139 ++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.ci.yaml diff --git a/Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.ci.yaml b/Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.ci.yaml new file mode 100644 index 0000000000..b6b25dc185 --- /dev/null +++ b/Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.ci.yaml @@ -0,0 +1,139 @@ +## @file +# CI configuration for AmdPlatformPkg +# +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. +# SPDX-License-Identifier: BSD-2-Clause-Patent +## +{ + "PrEval": { + "DscPath": "AmdPlatformPkg.dsc", + }, + ## options defined .pytool/Plugin/LicenseCheck + "LicenseCheck": { + "IgnoreFiles": [] + }, + "EccCheck": { + ## Exception sample looks like below: + ## "ExceptionList": [ + ## "", "" + ## ] + "ExceptionList": [ + ], + ## Both file path and directory path are accepted. + "IgnoreFiles": [ + ] + }, + ## options defined ci/Plugin/CompilerPlugin + "CompilerPlugin": { + "DscPath": "AmdPlatformPkg.dsc" + }, + ## options defined ci/Plugin/HostUnitTestCompilerPlugin + "HostUnitTestCompilerPlugin": { + "DscPath": "" + }, + + ## options defined ci/Plugin/CharEncodingCheck + "CharEncodingCheck": { + "IgnoreFiles": [] + }, + + ## options defined ci/Plugin/DependencyCheck + "DependencyCheck": { + "AcceptableDependencies": [ + "AgesaModulePkg/AgesaCommonModulePkg.dec", + "AgesaModulePkg/AgesaEdk2Pkg.dec", + "AgesaModulePkg/AgesaModuleFchPkg.dec", + "AgesaModulePkg/AgesaModuleNbioPkg.dec", + "AgesaModulePkg/AgesaModulePspPkg.dec", + "AgesaPkg/AgesaPkg.dec", + "AmdCpmPkg/AmdCpmPkg.dec", + "AmdMinBoardPkg/AmdMinBoardPkg.dec", + "AmdPlatformPkg/AmdPlatformPkg.dec", + "BoardModulePkg/BoardModulePkg.dec", + "DynamicTablesPkg/DynamicTablesPkg.dec", + "IpmiFeaturePkg/IpmiFeaturePkg.dec", + "MdeModulePkg/MdeModulePkg.dec", + "MdePkg/MdePkg.dec", + "MinPlatformPkg/MinPlatformPkg.dec", + "PcAtChipsetPkg/PcAtChipsetPkg.dec", + "SignedCapsulePkg/SignedCapsulePkg.dec", + "SecurityPkg/SecurityPkg.dec", + "UefiCpuPkg/UefiCpuPkg.dec", + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec" + ], + # For host based unit tests + "AcceptableDependencies-HOST_APPLICATION":[ + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec" + ], + # For UEFI shell based apps + "AcceptableDependencies-UEFI_APPLICATION":[], + "IgnoreInf": [] + }, + + ## options defined ci/Plugin/DscCompleteCheck + "DscCompleteCheck": { + "IgnoreInf": [ + ], + "DscPath": "AmdPlatformPkg.dsc" + }, + ## options defined ci/Plugin/HostUnitTestDscCompleteCheck + "HostUnitTestDscCompleteCheck": { + "IgnoreInf": [""], + ## "DscPath": "Test/AmdPlatformPkgHostTest.dsc" + }, + + ## options defined ci/Plugin/GuidCheck + "GuidCheck": { + "IgnoreGuidName": [], + "IgnoreGuidValue": [], + "IgnoreFoldersAndFiles": [], + "IgnoreDuplicates": [] + }, + + ## options defined ci/Plugin/LibraryClassCheck + "LibraryClassCheck": { + "IgnoreHeaderFile": [] + }, + + ## options defined ci/Plugin/SpellCheck + "SpellCheck": { + "AuditOnly": False, # If True, only audit the files, do not fail the build + "IgnoreStandardPaths": [ # Standard Plugin defined paths that should be ignore + ## "*.c", "*.asm", "*.h", "*.nasm", "*.s", "*.asl", "*.inf" + ], + "IgnoreFiles": [ # use gitignore syntax to ignore errors in matching files + ], + "ExtendWords": [ # words to extend to the dictionary for this package + "agesa", + "defaultdb", + "defaultdbx", + "deviceid", + "eisaid", + "flashid", + "iomux", + "jedec", + "oemid", + "pmioa", + "ppread", + "rdsfdp", + "smdbg", + "ssdtproc", + "eeprom", + "gpiox", + "agpio", + "sgpio", + "acpimmio", + "glink", + "ehci's", + "uhci's" + ], + "AdditionalIncludePaths": [] # Additional paths to spell check relative to package root (wildcards supported) + }, + "DebugMacroCheck": { + "StringSubstitutions": { + # Reason: Expansion of macro that contains a print specifier. + # AMD can write its own print specifier. + # "AMD_PRINT": "0x%lx" + } + } +} From 2eea3bc826886db2193f6cd0dac1e805bf10a248 Mon Sep 17 00:00:00 2001 From: Abdul Lateef Attar Date: Tue, 17 Sep 2024 06:57:06 +0000 Subject: [PATCH 2/5] AmdMinBoardPkg: Adds stuart ci.yaml file Adds ci.yaml file for AmdMinBoardPkg to enable stuart CI build. Cc: Abner Chang Cc: Paul Grimes Signed-off-by: Abdul Lateef Attar --- .../AMD/AmdMinBoardPkg/AmdMinBoardPkg.ci.yaml | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.ci.yaml diff --git a/Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.ci.yaml b/Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.ci.yaml new file mode 100644 index 0000000000..0e6317cf35 --- /dev/null +++ b/Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.ci.yaml @@ -0,0 +1,114 @@ +## @file +# CI configuration for AmdMinBoardPkg +# +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. +# SPDX-License-Identifier: BSD-2-Clause-Patent +## +{ + "PrEval": { + "DscPath": "AmdMinBoardPkg.dsc", + }, + ## options defined .pytool/Plugin/LicenseCheck + "LicenseCheck": { + "IgnoreFiles": [] + }, + "EccCheck": { + ## Exception sample looks like below: + ## "ExceptionList": [ + ## "", "" + ## ] + "ExceptionList": [ + ], + ## Both file path and directory path are accepted. + "IgnoreFiles": [ + ] + }, + ## options defined ci/Plugin/CompilerPlugin + "CompilerPlugin": { + "DscPath": "AmdMinBoardPkg.dsc" + }, + ## options defined ci/Plugin/HostUnitTestCompilerPlugin + "HostUnitTestCompilerPlugin": { + "DscPath": "" + }, + + ## options defined ci/Plugin/CharEncodingCheck + "CharEncodingCheck": { + "IgnoreFiles": [] + }, + + ## options defined ci/Plugin/DependencyCheck + "DependencyCheck": { + "AcceptableDependencies": [ + "AmdMinBoardPkg/AmdMinBoardPkg.dec", + "AmdPlatformPkg/AmdPlatformPkg.dec", + "BoardModulePkg/BoardModulePkg.dec", + "DynamicTablesPkg/DynamicTablesPkg.dec", + "IpmiFeaturePkg/IpmiFeaturePkg.dec", + "ManageabilityPkg/ManageabilityPkg.dec", + "MdeModulePkg/MdeModulePkg.dec", + "MdePkg/MdePkg.dec", + "MinPlatformPkg/MinPlatformPkg.dec", + "PcAtChipsetPkg/PcAtChipsetPkg.dec", + "SecurityPkg/SecurityPkg.dec", + "UefiCpuPkg/UefiCpuPkg.dec", + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec" + ], + # For host based unit tests + "AcceptableDependencies-HOST_APPLICATION":[ + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec" + ], + # For UEFI shell based apps + "AcceptableDependencies-UEFI_APPLICATION":[], + "IgnoreInf": [] + }, + + ## options defined ci/Plugin/DscCompleteCheck + "DscCompleteCheck": { + "IgnoreInf": [], + "DscPath": "AmdMinBoardPkg.dsc" + }, + ## options defined ci/Plugin/HostUnitTestDscCompleteCheck + "HostUnitTestDscCompleteCheck": { + "IgnoreInf": [""], + ## "DscPath": "Test/AmdMinBoardPkgHostTest.dsc" + }, + + ## options defined ci/Plugin/GuidCheck + "GuidCheck": { + "IgnoreGuidName": [], + "IgnoreGuidValue": [], + "IgnoreFoldersAndFiles": [], + "IgnoreDuplicates": [] + }, + + ## options defined ci/Plugin/LibraryClassCheck + "LibraryClassCheck": { + "IgnoreHeaderFile": [] + }, + + ## options defined ci/Plugin/SpellCheck + "SpellCheck": { + "AuditOnly": False, # If True, only audit the files, do not fail the build + "IgnoreStandardPaths": [ # Standard Plugin defined paths that should be ignore + ## "*.c", "*.asm", "*.h", "*.nasm", "*.s", "*.asl", "*.inf" + ], + "IgnoreFiles": [ # use gitignore syntax to ignore errors in matching files + ], + "ExtendWords": [ # words to extend to the dictionary for this package + "acpitable", + "agesa", + "lapic", + "pciexbar", + "rdtsc" + ], + "AdditionalIncludePaths": [] # Additional paths to spell check relative to package root (wildcards supported) + }, + "DebugMacroCheck": { + "StringSubstitutions": { + # Reason: Expansion of macro that contains a print specifier. + # AMD can write its own print specifier. + # "AMD_PRINT": "0x%lx" + } + } +} From fd6668a05e5c55d4ecb432e2410fe378b3593f84 Mon Sep 17 00:00:00 2001 From: Abdul Lateef Attar Date: Tue, 17 Sep 2024 07:00:38 +0000 Subject: [PATCH 3/5] Platform/AMD: Adds platform ci configuration file Cc: Abner Chang Cc: Paul Grimes Signed-off-by: Abdul Lateef Attar --- Platform/AMD/CISettings.py | 269 +++++++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) create mode 100644 Platform/AMD/CISettings.py diff --git a/Platform/AMD/CISettings.py b/Platform/AMD/CISettings.py new file mode 100644 index 0000000000..82318fa92d --- /dev/null +++ b/Platform/AMD/CISettings.py @@ -0,0 +1,269 @@ +# @file +# +# Copyright (c) Microsoft Corporation. +# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.
+# Copyright (c) 2020 - 2021, ARM Limited. All rights reserved.
+# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +## +import os +import logging +import sys +from edk2toolext.environment import shell_environment +from edk2toolext.invocables.edk2_ci_build import CiBuildSettingsManager +from edk2toolext.invocables.edk2_setup import SetupSettingsManager, RequiredSubmodule +from edk2toolext.invocables.edk2_update import UpdateSettingsManager +from edk2toolext.invocables.edk2_pr_eval import PrEvalSettingsManager +from edk2toollib.utility_functions import GetHostInfo +from pathlib import Path + + +try: + # Temporarily needed until edk2 can update to the latest edk2-pytools + # that has the CodeQL helpers. + # + # May not be present until submodules are populated. + # + root = Path(__file__).parent.parent.resolve() + sys.path.append(str(root/'BaseTools'/'Plugin'/'CodeQL'/'integration')) + import stuart_codeql as codeql_helpers +except ImportError: + pass + + +class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManager, PrEvalSettingsManager): + + def __init__(self): + self.ActualPackages = [] + self.ActualTargets = [] + self.ActualArchitectures = [] + self.ActualToolChainTag = "" + self.UseBuiltInBaseTools = None + self.ActualScopes = None + + # ####################################################################################### # + # Extra CmdLine configuration # + # ####################################################################################### # + + def AddCommandLineOptions(self, parserObj): + group = parserObj.add_mutually_exclusive_group() + group.add_argument("-force_piptools", "--fpt", dest="force_piptools", action="store_true", default=False, help="Force the system to use pip tools") + group.add_argument("-no_piptools", "--npt", dest="no_piptools", action="store_true", default=False, help="Force the system to not use pip tools") + + try: + codeql_helpers.add_command_line_option(parserObj) + except NameError: + pass + + def RetrieveCommandLineOptions(self, args): + super().RetrieveCommandLineOptions(args) + if args.force_piptools: + self.UseBuiltInBaseTools = True + if args.no_piptools: + self.UseBuiltInBaseTools = False + + try: + self.codeql = codeql_helpers.is_codeql_enabled_on_command_line(args) + except NameError: + pass + + # ####################################################################################### # + # Default Support for this Ci Build # + # ####################################################################################### # + + def GetPackagesSupported(self): + ''' return iterable of edk2 packages supported by this build. + These should be edk2 workspace relative paths ''' + + return ("AmdMinBoardPkg", + "AmdPlatformPkg" + ) + + def GetArchitecturesSupported(self): + ''' return iterable of edk2 architectures supported by this build ''' + return ( + "IA32", + "X64") + + def GetTargetsSupported(self): + ''' return iterable of edk2 target tags supported by this build ''' + return ("DEBUG", "RELEASE", "NO-TARGET", "NOOPT") + + # ####################################################################################### # + # Verify and Save requested Ci Build Config # + # ####################################################################################### # + + def SetPackages(self, list_of_requested_packages): + ''' Confirm the requested package list is valid and configure SettingsManager + to build the requested packages. + + Raise UnsupportedException if a requested_package is not supported + ''' + unsupported = set(list_of_requested_packages) - \ + set(self.GetPackagesSupported()) + if(len(unsupported) > 0): + logging.critical( + "Unsupported Package Requested: " + " ".join(unsupported)) + raise Exception("Unsupported Package Requested: " + + " ".join(unsupported)) + self.ActualPackages = list_of_requested_packages + + def SetArchitectures(self, list_of_requested_architectures): + ''' Confirm the requests architecture list is valid and configure SettingsManager + to run only the requested architectures. + + Raise Exception if a list_of_requested_architectures is not supported + ''' + unsupported = set(list_of_requested_architectures) - \ + set(self.GetArchitecturesSupported()) + if(len(unsupported) > 0): + logging.critical( + "Unsupported Architecture Requested: " + " ".join(unsupported)) + raise Exception( + "Unsupported Architecture Requested: " + " ".join(unsupported)) + self.ActualArchitectures = list_of_requested_architectures + + def SetTargets(self, list_of_requested_target): + ''' Confirm the request target list is valid and configure SettingsManager + to run only the requested targets. + + Raise UnsupportedException if a requested_target is not supported + ''' + unsupported = set(list_of_requested_target) - \ + set(self.GetTargetsSupported()) + if(len(unsupported) > 0): + logging.critical( + "Unsupported Targets Requested: " + " ".join(unsupported)) + raise Exception("Unsupported Targets Requested: " + + " ".join(unsupported)) + self.ActualTargets = list_of_requested_target + + # ####################################################################################### # + # Actual Configuration for Ci Build # + # ####################################################################################### # + + def GetActiveScopes(self): + ''' return tuple containing scopes that should be active for this process ''' + if self.ActualScopes is None: + scopes = ("cibuild", "edk2-build", "host-based-test") + + self.ActualToolChainTag = shell_environment.GetBuildVars().GetValue("TOOL_CHAIN_TAG", "") + + is_linux = GetHostInfo().os.upper() == "LINUX" + + if self.UseBuiltInBaseTools is None: + is_linux = GetHostInfo().os.upper() == "LINUX" + # try and import the pip module for basetools + try: + import edk2basetools + self.UseBuiltInBaseTools = True + except ImportError: + self.UseBuiltInBaseTools = False + pass + + if self.UseBuiltInBaseTools == True: + scopes += ('pipbuild-unix',) if is_linux else ('pipbuild-win',) + logging.warning("Using Pip Tools based BaseTools") + else: + logging.warning("Falling back to using in-tree BaseTools") + + try: + scopes += codeql_helpers.get_scopes(self.codeql) + + if self.codeql: + shell_environment.GetBuildVars().SetValue( + "STUART_CODEQL_AUDIT_ONLY", + "TRUE", + "Set in CISettings.py") + except NameError: + pass + + self.ActualScopes = scopes + return self.ActualScopes + + def GetRequiredSubmodules(self): + ''' return iterable containing RequiredSubmodule objects. + If no RequiredSubmodules return an empty iterable + ''' + rs = [] + rs.append(RequiredSubmodule( + "ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3", False)) + rs.append(RequiredSubmodule( + "CryptoPkg/Library/OpensslLib/openssl", False)) + rs.append(RequiredSubmodule( + "UnitTestFrameworkPkg/Library/CmockaLib/cmocka", False)) + rs.append(RequiredSubmodule( + "UnitTestFrameworkPkg/Library/GoogleTestLib/googletest", False)) + rs.append(RequiredSubmodule( + "MdeModulePkg/Universal/RegularExpressionDxe/oniguruma", False)) + rs.append(RequiredSubmodule( + "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli", False)) + rs.append(RequiredSubmodule( + "BaseTools/Source/C/BrotliCompress/brotli", False)) + rs.append(RequiredSubmodule( + "RedfishPkg/Library/JsonLib/jansson", False)) + rs.append(RequiredSubmodule( + "UnitTestFrameworkPkg/Library/SubhookLib/subhook", False)) + rs.append(RequiredSubmodule( + "MdePkg/Library/BaseFdtLib/libfdt", False)) + rs.append(RequiredSubmodule( + "MdePkg/Library/MipiSysTLib/mipisyst", False)) + rs.append(RequiredSubmodule( + "CryptoPkg/Library/MbedTlsLib/mbedtls", False)) + rs.append(RequiredSubmodule( + "SecurityPkg/DeviceSecurity/SpdmLib/libspdm", False)) + return rs + + def GetName(self): + return "Edk2" + + def GetDependencies(self): + return [ + ] + + def GetPackagesPath(self): + relpath = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + relpath = relpath[:relpath.index("edk2-platforms")] + pkgpath = [] + pkgpath.append(relpath) + pkgpath.append(os.path.join(relpath, "edk2")) + pkgpath.append(os.path.join(relpath, "edk2-platforms")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Features")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Platform", "AMD")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Features", "Intel", "Debugging")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Features", "Intel", "Network")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Features", "Intel", "OutOfBandManagement")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Features", "Intel", "PowerManagement")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Features", "Intel", "SystemInformation")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Features", "Intel", "UserInterface")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Features", "Intel")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Platform", "Intel")) + pkgpath.append(os.path.join(relpath, "edk2-platforms", "Silicon", "Intel")) + return pkgpath + + def GetWorkspaceRoot(self): + ''' get WorkspacePath ''' + wsroot = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + wsroot = os.path.join (wsroot[:wsroot.index("edk2-platforms")], "edk2") + #return os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + return wsroot + + def FilterPackagesToTest(self, changedFilesList: list, potentialPackagesList: list) -> list: + ''' Filter potential packages to test based on changed files. ''' + build_these_packages = [] + possible_packages = potentialPackagesList.copy() + for f in changedFilesList: + # split each part of path for comparison later + nodes = f.split("/") + + # python file change in .pytool folder causes building all + if f.endswith(".py") and ".pytool" in nodes: + build_these_packages = possible_packages + break + + # BaseTools files that might change the build + if "BaseTools" in nodes: + if os.path.splitext(f) not in [".txt", ".md"]: + build_these_packages = possible_packages + break + return build_these_packages From 3a88b648938025363a00b26061070d6f88c8f7d8 Mon Sep 17 00:00:00 2001 From: Abdul Lateef Attar Date: Tue, 17 Sep 2024 07:18:08 +0000 Subject: [PATCH 4/5] AmdMinBoardPkg: Fix the stuart_ci_build failure Remove blank space between "|" so that parser can recognize the architecture and build type. Cc: Abner Chang Cc: Paul Grimes Signed-off-by: Abdul Lateef Attar --- Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.dsc b/Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.dsc index dd161fd73d..bd5a76709a 100644 --- a/Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.dsc +++ b/Platform/AMD/AmdMinBoardPkg/AmdMinBoardPkg.dsc @@ -13,8 +13,8 @@ PLATFORM_NAME = AmdMinBoardPkg PLATFORM_VERSION = 0.1 OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME) - BUILD_TARGETS = DEBUG | RELEASE | NOOPT - SUPPORTED_ARCHITECTURES = IA32 | X64 + BUILD_TARGETS = DEBUG|RELEASE|NOOPT + SUPPORTED_ARCHITECTURES = IA32|X64 [Packages] AmdMinBoardPkg/AmdMinBoardPkg.dec From 9f49483958d5cefea17ac835d7a3ba162c83d2ae Mon Sep 17 00:00:00 2001 From: Abdul Lateef Attar Date: Tue, 17 Sep 2024 07:32:35 +0000 Subject: [PATCH 5/5] AmdPlatformPkg: Fix stuart_ci_build failures Cc: Abner Chang Cc: Paul Grimes Signed-off-by: Abdul Lateef Attar --- Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.dec | 2 +- .../DynamicTables/Library/Acpi/AcpiMadtLib/AcpiMadtLib.c | 6 +++--- .../Acpi/AcpiSsdtCpuTopologyLib/AcpiSsdtCpuTopologyLib.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.dec b/Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.dec index fbb2137c4a..6be301fd77 100644 --- a/Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.dec +++ b/Platform/AMD/AmdPlatformPkg/AmdPlatformPkg.dec @@ -106,7 +106,7 @@ gAmdPlatformPkgTokenSpaceGuid.PcdAmdSmbiosType9SlotCharacteristics2.AsyncSurpriseRemoval|0 gAmdPlatformPkgTokenSpaceGuid.PcdAmdSmbiosType9SlotCharacteristics2.FlexbusSlotCxl10Capable|0 gAmdPlatformPkgTokenSpaceGuid.PcdAmdSmbiosType9SlotCharacteristics2.FlexbusSlotCxl20Capable|0 - gAmdPlatformPkgTokenSpaceGuid.PcdAmdSmbiosType9SlotCharacteristics2.Reserved|0 + gAmdPlatformPkgTokenSpaceGuid.PcdAmdSmbiosType9SlotCharacteristics2.FlexbusSlotCxl30Capable|0 # # SPI PCDs diff --git a/Platform/AMD/AmdPlatformPkg/DynamicTables/Library/Acpi/AcpiMadtLib/AcpiMadtLib.c b/Platform/AMD/AmdPlatformPkg/DynamicTables/Library/Acpi/AcpiMadtLib/AcpiMadtLib.c index 89bfad2e4c..16e2849ad9 100644 --- a/Platform/AMD/AmdPlatformPkg/DynamicTables/Library/Acpi/AcpiMadtLib/AcpiMadtLib.c +++ b/Platform/AMD/AmdPlatformPkg/DynamicTables/Library/Acpi/AcpiMadtLib/AcpiMadtLib.c @@ -149,7 +149,7 @@ GenerateLocalNmi ( **/ EFI_STATUS -GenerateIntrruptSourceOverride ( +GenerateinterruptSourceOverride ( IN OUT EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE **InterruptSourceOverride, IN OUT UINTN *InterruptSourceOverrideSize ) @@ -343,7 +343,7 @@ GenerateProcessorLocalApicStructure ( } } - /// Increatement the NumSocket and ThreadsPerCore by 1, as it is 0 based + /// increment the NumSocket and ThreadsPerCore by 1, as it is 0 based NumSocket++; ThreadsPerCore++; @@ -704,7 +704,7 @@ AcpiMadtLibConstructor ( TableSize += IoApicSize; /// Generate Interrupt Source Override Structure - Status = GenerateIntrruptSourceOverride (&InterruptSourceOverride, &InterruptSourceOverrideSize); + Status = GenerateinterruptSourceOverride (&InterruptSourceOverride, &InterruptSourceOverrideSize); if (EFI_ERROR (Status)) { DEBUG (( DEBUG_ERROR, diff --git a/Platform/AMD/AmdPlatformPkg/DynamicTables/Library/Acpi/AcpiSsdtCpuTopologyLib/AcpiSsdtCpuTopologyLib.c b/Platform/AMD/AmdPlatformPkg/DynamicTables/Library/Acpi/AcpiSsdtCpuTopologyLib/AcpiSsdtCpuTopologyLib.c index 05659a3811..b5ccb99eb5 100644 --- a/Platform/AMD/AmdPlatformPkg/DynamicTables/Library/Acpi/AcpiSsdtCpuTopologyLib/AcpiSsdtCpuTopologyLib.c +++ b/Platform/AMD/AmdPlatformPkg/DynamicTables/Library/Acpi/AcpiSsdtCpuTopologyLib/AcpiSsdtCpuTopologyLib.c @@ -141,7 +141,7 @@ GenerateApicIdToUidMap ( } } - // Increarement the SocketCount by 1 because socket numbering starts from 0 + // increment the SocketCount by 1 because socket numbering starts from 0 SocketCount++; if (SocketCount > 1) {