Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> -----Original Message----- From: mikub...@linux.microsoft.com <mikub...@linux.microsoft.com> Sent: Thursday, October 28, 2021 3:09 PM To: devel@edk2.groups.io Cc: Chiu, Chasel <chasel.c...@intel.com>; Chaganty, Rangasai V <rangasai.v.chaga...@intel.com>; Desimone, Nathaniel L <nathaniel.l.desim...@intel.com> Subject: [PATCH v6 42/52] CoffeelakeSiliconPkg: Update for SPI2 PPI and 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" and "PCH_SPI_PPI" to instead refer to "PCH_SPI2_PROTOCOL" and "PCH_SPI2_PPI". Cc: Chasel Chiu <chasel.c...@intel.com> Cc: Rangasai V Chaganty <rangasai.v.chaga...@intel.com> Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com> --- Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PchSpi.c | 10 +++++----- Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpi.c | 10 +++++----- Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf | 2 +- Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PchSpi.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PchSpi.c index 1a5db7f24a49..543e42973ae9 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PchSpi.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PchSpi.c @@ -11,7 +11,7 @@ #include <Library/MemoryAllocationLib.h> #include <Library/PeiServicesLib.h> #include <Library/PciSegmentLib.h> -#include <Ppi/Spi.h> +#include <Ppi/Spi2.h> #include <Private/Library/PchSpiCommonLib.h> #include <PchReservedResources.h> #include <IndustryStandard/Pci30.h> @@ -62,13 +62,13 @@ SpiServiceInit ( EFI_STATUS Status; PEI_SPI_INSTANCE *PeiSpiInstance; SPI_INSTANCE *SpiInstance; - PCH_SPI_PPI *SpiPpi; + PCH_SPI2_PPI *Spi2Ppi; Status = PeiServicesLocatePpi ( - &gPchSpiPpiGuid, + &gPchSpi2PpiGuid, 0, NULL, - (VOID **)&SpiPpi + (VOID **)&Spi2Ppi ); if (Status != EFI_SUCCESS) { @@ -90,7 +90,7 @@ SpiServiceInit ( SpiProtocolConstructor (SpiInstance); PeiSpiInstance->PpiDescriptor.Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; - PeiSpiInstance->PpiDescriptor.Guid = &gPchSpiPpiGuid; + PeiSpiInstance->PpiDescriptor.Guid = &gPchSpi2PpiGuid; PeiSpiInstance->PpiDescriptor.Ppi = &(SpiInstance->SpiProtocol); /// diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpi.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpi.c index 458d137e4fa2..a5518a606db7 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpi.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpi.c @@ -14,7 +14,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 <Private/Library/PchSpiCommonLib.h> #include <Private/Library/SmmPchPrivateLib.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/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf index 4e4b456574f0..46f10368d19e 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib +++ .inf @@ -39,5 +39,5 @@ [Sources] [Ppis] -gPchSpiPpiGuid ## PRODUCES +gPchSpi2PpiGuid ## PRODUCES diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf index 231929151222..0fc8ea7b376a 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf @@ -38,7 +38,7 @@ [Sources] [Protocols] -gPchSmmSpiProtocolGuid ## PRODUCES +gPchSmmSpi2ProtocolGuid ## PRODUCES gEfiSmmCpuProtocolGuid ## CONSUMES [Depex] -- 2.28.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83185): https://edk2.groups.io/g/devel/message/83185 Mute This Topic: https://groups.io/mt/86664059/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
