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.web08.2536.1623982147600222746 for ; Thu, 17 Jun 2021 19:09:07 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=bJIz7nEc; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (unknown [167.220.2.74]) by linux.microsoft.com (Postfix) with ESMTPSA id 4F7DC20B83DE; Thu, 17 Jun 2021 19:09:07 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4F7DC20B83DE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1623982147; bh=BMxOdRTQQ/0LcB8u/R+USs9lWSCpWlLt6HVoJbpPpfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bJIz7nEcW9fvZCnmvFCxQOsyPUkDK6ut9f9CVHSHSlLoqpni7HACNyAkAQE41JK52 1fW+GWYUKjsTPqQWKF98JYKnTK3+igyOTq4KmMD5sEnGx4TQIW5GYv9zKkWdq6AUrw q2WCQynRssd1p4rprRPMAEaYp/FXmhsVXtmV56uE= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Agyeman Prince , Nate DeSimone Subject: [edk2-platforms][PATCH v3 34/41] SimicsIch10Pkg: Remove PCH SPI SMM Protocol from package Date: Thu, 17 Jun 2021 22:07:19 -0400 Message-Id: <20210618020726.5991-35-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210618020726.5991-1-mikuback@linux.microsoft.com> References: <20210618020726.5991-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 gEfiSmmSpiProtocolGuid is now declared in IntelSiliconPkg.dec. This change updates Ich10Pkg to remove the protocol declaration in the package and update libraries and modules to use the protocol from IntelSiliconPkg. Cc: Agyeman Prince Signed-off-by: Michael Kubacki Reviewed-by: Nate DeSimone --- Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/SpiCommo= n.c | 24 +- Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c = | 4 +- Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec = | 5 - Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h = | 295 -------------------- Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCommonLib.h = | 26 +- Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf = | 3 +- 6 files changed, 29 insertions(+), 328 deletions(-) diff --git a/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommon= Lib/SpiCommon.c b/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiC= ommonLib/SpiCommon.c index f2907ef53bfc..fc2a8be76b6a 100644 --- a/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/Spi= Common.c +++ b/Silicon/Intel/SimicsIch10Pkg/LibraryPrivate/BasePchSpiCommonLib/Spi= Common.c @@ -158,7 +158,7 @@ PchPmTimerStallRuntimeSafe ( EFI_STATUS EFIAPI SpiProtocolFlashRead ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, IN UINT32 Address, IN UINT32 ByteCount, @@ -197,7 +197,7 @@ SpiProtocolFlashRead ( EFI_STATUS EFIAPI SpiProtocolFlashWrite ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, IN UINT32 Address, IN UINT32 ByteCount, @@ -235,7 +235,7 @@ SpiProtocolFlashWrite ( EFI_STATUS EFIAPI SpiProtocolFlashErase ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, IN UINT32 Address, IN UINT32 ByteCount @@ -274,7 +274,7 @@ SpiProtocolFlashErase ( EFI_STATUS EFIAPI SpiProtocolFlashReadSfdp ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT8 ComponentNumber, IN UINT32 Address, IN UINT32 ByteCount, @@ -328,7 +328,7 @@ SpiProtocolFlashReadSfdp ( EFI_STATUS EFIAPI SpiProtocolFlashReadJedecId ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT8 ComponentNumber, IN UINT32 ByteCount, OUT UINT8 *JedecId @@ -379,7 +379,7 @@ SpiProtocolFlashReadJedecId ( EFI_STATUS EFIAPI SpiProtocolFlashWriteStatus ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT32 ByteCount, IN UINT8 *StatusValue ) @@ -414,7 +414,7 @@ SpiProtocolFlashWriteStatus ( EFI_STATUS EFIAPI SpiProtocolFlashReadStatus ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT32 ByteCount, OUT UINT8 *StatusValue ) @@ -450,7 +450,7 @@ SpiProtocolFlashReadStatus ( EFI_STATUS EFIAPI SpiProtocolGetRegionAddress ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, OUT UINT32 *BaseAddress, OUT UINT32 *RegionSize @@ -510,7 +510,7 @@ SpiProtocolGetRegionAddress ( EFI_STATUS EFIAPI SpiProtocolReadPchSoftStrap ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT32 SoftStrapAddr, IN UINT32 ByteCount, OUT VOID *SoftStrapValue @@ -568,7 +568,7 @@ SpiProtocolReadPchSoftStrap ( EFI_STATUS EFIAPI SpiProtocolReadCpuSoftStrap ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT32 SoftStrapAddr, IN UINT32 ByteCount, OUT VOID *SoftStrapValue @@ -626,7 +626,7 @@ SpiProtocolReadCpuSoftStrap ( **/ EFI_STATUS SendSpiCmd ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, IN FLASH_CYCLE_TYPE FlashCycleType, IN UINT32 Address, @@ -897,7 +897,7 @@ SendSpiCmd ( **/ BOOLEAN WaitForSpiCycleComplete ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINTN PchSpiBar0, IN BOOLEAN ErrorCheck ) diff --git a/Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c b/Silicon/Inte= l/SimicsIch10Pkg/Spi/Smm/PchSpi.c index 0baf730a4823..e4a81f91316c 100644 --- a/Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c +++ b/Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpi.c @@ -92,11 +92,11 @@ InstallPchSpi ( return Status; } // - // Install the SMM EFI_SPI_PROTOCOL interface + // Install the SMM PCH_SPI_PROTOCOL interface // Status =3D gSmst->SmmInstallProtocolInterface ( &(mSpiInstance->Handle), - &gEfiSmmSpiProtocolGuid, + &gPchSmmSpiProtocolGuid, EFI_NATIVE_INTERFACE, &(mSpiInstance->SpiProtocol) ); diff --git a/Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec b/Silicon/Intel/Si= micsIch10Pkg/Ich10Pkg.dec index 8d395a8b4370..58850f54e95c 100644 --- a/Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec +++ b/Silicon/Intel/SimicsIch10Pkg/Ich10Pkg.dec @@ -13,8 +13,3 @@ [Defines] =20 [Includes] Include - -[Ppis] - -[Protocols] - gEfiSmmSpiProtocolGuid =3D {0xbd75fe35, 0xfdce, 0x49d7, {0xa9, 0xdd, 0= xb2, 0x6f, 0x1f, 0xc6, 0xb4, 0x37}} diff --git a/Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h b/Silico= n/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h deleted file mode 100644 index b0c5b3d0e624..000000000000 --- a/Silicon/Intel/SimicsIch10Pkg/Include/Protocol/Spi.h +++ /dev/null @@ -1,295 +0,0 @@ -/** @file - This file defines the PCH SPI Protocol which implements the - Intel(R) PCH SPI Host Controller Compatibility Interface. - - Copyright (c) 2019 Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent -**/ - -#ifndef _PCH_SPI_PROTOCOL_H_ -#define _PCH_SPI_PROTOCOL_H_ - -// -// Extern the GUID for protocol users. -// -extern EFI_GUID gEfiSpiProtocolGuid; -extern EFI_GUID gEfiSmmSpiProtocolGuid; - -// -// Forward reference for ANSI C compatibility -// -typedef struct _PCH_SPI_PROTOCOL EFI_SPI_PROTOCOL; - -// -// SPI protocol data structures and definitions -// - -/** - Flash Region Type -**/ -typedef enum { - FlashRegionDescriptor, - FlashRegionBios, - FlashRegionMe, - FlashRegionGbE, - FlashRegionPlatformData, - FlashRegionDer, - FlashRegionAll, - FlashRegionMax -} FLASH_REGION_TYPE; - - -// -// Protocol member functions -// - -/** - Read data from the flash part. - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] FlashRegionType The Flash Region type for flash cycle = which is listed in the Descriptor. - @param[in] Address The Flash Linear Address must fall wit= hin a region for which BIOS has access permissions. - @param[in] ByteCount Number of bytes in the data portion of= the SPI cycle. - @param[out] Buffer The Pointer to caller-allocated buffer= containing the dada received. - It is the caller's responsibility to m= ake sure Buffer is large enough for the total number of bytes read. - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_FLASH_READ) ( - IN EFI_SPI_PROTOCOL *This, - IN FLASH_REGION_TYPE FlashRegionType, - IN UINT32 Address, - IN UINT32 ByteCount, - OUT UINT8 *Buffer - ); - -/** - Write data to the flash part. Remark: Erase may be needed before write= to the flash part. - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] FlashRegionType The Flash Region type for flash cycle = which is listed in the Descriptor. - @param[in] Address The Flash Linear Address must fall wit= hin a region for which BIOS has access permissions. - @param[in] ByteCount Number of bytes in the data portion of= the SPI cycle. - @param[in] Buffer Pointer to caller-allocated buffer con= taining the data sent during the SPI cycle. - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_FLASH_WRITE) ( - IN EFI_SPI_PROTOCOL *This, - IN FLASH_REGION_TYPE FlashRegionType, - IN UINT32 Address, - IN UINT32 ByteCount, - IN UINT8 *Buffer - ); - -/** - Erase some area on the flash part. - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] FlashRegionType The Flash Region type for flash cycle = which is listed in the Descriptor. - @param[in] Address The Flash Linear Address must fall wit= hin a region for which BIOS has access permissions. - @param[in] ByteCount Number of bytes in the data portion of= the SPI cycle. - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_FLASH_ERASE) ( - IN EFI_SPI_PROTOCOL *This, - IN FLASH_REGION_TYPE FlashRegionType, - IN UINT32 Address, - IN UINT32 ByteCount - ); - -/** - Read SFDP data from the flash part. - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] ComponentNumber The Componen Number for chip select - @param[in] Address The starting byte address for SFDP dat= a read. - @param[in] ByteCount Number of bytes in SFDP data portion o= f the SPI cycle - @param[out] SfdpData The Pointer to caller-allocated buffer= containing the SFDP data received - It is the caller's responsibility to m= ake sure Buffer is large enough for the total number of bytes read - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_FLASH_READ_SFDP) ( - IN EFI_SPI_PROTOCOL *This, - IN UINT8 ComponentNumber, - IN UINT32 Address, - IN UINT32 ByteCount, - OUT UINT8 *SfdpData - ); - -/** - Read Jedec Id from the flash part. - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] ComponentNumber The Componen Number for chip select - @param[in] ByteCount Number of bytes in JedecId data portio= n of the SPI cycle, the data size is 3 typically - @param[out] JedecId The Pointer to caller-allocated buffer= containing JEDEC ID received - It is the caller's responsibility to m= ake sure Buffer is large enough for the total number of bytes read. - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_FLASH_READ_JEDEC_ID) ( - IN EFI_SPI_PROTOCOL *This, - IN UINT8 ComponentNumber, - IN UINT32 ByteCount, - OUT UINT8 *JedecId - ); - -/** - Write the status register in the flash part. - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] ByteCount Number of bytes in Status data portion= of the SPI cycle, the data size is 1 typically - @param[in] StatusValue The Pointer to caller-allocated buffer= containing the value of Status register writing - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_FLASH_WRITE_STATUS) ( - IN EFI_SPI_PROTOCOL *This, - IN UINT32 ByteCount, - IN UINT8 *StatusValue - ); - -/** - Read status register in the flash part. - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] ByteCount Number of bytes in Status data portion= of the SPI cycle, the data size is 1 typically - @param[out] StatusValue The Pointer to caller-allocated buffer= containing the value of Status register received. - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_FLASH_READ_STATUS) ( - IN EFI_SPI_PROTOCOL *This, - IN UINT32 ByteCount, - OUT UINT8 *StatusValue - ); - -/** - Get the SPI region base and size, based on the enum type - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] FlashRegionType The Flash Region type for for the base= address which is listed in the Descriptor. - @param[out] BaseAddress The Flash Linear Address for the Regio= n 'n' Base - @param[out] RegionSize The size for the Region 'n' - - @retval EFI_SUCCESS Read success - @retval EFI_INVALID_PARAMETER Invalid region type given - @retval EFI_DEVICE_ERROR The region is not used -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_GET_REGION_ADDRESS) ( - IN EFI_SPI_PROTOCOL *This, - IN FLASH_REGION_TYPE FlashRegionType, - OUT UINT32 *BaseAddress, - OUT UINT32 *RegionSize - ); - -/** - Read PCH Soft Strap Values - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] SoftStrapAddr PCH Soft Strap address offset from FPS= BA. - @param[in] ByteCount Number of bytes in SoftStrap data port= ion of the SPI cycle - @param[out] SoftStrapValue The Pointer to caller-allocated buffer= containing PCH Soft Strap Value. - If the value of ByteCount is 0, the da= ta type of SoftStrapValue should be UINT16 and SoftStrapValue will be PCH= Soft Strap Length - It is the caller's responsibility to m= ake sure Buffer is large enough for the total number of bytes read. - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_READ_PCH_SOFTSTRAP) ( - IN EFI_SPI_PROTOCOL *This, - IN UINT32 SoftStrapAddr, - IN UINT32 ByteCount, - OUT VOID *SoftStrapValue - ); - -/** - Read CPU Soft Strap Values - - @param[in] This Pointer to the PCH_SPI_PROTOCOL instan= ce. - @param[in] SoftStrapAddr CPU Soft Strap address offset from FCP= USBA. - @param[in] ByteCount Number of bytes in SoftStrap data port= ion of the SPI cycle. - @param[out] SoftStrapValue The Pointer to caller-allocated buffer= containing CPU Soft Strap Value. - If the value of ByteCount is 0, the da= ta type of SoftStrapValue should be UINT16 and SoftStrapValue will be PCH= Soft Strap Length - It is the caller's responsibility to m= ake sure Buffer is large enough for the total number of bytes read. - - @retval EFI_SUCCESS Command succeed. - @retval EFI_INVALID_PARAMETER The parameters specified are not valid= . - @retval EFI_DEVICE_ERROR Device error, command aborts abnormall= y. -**/ -typedef -EFI_STATUS -(EFIAPI *PCH_SPI_READ_CPU_SOFTSTRAP) ( - IN EFI_SPI_PROTOCOL *This, - IN UINT32 SoftStrapAddr, - IN UINT32 ByteCount, - OUT VOID *SoftStrapValue - ); - -/** - These protocols/PPI allows a platform module to perform SPI operations= through the - Intel PCH SPI Host Controller Interface. -**/ -struct _PCH_SPI_PROTOCOL { - /** - This member specifies the revision of this structure. This field is = used to - indicate backwards compatible changes to the protocol. - **/ - UINT8 Revision; - PCH_SPI_FLASH_READ FlashRead; ///< Read data f= rom the flash part. - PCH_SPI_FLASH_WRITE FlashWrite; ///< Write data = to the flash part. Remark: Erase may be needed before write to the flash = part. - PCH_SPI_FLASH_ERASE FlashErase; ///< Erase some = area on the flash part. - PCH_SPI_FLASH_READ_SFDP FlashReadSfdp; ///< Read SFDP d= ata from the flash part. - PCH_SPI_FLASH_READ_JEDEC_ID FlashReadJedecId; ///< Read Jedec = Id from the flash part. - PCH_SPI_FLASH_WRITE_STATUS FlashWriteStatus; ///< Write the s= tatus register in the flash part. - PCH_SPI_FLASH_READ_STATUS FlashReadStatus; ///< Read status= register in the flash part. - PCH_SPI_GET_REGION_ADDRESS GetRegionAddress; ///< Get the SPI= region base and size - PCH_SPI_READ_PCH_SOFTSTRAP ReadPchSoftStrap; ///< Read PCH So= ft Strap Values - PCH_SPI_READ_CPU_SOFTSTRAP ReadCpuSoftStrap; ///< Read CPU So= ft Strap Values -}; - -/** - PCH SPI PPI/PROTOCOL revision number - - Revision 1: Initial version -**/ -#define PCH_SPI_SERVICES_REVISION 1 - -#endif diff --git a/Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCo= mmonLib.h b/Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCom= monLib.h index cf60f1fd5881..2c8162ac8170 100644 --- a/Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCommonLib= .h +++ b/Silicon/Intel/SimicsIch10Pkg/IncludePrivate/Library/PchSpiCommonLib= .h @@ -48,7 +48,7 @@ typedef enum { typedef struct { UINT32 Signature; EFI_HANDLE Handle; - EFI_SPI_PROTOCOL SpiProtocol; + PCH_SPI_PROTOCOL SpiProtocol; UINT16 PchAcpiBase; UINTN PchSpiBase; UINT16 ReadPermission; @@ -148,7 +148,7 @@ ReleaseSpiBar0 ( EFI_STATUS EFIAPI SpiProtocolFlashRead ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, IN UINT32 Address, IN UINT32 ByteCount, @@ -171,7 +171,7 @@ SpiProtocolFlashRead ( EFI_STATUS EFIAPI SpiProtocolFlashWrite ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, IN UINT32 Address, IN UINT32 ByteCount, @@ -193,7 +193,7 @@ SpiProtocolFlashWrite ( EFI_STATUS EFIAPI SpiProtocolFlashErase ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, IN UINT32 Address, IN UINT32 ByteCount @@ -216,7 +216,7 @@ SpiProtocolFlashErase ( EFI_STATUS EFIAPI SpiProtocolFlashReadSfdp ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT8 ComponentNumber, IN UINT32 Address, IN UINT32 ByteCount, @@ -239,7 +239,7 @@ SpiProtocolFlashReadSfdp ( EFI_STATUS EFIAPI SpiProtocolFlashReadJedecId ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT8 ComponentNumber, IN UINT32 ByteCount, OUT UINT8 *JedecId @@ -259,7 +259,7 @@ SpiProtocolFlashReadJedecId ( EFI_STATUS EFIAPI SpiProtocolFlashWriteStatus ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT32 ByteCount, IN UINT8 *StatusValue ); @@ -278,7 +278,7 @@ SpiProtocolFlashWriteStatus ( EFI_STATUS EFIAPI SpiProtocolFlashReadStatus ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT32 ByteCount, OUT UINT8 *StatusValue ); @@ -298,7 +298,7 @@ SpiProtocolFlashReadStatus ( EFI_STATUS EFIAPI SpiProtocolGetRegionAddress ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, OUT UINT32 *BaseAddress, OUT UINT32 *RegionSize @@ -321,7 +321,7 @@ SpiProtocolGetRegionAddress ( EFI_STATUS EFIAPI SpiProtocolReadPchSoftStrap ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT32 SoftStrapAddr, IN UINT32 ByteCount, OUT VOID *SoftStrapValue @@ -344,7 +344,7 @@ SpiProtocolReadPchSoftStrap ( EFI_STATUS EFIAPI SpiProtocolReadCpuSoftStrap ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINT32 SoftStrapAddr, IN UINT32 ByteCount, OUT VOID *SoftStrapValue @@ -367,7 +367,7 @@ SpiProtocolReadCpuSoftStrap ( **/ EFI_STATUS SendSpiCmd ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN FLASH_REGION_TYPE FlashRegionType, IN FLASH_CYCLE_TYPE FlashCycleType, IN UINT32 Address, @@ -388,7 +388,7 @@ SendSpiCmd ( **/ BOOLEAN WaitForSpiCycleComplete ( - IN EFI_SPI_PROTOCOL *This, + IN PCH_SPI_PROTOCOL *This, IN UINTN PchSpiBar0, IN BOOLEAN ErrorCheck ); diff --git a/Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf b/Silicon= /Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf index 7b60d36c5b9c..35655ed5b5aa 100644 --- a/Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf +++ b/Silicon/Intel/SimicsIch10Pkg/Spi/Smm/PchSpiSmm.inf @@ -28,6 +28,7 @@ [Defines] =20 [Packages] MdePkg/MdePkg.dec + IntelSiliconPkg/IntelSiliconPkg.dec SimicsIch10Pkg/Ich10Pkg.dec =20 [Sources] @@ -36,7 +37,7 @@ [Sources] =20 =20 [Protocols] - gEfiSmmSpiProtocolGuid # PRODUCES #SERVER_BIOS + gPchSmmSpiProtocolGuid # PRODUCES =20 =20 [Depex] --=20 2.28.0.windows.1