From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web09.924.1635459015037909053 for ; Thu, 28 Oct 2021 15:10:15 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=e3Y5EpD2; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (c-73-27-179-174.hsd1.fl.comcast.net [73.27.179.174]) by linux.microsoft.com (Postfix) with ESMTPSA id 27657209F33F; Thu, 28 Oct 2021 15:10:14 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 27657209F33F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1635459014; bh=Ya9vzRULkw9V5OosHMmmybYnirYc1E5YMlorOJMh/WE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e3Y5EpD2WZDQVPJ7RWxqjamm/YRZuJaWzmhJKg//HMBrp1tYb+G2s279dBQVKnKRf lpjAxAgnGY+FOZBtIOiXK0G4QEyCINVDx+FFV2MsDX3125Ba0spmQFEZiXGaWAPy+A Hd4jXW7VIs+pTnMSWAwUNFsFniERByjktmeWuoK4= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Chasel Chiu , Rangasai V Chaganty , Nate DeSimone Subject: [PATCH v6 42/52] CoffeelakeSiliconPkg: Update for SPI2 PPI and Protocol Date: Thu, 28 Oct 2021 18:08:36 -0400 Message-Id: <20211028220846.753-7-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211028220846.753-1-mikuback@linux.microsoft.com> References: <20211028220846.753-1-mikuback@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Kubacki REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3307 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 Cc: Rangasai V Chaganty Cc: Nate DeSimone Signed-off-by: Michael Kubacki --- 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/Pch= Spi.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 #include #include -#include +#include #include #include #include @@ -62,13 +62,13 @@ SpiServiceInit ( EFI_STATUS Status; PEI_SPI_INSTANCE *PeiSpiInstance; SPI_INSTANCE *SpiInstance; - PCH_SPI_PPI *SpiPpi; + PCH_SPI2_PPI *Spi2Ppi; =20 Status =3D PeiServicesLocatePpi ( - &gPchSpiPpiGuid, + &gPchSpi2PpiGuid, 0, NULL, - (VOID **)&SpiPpi + (VOID **)&Spi2Ppi ); =20 if (Status !=3D EFI_SUCCESS) { @@ -90,7 +90,7 @@ SpiServiceInit ( SpiProtocolConstructor (SpiInstance); =20 PeiSpiInstance->PpiDescriptor.Flags =3D EFI_PEI_PPI_DESCRIPTOR_PPI |= EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; - PeiSpiInstance->PpiDescriptor.Guid =3D &gPchSpiPpiGuid; + PeiSpiInstance->PpiDescriptor.Guid =3D &gPchSpi2PpiGuid; PeiSpiInstance->PpiDescriptor.Ppi =3D &(SpiInstance->SpiProtocol); =20 /// diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Spi/Smm/PchSpi.c b/Si= licon/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 #include #include -#include +#include #include #include #include @@ -45,8 +45,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINT32 mSp= iResvMmioAddr; - Documented in System Management Mode Core Interface Specificatio= n . =20 - @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_PROTOC= OL @endlink with GUID + gPchSmmSpi2ProtocolGuid which is different from SPI RUNTIME driver. =20 - Integration Check List\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 =3D gSmst->SmmInstallProtocolInterface ( &(mSpiInstance->Handle), - &gPchSmmSpiProtocolGuid, + &gPchSmmSpi2ProtocolGuid, EFI_NATIVE_INTERFACE, &(mSpiInstance->SpiProtocol) ); diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/Pei= SpiLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiSpiLib/Pei= SpiLib.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] =20 =20 [Ppis] -gPchSpiPpiGuid ## PRODUCES +gPchSpi2PpiGuid ## PRODUCES =20 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] =20 =20 [Protocols] -gPchSmmSpiProtocolGuid ## PRODUCES +gPchSmmSpi2ProtocolGuid ## PRODUCES gEfiSmmCpuProtocolGuid ## CONSUMES =20 [Depex] --=20 2.28.0.windows.1