dasharo/slimbootloader
0
0
Fork 0
mirror of https://github.com/Dasharo/slimbootloader.git synced 2026-03-06 15:26:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix failure during csme firmware update (#982)

Browse Source 
This patch fixed a failure occured during CSME firmware
update. CSME firmware update library expects PCI read buffer
with a specific format, there is mismatch with input and output
parameter with the current code. Added a wrapper function
with the expected format to fix the failure.

Signed-off-by: Raghava Gudla <raghava.gudla@intel.com>
This commit is contained in:
Raghava Gudla
2021-01-25 16:46:54 -07:00
committed by GitHub
parent 1771e3a35e
commit c9be70efd2
7 changed files with 131 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BootloaderCommonPkg/Include/Library/FirmwareUpdateLib.h
+32
View File
@@ -494,6 +494,38 @@ UpdateCsme (
IN EFI_FW_MGMT_CAP_IMAGE_HEADER *ImageHdr
);
/**
Reads a range of PCI configuration registers into a caller supplied buffer.
Reads the range of PCI configuration registers specified by StartAddress and
Size into the buffer specified by Buffer. This function only allows the PCI
configuration registers from a single PCI function to be read. Size is
returned. When possible 32-bit PCI configuration read cycles are used to read
from StartAddress to StartAddress + Size. Due to alignment restrictions, 8-bit
and 16-bit PCI configuration read cycles may be used at the beginning and the
end of the range.
If StartAddress > 0x0FFFFFFF, then ASSERT().
If ((StartAddress & 0xFFF) + Size) > 0x1000, then ASSERT().
If Size > 0 and Buffer is NULL, then ASSERT().
@param StartAddress The starting address that encodes the PCI Bus, Device,
Function and Register.
@param Size The size in bytes of the transfer.
@param Buffer The pointer to a buffer receiving the data read.
@return EFI_SUCCESS if data is read into buffer
@return EFI_NOT_FOUND if data is NOT read into buffer
@return EFI_INVALID_PARAMETER Invalid parameter
**/
EFI_STATUS
EFIAPI
CsmePciReadBuffer (
IN UINTN StartAddress,
IN UINTN Size,
OUT VOID *Buffer
);
/**
Platform hook point to clear firmware update trigger.
PayloadPkg/FirmwareUpdate/CsmeFwUpdate.c
+94 -3
View File
@@ -8,6 +8,7 @@
#include <Base.h>
#include <PiPei.h>
#include <Uefi/UefiBaseType.h>
#include <Library/PciLib.h>
#include <Library/DebugLib.h>
#include <Library/TimerLib.h>
#include <Library/BaseMemoryLib.h>
@@ -76,6 +77,77 @@ DisplaySendStatus (
IN UINT32 totalBytesToSendToFw
);
/**
Reads a range of PCI configuration registers into a caller supplied buffer.
Reads the range of PCI configuration registers specified by StartAddress and
Size into the buffer specified by Buffer. This function only allows the PCI
configuration registers from a single PCI function to be read. Size is
returned. When possible 32-bit PCI configuration read cycles are used to read
from StartAddress to StartAddress + Size. Due to alignment restrictions, 8-bit
and 16-bit PCI configuration read cycles may be used at the beginning and the
end of the range.
If StartAddress > 0x0FFFFFFF, then ASSERT().
If ((StartAddress & 0xFFF) + Size) > 0x1000, then ASSERT().
If Size > 0 and Buffer is NULL, then ASSERT().
@param StartAddress The starting address that encodes the PCI Bus, Device,
Function and Register.
@param Size The size in bytes of the transfer.
@param Buffer The pointer to a buffer receiving the data read.
@return EFI_SUCCESS if data is read into buffer
@return EFI_NOT_FOUND if data is NOT read into buffer
@return EFI_INVALID_PARAMETER Invalid parameter
**/
EFI_STATUS
EFIAPI
CsmePciReadBuffer (
IN UINTN StartAddress,
IN UINTN Size,
OUT VOID *Buffer
)
{
UINT8 Bus;
UINT8 Device;
UINT8 Function;
UINT8 Register;
UINTN ReadCount;
if ((Buffer == NULL) || (Size == 0)) {
return EFI_INVALID_PARAMETER;
}
//
// A valid PCI address should contain 1's only in the low 28 bits.
//
if (((StartAddress) & (~0xfffffff)) != 0) {
return EFI_INVALID_PARAMETER;
}
if (((StartAddress & 0xFFF) + Size) > 0x1000) {
return EFI_INVALID_PARAMETER;
}
Bus = (UINT8)((StartAddress >> 24) & 0xFF);
Device = (UINT8)((StartAddress >> 16) & 0xFF);
Function = (UINT8)((StartAddress >> 8) & 0xFF);
Register = (UINT8)(StartAddress & 0xFF);
ReadCount = PciReadBuffer (
PCI_LIB_ADDRESS(Bus, Device, Function, Register),
Size * sizeof(UINT32),
Buffer
);
if (ReadCount != 0) {
return EFI_SUCCESS;
}
return EFI_NOT_FOUND;
}
/**
Check if the update image has the same version as the flash image.
@@ -112,12 +184,26 @@ IsUpdateToSameVersion(
*IsSameVersion = FALSE;
Status = UpdateApi->FwuPartitionVersionFromFlash(FPT_PARTITION_NAME_FTPR, &flashMajor, &flashMinor, &flashHotfix, &flashBuild);
Status = UpdateApi->FwuPartitionVersionFromFlash(
FPT_PARTITION_NAME_FTPR,
&flashMajor,
&flashMinor,
&flashHotfix,
&flashBuild
);
if (Status != SUCCESS) {
return Status;
}
Status = UpdateApi->FwuPartitionVersionFromBuffer(Buffer, BufferLength, FPT_PARTITION_NAME_FTPR, &bufferMajor, &bufferMinor, &bufferHotfix, &bufferBuild);
Status = UpdateApi->FwuPartitionVersionFromBuffer(
Buffer,
BufferLength,
FPT_PARTITION_NAME_FTPR,
&bufferMajor,
&bufferMinor,
&bufferHotfix,
&bufferBuild
);
if (Status != SUCCESS) {
return Status;
}
@@ -227,7 +313,12 @@ StartCsmeUpdate (
//
// For full update, check if update to the same version
//
UpdateStatus = IsUpdateToSameVersion(Buffer, (UINT32)BufferLength, UpdateApi, &IsSameVersion);
UpdateStatus = IsUpdateToSameVersion(
Buffer,
(UINT32)BufferLength,
UpdateApi,
&IsSameVersion
);
if (UpdateStatus != SUCCESS) {
goto End;
}
Silicon/CoffeelakePkg/Library/FirmwareUpdateLib/FirmwareUpdateLib.c
+1 -2
View File
@@ -12,7 +12,6 @@
#include <Uefi/UefiBaseType.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/PciLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/TimerLib.h>
@@ -146,7 +145,7 @@ InitCsmeUpdInputData (
CsmeUpdDriverInput->SetMem = (VOID *)((UINTN)SetMem);
CsmeUpdDriverInput->CompareMem = (VOID *)((UINTN)CompareMem);
CsmeUpdDriverInput->Stall = (VOID *)((UINTN)MicroSecondDelay);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)PciReadBuffer);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)CsmePciReadBuffer);
if (HeciService != NULL) {
CsmeUpdDriverInput->HeciReadMessage = (VOID *)((UINTN)HeciService->HeciReceive);
CsmeUpdDriverInput->HeciSendMessage = (VOID *)((UINTN)HeciService->HeciSend);
Silicon/CometlakePkg/Library/FirmwareUpdateLib/FirmwareUpdateLib.c
+1 -2
View File
@@ -12,7 +12,6 @@
#include <Uefi/UefiBaseType.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/PciLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/TimerLib.h>
@@ -144,7 +143,7 @@ InitCsmeUpdInputData (
CsmeUpdDriverInput->SetMem = (VOID *)((UINTN)SetMem);
CsmeUpdDriverInput->CompareMem = (VOID *)((UINTN)CompareMem);
CsmeUpdDriverInput->Stall = (VOID *)((UINTN)MicroSecondDelay);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)PciReadBuffer);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)CsmePciReadBuffer);
CsmeUpdDriverInput->HeciReadMessage = (VOID *)((UINTN)HeciReceive);
CsmeUpdDriverInput->HeciSendMessage = (VOID *)((UINTN)HeciSend);
CsmeUpdDriverInput->HeciReset = (VOID *)((UINTN)ResetHeciInterface);
Silicon/CometlakevPkg/Library/FirmwareUpdateLib/FirmwareUpdateLib.c
+1 -2
View File
@@ -12,7 +12,6 @@
#include <Uefi/UefiBaseType.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/PciLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/TimerLib.h>
@@ -144,7 +143,7 @@ InitCsmeUpdInputData (
CsmeUpdDriverInput->SetMem = (VOID *)((UINTN)SetMem);
CsmeUpdDriverInput->CompareMem = (VOID *)((UINTN)CompareMem);
CsmeUpdDriverInput->Stall = (VOID *)((UINTN)MicroSecondDelay);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)PciReadBuffer);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)CsmePciReadBuffer);
CsmeUpdDriverInput->HeciReadMessage = (VOID *)((UINTN)HeciReceive);
CsmeUpdDriverInput->HeciSendMessage = (VOID *)((UINTN)HeciSend);
CsmeUpdDriverInput->HeciReset = (VOID *)((UINTN)ResetHeciInterface);
Silicon/ElkhartlakePkg/Library/FirmwareUpdateLib/FirmwareUpdateLib.c
+1 -2
View File
@@ -12,7 +12,6 @@
#include <Uefi/UefiBaseType.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/PciLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/TimerLib.h>
@@ -143,7 +142,7 @@ InitCsmeUpdInputData (
CsmeUpdDriverInput->SetMem = (VOID *)((UINTN)SetMem);
CsmeUpdDriverInput->CompareMem = (VOID *)((UINTN)CompareMem);
CsmeUpdDriverInput->Stall = (VOID *)((UINTN)MicroSecondDelay);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)PciReadBuffer);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)CsmePciReadBuffer);
CsmeUpdDriverInput->HeciReadMessage = (VOID *)((UINTN)HeciReceive);
CsmeUpdDriverInput->HeciSendMessage = (VOID *)((UINTN)HeciSend);
CsmeUpdDriverInput->HeciReset = (VOID *)((UINTN)ResetHeciInterface);
Silicon/TigerlakePkg/Library/FirmwareUpdateLib/FirmwareUpdateLib.c
+1 -2
View File
@@ -12,7 +12,6 @@
#include <Uefi/UefiBaseType.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/PciLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/TimerLib.h>
@@ -145,7 +144,7 @@ InitCsmeUpdInputData (
CsmeUpdDriverInput->SetMem = (VOID *)((UINTN)SetMem);
CsmeUpdDriverInput->CompareMem = (VOID *)((UINTN)CompareMem);
CsmeUpdDriverInput->Stall = (VOID *)((UINTN)MicroSecondDelay);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)PciReadBuffer);
CsmeUpdDriverInput->PciRead = (VOID *)((UINTN)CsmePciReadBuffer);
CsmeUpdDriverInput->HeciReadMessage = (VOID *)((UINTN)HeciReceive);
CsmeUpdDriverInput->HeciSendMessage = (VOID *)((UINTN)HeciSend);
CsmeUpdDriverInput->HeciReset = (VOID *)((UINTN)ResetHeciInterface);