From c8a2f3c332e9f3c535520d9b127ca7a54f4083fa Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Fri, 17 Nov 2017 14:28:25 +0800 Subject: [PATCH] IntelSiliconPkg: Move MicrocodeUpdate from UefiCpuPkg REF: https://bugzilla.tianocore.org/show_bug.cgi?id=540 To consume FIT table for Microcode update, UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe needs to be updated to consume IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h, but UefiCpuPkg could not depend on IntelSiliconPkg. Since the Microcode update feature is specific to Intel, we can first move the Microcode update feature code from UefiCpuPkg to IntelSiliconPkg [first step], then update the code to consume FIT table [second step]. This patch series is for the first step. Note: No any code change in this patch, just move. Next patch will update MicrocodeUpdate to build with the package. Cc: Jiewen Yao Cc: Michael D Kinney Cc: Eric Dong Cc: Laszlo Ersek Regression-tested-by: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng Reviewed-by: Jiewen Yao Reviewed-by: Eric Dong Acked-by: Laszlo Ersek --- .../MicrocodeFlashAccessLibNull.c | 0 .../MicrocodeFlashAccessLibNull.inf | 0 .../MicrocodeFlashAccessLibNull.uni | 0 .../MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc | 0 .../MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf | 0 .../Feature/Capsule/MicrocodeCapsulePdb/Readme.md | 0 .../MicrocodeCapsuleTxt/Microcode/Microcode.inf | 0 .../MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc | 0 .../MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf | 0 .../Feature/Capsule/MicrocodeCapsuleTxt/Readme.md | 0 .../Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c | 0 .../Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c | 0 .../Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h | 0 .../Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf | 0 .../Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni | 0 .../MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni | 0 .../Include/Guid/MicrocodeFmp.h | 0 .../Include/Library/MicrocodeFlashAccessLib.h | 0 IntelSiliconPkg/IntelSiliconPkg.dec | 10 +++++++++- UefiCpuPkg/UefiCpuPkg.dec | 7 ------- UefiCpuPkg/UefiCpuPkg.dsc | 2 -- 21 files changed, 9 insertions(+), 10 deletions(-) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeCapsulePdb/Readme.md (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Include/Guid/MicrocodeFmp.h (100%) rename {UefiCpuPkg => IntelSiliconPkg}/Include/Library/MicrocodeFlashAccessLib.h (100%) diff --git a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c b/IntelSiliconPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c similarity index 100% rename from UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c rename to IntelSiliconPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.c diff --git a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf b/IntelSiliconPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf similarity index 100% rename from UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf rename to IntelSiliconPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf diff --git a/UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni b/IntelSiliconPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni similarity index 100% rename from UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni rename to IntelSiliconPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.uni diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc b/IntelSiliconPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc rename to IntelSiliconPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.dsc diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf b/IntelSiliconPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf rename to IntelSiliconPkg/Feature/Capsule/MicrocodeCapsulePdb/MicrocodeCapsulePdb.fdf diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/Readme.md b/IntelSiliconPkg/Feature/Capsule/MicrocodeCapsulePdb/Readme.md similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeCapsulePdb/Readme.md rename to IntelSiliconPkg/Feature/Capsule/MicrocodeCapsulePdb/Readme.md diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf b/IntelSiliconPkg/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf rename to IntelSiliconPkg/Feature/Capsule/MicrocodeCapsuleTxt/Microcode/Microcode.inf diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc b/IntelSiliconPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc rename to IntelSiliconPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.dsc diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf b/IntelSiliconPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf rename to IntelSiliconPkg/Feature/Capsule/MicrocodeCapsuleTxt/MicrocodeCapsuleTxt.fdf diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md b/IntelSiliconPkg/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md rename to IntelSiliconPkg/Feature/Capsule/MicrocodeCapsuleTxt/Readme.md diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c rename to IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeFmp.c diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c rename to IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h rename to IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.h diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf rename to IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni rename to IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.uni diff --git a/UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni similarity index 100% rename from UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni rename to IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxeExtra.uni diff --git a/UefiCpuPkg/Include/Guid/MicrocodeFmp.h b/IntelSiliconPkg/Include/Guid/MicrocodeFmp.h similarity index 100% rename from UefiCpuPkg/Include/Guid/MicrocodeFmp.h rename to IntelSiliconPkg/Include/Guid/MicrocodeFmp.h diff --git a/UefiCpuPkg/Include/Library/MicrocodeFlashAccessLib.h b/IntelSiliconPkg/Include/Library/MicrocodeFlashAccessLib.h similarity index 100% rename from UefiCpuPkg/Include/Library/MicrocodeFlashAccessLib.h rename to IntelSiliconPkg/Include/Library/MicrocodeFlashAccessLib.h diff --git a/IntelSiliconPkg/IntelSiliconPkg.dec b/IntelSiliconPkg/IntelSiliconPkg.dec index b88630d138..a15d3dee39 100644 --- a/IntelSiliconPkg/IntelSiliconPkg.dec +++ b/IntelSiliconPkg/IntelSiliconPkg.dec @@ -3,7 +3,7 @@ # # This package provides common open source Intel silicon modules. # -# Copyright (c) 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
# This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. # The full text of the license may be found at @@ -23,6 +23,11 @@ [Includes] Include +[LibraryClasses.IA32, LibraryClasses.X64] + ## @libraryclass Provides services to access Microcode region on flash device. + # + MicrocodeFlashAccessLib|Include/Library/MicrocodeFlashAccessLib.h + [Guids] ## GUID for Package token space # {A9F8D54E-1107-4F0A-ADD0-4587E7A4A735} @@ -33,6 +38,9 @@ # Generic DXE Library / Driver can locate HOB(s) and add SMBIOS records into SMBIOS table gIntelSmbiosDataHobGuid = { 0x798e722e, 0x15b2, 0x4e13, { 0x8a, 0xe9, 0x6b, 0xa3, 0x0f, 0xf7, 0xf1, 0x67 }} + ## Include/Guid/MicrocodeFmp.h + gMicrocodeFmpImageTypeIdGuid = { 0x96d4fdcd, 0x1502, 0x424d, { 0x9d, 0x4c, 0x9b, 0x12, 0xd2, 0xdc, 0xae, 0x5c } } + [Ppis] gEdkiiVTdInfoPpiGuid = { 0x8a59fcb3, 0xf191, 0x400c, { 0x97, 0x67, 0x67, 0xaf, 0x2b, 0x25, 0x68, 0x4a } } diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec index 3bd8740c98..d2965ba14c 100644 --- a/UefiCpuPkg/UefiCpuPkg.dec +++ b/UefiCpuPkg/UefiCpuPkg.dec @@ -59,17 +59,10 @@ ## MpInitLib|Include/Library/MpInitLib.h - ## @libraryclass Provides services to access Microcode region on flash device. - # - MicrocodeFlashAccessLib|Include/Library/MicrocodeFlashAccessLib.h - [Guids] gUefiCpuPkgTokenSpaceGuid = { 0xac05bf33, 0x995a, 0x4ed4, { 0xaa, 0xb8, 0xef, 0x7a, 0xe8, 0xf, 0x5c, 0xb0 }} gMsegSmramGuid = { 0x5802bce4, 0xeeee, 0x4e33, { 0xa1, 0x30, 0xeb, 0xad, 0x27, 0xf0, 0xe4, 0x39 }} - ## Include/Guid/MicrocodeFmp.h - gMicrocodeFmpImageTypeIdGuid = { 0x96d4fdcd, 0x1502, 0x424d, { 0x9d, 0x4c, 0x9b, 0x12, 0xd2, 0xdc, 0xae, 0x5c } } - ## Include/Guid/CpuFeaturesSetDone.h gEdkiiCpuFeaturesSetDoneGuid = { 0xa82485ce, 0xad6b, 0x4101, { 0x99, 0xd3, 0xe1, 0x35, 0x8c, 0x9e, 0x7e, 0x37 }} diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc index 41cf809559..d9a3d2d654 100644 --- a/UefiCpuPkg/UefiCpuPkg.dsc +++ b/UefiCpuPkg/UefiCpuPkg.dsc @@ -61,7 +61,6 @@ SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf - MicrocodeFlashAccessLib|UefiCpuPkg/Feature/Capsule/Library/MicrocodeFlashAccessLibNull/MicrocodeFlashAccessLibNull.inf TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf [LibraryClasses.common.SEC] @@ -152,7 +151,6 @@ SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf } UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf - UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES