From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=nathaniel.l.desimone@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E7F5A21A07093 for ; Mon, 1 Apr 2019 17:09:18 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Apr 2019 17:09:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,298,1549958400"; d="scan'208";a="132117555" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by orsmga006.jf.intel.com with ESMTP; 01 Apr 2019 17:09:17 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.54]) by ORSMSX105.amr.corp.intel.com ([169.254.2.119]) with mapi id 14.03.0415.000; Mon, 1 Apr 2019 17:09:17 -0700 From: "Desimone, Nathaniel L" To: "Kubacki, Michael A" , "edk2-devel@lists.01.org" CC: "Chiu, Chasel" , "Gao, Liming" , "Kinney, Michael D" Thread-Topic: [edk2-platforms/devel-MinPlatform][PATCH v2 1/3] KabylakeSiliconPkg: Add SPI write support in PEI Thread-Index: AQHU6N0G3nG2l2O88UKAfgZLdUG0c6Yn/KEQ Date: Tue, 2 Apr 2019 00:09:17 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AAE9B5FED@ORSMSX114.amr.corp.intel.com> References: <20190401224803.8388-1-michael.a.kubacki@intel.com> <20190401224803.8388-2-michael.a.kubacki@intel.com> In-Reply-To: <20190401224803.8388-2-michael.a.kubacki@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiN2I1Mjk5ZWItYzQ0My00MDE4LWE2ODgtYWFiZDZjYjFlMTE5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiTXdpaStrYVpzQ3ZWNUZ1bXFjNWRoeXVYeWh4VmZzblVFa3M4VndDek84TW1jbGNtMjdONUgzcTlhZGJGMGxFQiJ9 x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Subject: Re: [edk2-platforms/devel-MinPlatform][PATCH v2 1/3] KabylakeSiliconPkg: Add SPI write support in PEI X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2019 00:09:19 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 1. The changes in BasePchSpiCommonLib.inf seems to be no longer necessary. 2. Adding #include to SpiCommon.c seems to be no longer = necessary. Thanks, Nate -----Original Message----- From: Kubacki, Michael A=20 Sent: Monday, April 1, 2019 3:48 PM To: edk2-devel@lists.01.org Cc: Desimone, Nathaniel L ; Chiu, Chasel ; Gao, Liming ; Kinney, Michael = D Subject: [edk2-platforms/devel-MinPlatform][PATCH v2 1/3] KabylakeSiliconPk= g: Add SPI write support in PEI Adds a new library PeiSpiLib to perform the initialization necessary to per= form SPI write cycles in PEI. After initialization, it installs an instance= of the PCH_SPI_PPI. Cc: Nate DeSimone Cc: Chasel Chiu Cc: Liming Gao Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kubacki --- Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc | 3 +- .../Pch/Library/PeiSpiLib/PeiSpiLib.inf | 50 +++++ .../BasePchSpiCommonLib/BasePchSpiCommonLib.inf | 6 +- .../Pch/Include/Library/SpiLib.h | 32 +++ .../Pch/Library/PeiSpiLib/PeiSpiLib.c | 221 +++++++++++++++++= ++++ .../LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c | 6 +- 6 files changed, 313 insertions(+), 5 deletions(-) create mode 100644 Sil= icon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf create mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/Sp= iLib.h create mode 100644 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/= PeiSpiLib.c diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc b/Silicon/Int= el/KabylakeSiliconPkg/SiPkgPeiLib.dsc index b81a736486..bb95ce3888 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc @@ -1,7 +1,7 @@ ## @file # Component description file for the SkyLake SiPkg PEI libraries. # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights=20 +reserved.
# # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License which accompanies = this distribution. @@ -30,6 +30,7 @@ !endif ResetSystemLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/PeiResetSystemLib/PeiRe= setSystemLib.inf PchResetLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/PeiPchResetLib/PeiPchReset= Lib.inf + SpiLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/PeiSpiLib/PeiSpiLib.inf =20 # # Cpu diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiL= ib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.i= nf new file mode 100644 index 0000000000..9240b6ef06 --- /dev/null +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.i +++ nf @@ -0,0 +1,50 @@ +## @file +# Component description file for PEI PCH SPI Initialization # #=20 +Copyright (c) 2019, Intel Corporation. All rights reserved.
# #=20 +This program and the accompanying materials are licensed and made=20 +available under # the terms and conditions of the BSD License which accomp= anies this distribution. +# The full text of the license may be found at #=20 +http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,=20 +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +# +## + +[Defines] + INF_VERSION =3D 0x00010017 + BASE_NAME =3D PeiSpiLib + FILE_GUID =3D 4998447D-7948-448F-AB75-96E24E18FF23 + VERSION_STRING =3D 1.0 + MODULE_TYPE =3D PEIM + LIBRARY_CLASS =3D SpiLib|PEIM PEI_CORE + # + # The following information is for reference only and not required by th= e build tools. + # + # VALID_ARCHITECTURES =3D IA32 X64 IPF + # + +[LibraryClasses] + DebugLib + MemoryAllocationLib + PcdLib + PchCycleDecodingLib + PchSpiCommonLib + PciSegmentLib + PeiServicesLib + PeiServicesTablePointerLib + +[Packages] + MdePkg/MdePkg.dec + KabylakeSiliconPkg/SiPkg.dec + +[Sources] + PeiSpiLib.c + +[Pcd] + gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress ## CONSUMES + +[Ppis] + gPchSpiPpiGuid ## PRODUCES diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpi= CommonLib/BasePchSpiCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Li= braryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf index 128f7adcea..2c531e7816 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonL= ib/BasePchSpiCommonLib.inf +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiComm +++ onLib/BasePchSpiCommonLib.inf @@ -1,7 +1,7 @@ ## @file # Component description file for the PchSpiCommonLib # -# Copyright (c) = 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights=20 +reserved.
# # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License which accompanies = this distribution. @@ -32,4 +32,8 @@ [LibraryClasses] IoLib DebugLib + PcdLib PchCycleDecodingLib + +[Pcd] + gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress ## CONSUMES diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h = b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h new file mode 100644 index 0000000000..6af66f8869 --- /dev/null +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h @@ -0,0 +1,32 @@ +/** @file + Library to initialize SPI services for future SPI accesses. + +Copyright (c) 2019, Intel Corporation. All rights reserved.
This=20 +program and the accompanying materials are licensed and made available=20 +under the terms and conditions of the BSD License that accompanies this di= stribution. +The full text of the license may be found at=20 +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,=20 +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI= ED. + +**/ + +#ifndef _SPI_LIB_H_ +#define _SPI_LIB_H_ + +/** + Initializes SPI for access from future services. + + @retval EFI_SUCCESS The SPI service was initialized successfully= . + @retval EFI_OUT_OF_RESOUCES Insufficient memory available to allocate st= ructures required for initialization. + @retval Others An error occurred initializing SPI services. + +**/ +EFI_STATUS +EFIAPI +SpiServiceInit ( + VOID + ); + +#endif diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiL= ib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c new file mode 100644 index 0000000000..954317cd40 --- /dev/null +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c @@ -0,0 +1,221 @@ +/** @file + PCH SPI PEI Library implements the SPI Host Controller Interface. + +Copyright (c) 2019, Intel Corporation. All rights reserved.
This=20 +program and the accompanying materials are licensed and made available=20 +under the terms and conditions of the BSD License that accompanies this di= stribution. +The full text of the license may be found at=20 +http://opensource.org/licenses/bsd-license.php. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,=20 +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI= ED. + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include #include =20 +#include #include=20 + #include #include=20 + + +typedef struct { + EFI_PEI_PPI_DESCRIPTOR PpiDescriptor; + SPI_INSTANCE SpiInstance; +} PEI_SPI_INSTANCE; + +/** + Initializes the SPI BAR0 value to a default value and enables memory spa= ce decoding. + + The SPI BAR0 will be assigned later in PCI enumeration. + +**/ +VOID +InitSpiBar0 ( + VOID + ) +{ + UINT64 PchSpiBase; + PchSpiBase =3D PCI_SEGMENT_LIB_ADDRESS ( + 0, + 0, + PCI_DEVICE_NUMBER_PCH_SPI, + PCI_FUNCTION_NUMBER_PCH_SPI, + 0 + ); + PciSegmentWrite32 (PchSpiBase + R_PCH_SPI_BAR0,=20 +PCH_SPI_BASE_ADDRESS); + PciSegmentOr32 (PchSpiBase + PCI_COMMAND_OFFSET,=20 +EFI_PCI_COMMAND_MEMORY_SPACE); } + +/** + Initializes SPI for access from future services. + + @retval EFI_SUCCESS The SPI service was initialized successfully= . + @retval EFI_OUT_OF_RESOUCES Insufficient memory available to allocate st= ructures required for initialization. + @retval Others An error occurred initializing SPI services. + +**/ +EFI_STATUS +EFIAPI +SpiServiceInit ( + VOID + ) +{ + EFI_STATUS Status; + PEI_SPI_INSTANCE *PeiSpiInstance; + SPI_INSTANCE *SpiInstance; + PCH_SPI_PPI *SpiPpi; + UINT16 AcpiBase; + + AcpiBase =3D 0; + + Status =3D PeiServicesLocatePpi ( + &gPchSpiPpiGuid, + 0, + NULL, + (VOID **) &SpiPpi + ); + + if (Status !=3D EFI_SUCCESS) { + PchAcpiBaseGet (&AcpiBase); + if (AcpiBase =3D=3D 0) { + PchAcpiBaseSet (PcdGet16 (PcdAcpiBaseAddress)); + } + + // + // Prior to PCI enumeration, initialize SPI BAR0 to a default value + // and also enable memory space decoding for SPI + // + InitSpiBar0 (); + + PeiSpiInstance =3D (PEI_SPI_INSTANCE *) AllocateZeroPool (sizeof (PEI_= SPI_INSTANCE)); + if (NULL =3D=3D PeiSpiInstance) { + return EFI_OUT_OF_RESOURCES; + } + + SpiInstance =3D &(PeiSpiInstance->SpiInstance); + SpiProtocolConstructor (SpiInstance); + + PeiSpiInstance->PpiDescriptor.Flags =3D EFI_PEI_PPI_DESCRIPTOR_PPI | E= FI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; + PeiSpiInstance->PpiDescriptor.Guid =3D &gPchSpiPpiGuid; + PeiSpiInstance->PpiDescriptor.Ppi =3D &(SpiInstance->SpiProtocol); + + Status =3D PeiServicesInstallPpi (&PeiSpiInstance->PpiDescriptor); + } + return Status; +} + +/** + Acquires the PCH SPI BAR0 MMIO address. + + @param[in] SpiInstance Pointer to SpiInstance to initialize + + @retval UINTN The SPIO BAR0 MMIO address + +**/ +UINTN +AcquireSpiBar0 ( + IN SPI_INSTANCE *SpiInstance + ) +{ + return MmioRead32 (SpiInstance->PchSpiBase + R_PCH_SPI_BAR0) &=20 +~(B_PCH_SPI_BAR0_MASK); } + +/** + Release the PCH SPI BAR0 MMIO address. + + @param[in] SpiInstance Pointer to SpiInstance to initialize + + @retval None +**/ +VOID +ReleaseSpiBar0 ( + IN SPI_INSTANCE *SpiInstance + ) +{ + return; +} + +/** + Disables BIOS Write Protect + + @retval EFI_SUCCESS BIOS Write Protect was disabled successf= ully + +**/ +EFI_STATUS +EFIAPI +DisableBiosWriteProtect ( + VOID + ) +{ + UINT64 SpiBaseAddress; + + SpiBaseAddress =3D PCI_SEGMENT_LIB_ADDRESS ( + 0, + 0, + PCI_DEVICE_NUMBER_PCH_SPI, + PCI_FUNCTION_NUMBER_PCH_SPI, + 0 + ); + // + // Clear EISS bit to allow for SPI use // + PciSegmentAnd8 (SpiBaseAddress + R_PCH_SPI_BC, (UINT8)=20 + ~B_PCH_SPI_BC_EISS); + + // + // Write clear BC_SYNC_SS prior to change WPD from 0 to 1. + // + PciSegmentOr8 ( + SpiBaseAddress + R_PCH_SPI_BC + 1, + (B_PCH_SPI_BC_SYNC_SS >> 8) + ); + + // + // Set BIOSWE bit (SPI PCI Offset DCh [0]) =3D 1b // Enable the access= =20 + to the BIOS space for both read and write cycles // + PciSegmentOr8 ( + SpiBaseAddress + R_PCH_SPI_BC, + B_PCH_SPI_BC_WPD + ); + + ASSERT ((PciSegmentRead8 (SpiBaseAddress + R_PCH_SPI_BC) &=20 + B_PCH_SPI_BC_EISS) !=3D 0); + + return EFI_SUCCESS; +} + +/** + Enables BIOS Write Protect + +**/ +VOID +EFIAPI +EnableBiosWriteProtect ( + VOID + ) +{ + UINT64 SpiBaseAddress; + + SpiBaseAddress =3D PCI_SEGMENT_LIB_ADDRESS ( + 0, + 0, + PCI_DEVICE_NUMBER_PCH_SPI, + PCI_FUNCTION_NUMBER_PCH_SPI, + 0 + ); + + // + // Disable the access to the BIOS space for write cycles + // + PciSegmentAnd8 ( + SpiBaseAddress + R_PCH_SPI_BC, + (UINT8) (~B_PCH_SPI_BC_WPD) + ); +} diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpi= CommonLib/SpiCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate= /BasePchSpiCommonLib/SpiCommon.c index 46184d4994..e464aedcbe 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonL= ib/SpiCommon.c +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiComm +++ onLib/SpiCommon.c @@ -1,7 +1,7 @@ /** @file PCH SPI Common Driver implements the SPI Host Controller Compatibility I= nterface. =20 -Copyright (c) 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availabl= e under the terms and conditions of the BSD License that accompanies this = distribution. The full text of the license may be found at @@ -14,6 +14,7 @@ WITHOUT WAR= RANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #include #include @@ -760,9 +761,8 @@ SendSpiCmd ( Status =3D EFI_SUCCESS; SpiInstance =3D SPI_INSTANCE_FROM_SPIPROTOCOL (This); SpiBaseAddress =3D SpiInstance->PchSpiBase; - PchSpiBar0 =3D AcquireSpiBar0 (SpiInstance); - SpiBaseAddress =3D SpiInstance->PchSpiBase; ABase =3D SpiInstance->PchAcpiBase; + PchSpiBar0 =3D AcquireSpiBar0 (SpiInstance); =20 // // Disable SMIs to make sure normal mode flash access is not interrupted= by an SMI -- 2.16.2.windows.1