Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael Kubacki Sent: Thursday, October 28, 2021 3:09 PM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V <rangasai.v.chaga...@intel.com>; Desimone, Nathaniel L <nathaniel.l.desim...@intel.com>; Luo, Heng <heng....@intel.com> Subject: [edk2-devel] [PATCH v6 51/52] TigerlakeSiliconPkg/SpiSmm: Update for SPI2 Protocol
From: Michael Kubacki <michael.kuba...@microsoft.com> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3307 Updates references to the "PCH_SPI_PROTOCOL" to instead refer to "PCH_SPI2_PROTOCOL". Cc: Rangasai V Chaganty <rangasai.v.chaga...@intel.com> Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> Cc: Heng Luo <heng....@intel.com> Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com> --- Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/Spi.c | 10 +++++----- Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/Spi.c b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/Spi.c index 419eddaff38d..a55cb37c4faa 100644 --- a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/Spi.c +++ b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/Spi.c @@ -13,7 +13,7 @@ #include <Library/BaseMemoryLib.h> #include <Library/SmmServicesTableLib.h> #include <Library/PciSegmentLib.h> -#include <Protocol/Spi.h> +#include <Protocol/Spi2.h> #include <Protocol/SmmCpu.h> #include <Library/SpiCommonLib.h> #include <PchReservedResources.h> @@ -45,8 +45,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINT32 mSpiResvMmioAddr; - Documented in System Management Mode Core Interface Specification . - @result - The SPI SMM driver produces @link _PCH_SPI_PROTOCOL PCH_SPI_PROTOCOL @endlink with GUID - gPchSmmSpiProtocolGuid which is different from SPI RUNTIME driver. + The SPI SMM driver produces @link _PCH_SPI2_PROTOCOL PCH_SPI2_PROTOCOL @endlink with GUID + gPchSmmSpi2ProtocolGuid which is different from SPI RUNTIME driver. - <b>Integration Check List</b>\n - This driver supports Descriptor Mode only. @@ -108,11 +108,11 @@ InstallPchSpi ( return Status; } /// - /// Install the SMM PCH_SPI_PROTOCOL interface + /// Install the SMM PCH_SPI2_PROTOCOL interface /// Status = gSmst->SmmInstallProtocolInterface ( &(mSpiInstance->Handle), - &gPchSmmSpiProtocolGuid, + &gPchSmmSpi2ProtocolGuid, EFI_NATIVE_INTERFACE, &(mSpiInstance->SpiProtocol) ); diff --git a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf index f64b84880b31..40feab02d3ef 100644 --- a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf +++ b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Spi/Smm/SpiSmm.inf @@ -39,7 +39,7 @@ [Sources] [Protocols] -gPchSmmSpiProtocolGuid ## PRODUCES +gPchSmmSpi2ProtocolGuid ## PRODUCES gEfiSmmCpuProtocolGuid ## CONSUMES -- 2.28.0.windows.1 -=-=-=-=-=-= Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82871): https://edk2.groups.io/g/devel/message/82871 Mute This Topic: https://groups.io/mt/86664084/1767664 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [nathaniel.l.desim...@intel.com] -=-=-=-=-=-= -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83193): https://edk2.groups.io/g/devel/message/83193 Mute This Topic: https://groups.io/mt/86664084/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
