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.web11.872.1635459036919010544 for ; Thu, 28 Oct 2021 15:10:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=beKFiGau; 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 330EB209F33F; Thu, 28 Oct 2021 15:10:36 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 330EB209F33F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1635459036; bh=N3xOAkylyFVi2FQA+LioHJc5vu7QhNWv+PT4Z0M7Cm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=beKFiGauW+vUgY8MQXBq/XH5FWacM/iVuVfvBWrJe207gtpF6to7zyOY2FeB6DhgS Go7c5D4psxWzwPaBrhb/Pt5Sk19oU+gZMzo4q/4cUw/fjc0nfajnclIgfv09ylwly8 VXTOdJ1Rw9b+X4yqckIybl6M7v4Ltq0oYPkOcHOM= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Chasel Chiu , Rangasai V Chaganty , Nate DeSimone Subject: [PATCH v6 45/52] KabylakeSiliconPkg: Update for SPI2 PPI and Protocol Date: Thu, 28 Oct 2021 18:08:39 -0400 Message-Id: <20211028220846.753-10-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/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c | 1= 0 +++++----- Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c | = 8 ++++---- Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf | = 2 +- Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h | = 2 +- Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf | = 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSp= iLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib= .c index c34c378de2eb..d8388f10a0d6 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c @@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include #include -#include +#include #include #include #include @@ -65,16 +65,16 @@ SpiServiceInit ( EFI_STATUS Status; PEI_SPI_INSTANCE *PeiSpiInstance; SPI_INSTANCE *SpiInstance; - PCH_SPI_PPI *SpiPpi; + PCH_SPI2_PPI *Spi2Ppi; UINT16 AcpiBase; =20 AcpiBase =3D 0; =20 Status =3D PeiServicesLocatePpi ( - &gPchSpiPpiGuid, + &gPchSpi2PpiGuid, 0, NULL, - (VOID **) &SpiPpi + (VOID **) &Spi2Ppi ); =20 if (Status !=3D EFI_SUCCESS) { @@ -102,7 +102,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 Status =3D PeiServicesInstallPpi (&PeiSpiInstance->PpiDescriptor); diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c b/Sili= con/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c index 1d84d0613454..60a3ffe8ecc6 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c @@ -28,8 +28,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. @@ -91,11 +91,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/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSp= iLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiL= ib.inf index c6bc1ad406c8..ba57c44e1e12 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.in= f +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.in= f @@ -42,4 +42,4 @@ [Pcd] gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress ## CONSUMES =20 [Ppis] - gPchSpiPpiGuid ## PRODUCES + gPchSpi2PpiGuid ## PRODUCES diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h b/Sili= con/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h index 43e158b60425..46e2d35c0ee0 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h @@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include +#include #include #include =20 diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf b= /Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf index 819dc2439f30..85eb7b91fa3c 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf @@ -41,7 +41,7 @@ [Sources] =20 =20 [Protocols] -gPchSmmSpiProtocolGuid ## PRODUCES +gPchSmmSpi2ProtocolGuid ## PRODUCES =20 =20 [Depex] --=20 2.28.0.windows.1