X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ArmVirtPkg%2FLibrary%2FNorFlashQemuLib%2FNorFlashQemuLib.c;fp=ArmVirtPkg%2FLibrary%2FNorFlashQemuLib%2FNorFlashQemuLib.c;h=2b39f021d0aec8a94ab5ebe63a0ebaef877160c0;hb=2b16a4fb91b9b31c0d152588f5ac51080c6c0763;hp=271d7f0efbc09e9848608b6fc3de55d600c905cb;hpb=40b0b23ed34f48c26d711d3e4613a4bb35eeadff;p=mirror_edk2.git diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c index 271d7f0efb..2b39f021d0 100644 --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c @@ -13,9 +13,9 @@ #include -#define QEMU_NOR_BLOCK_SIZE SIZE_256KB +#define QEMU_NOR_BLOCK_SIZE SIZE_256KB -#define MAX_FLASH_BANKS 4 +#define MAX_FLASH_BANKS 4 EFI_STATUS NorFlashPlatformInitialization ( @@ -25,40 +25,59 @@ NorFlashPlatformInitialization ( return EFI_SUCCESS; } -NOR_FLASH_DESCRIPTION mNorFlashDevices[MAX_FLASH_BANKS]; +NOR_FLASH_DESCRIPTION mNorFlashDevices[MAX_FLASH_BANKS]; EFI_STATUS NorFlashPlatformGetDevices ( - OUT NOR_FLASH_DESCRIPTION **NorFlashDescriptions, - OUT UINT32 *Count + OUT NOR_FLASH_DESCRIPTION **NorFlashDescriptions, + OUT UINT32 *Count ) { - FDT_CLIENT_PROTOCOL *FdtClient; - INT32 Node; - EFI_STATUS Status; - EFI_STATUS FindNodeStatus; - CONST UINT32 *Reg; - UINT32 PropSize; - UINT32 Num; - UINT64 Base; - UINT64 Size; - - Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL, - (VOID **)&FdtClient); + FDT_CLIENT_PROTOCOL *FdtClient; + INT32 Node; + EFI_STATUS Status; + EFI_STATUS FindNodeStatus; + CONST UINT32 *Reg; + UINT32 PropSize; + UINT32 Num; + UINT64 Base; + UINT64 Size; + + Status = gBS->LocateProtocol ( + &gFdtClientProtocolGuid, + NULL, + (VOID **)&FdtClient + ); ASSERT_EFI_ERROR (Status); Num = 0; - for (FindNodeStatus = FdtClient->FindCompatibleNode (FdtClient, - "cfi-flash", &Node); + for (FindNodeStatus = FdtClient->FindCompatibleNode ( + FdtClient, + "cfi-flash", + &Node + ); !EFI_ERROR (FindNodeStatus) && Num < MAX_FLASH_BANKS; - FindNodeStatus = FdtClient->FindNextCompatibleNode (FdtClient, - "cfi-flash", Node, &Node)) { - - Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", - (CONST VOID **)&Reg, &PropSize); + FindNodeStatus = FdtClient->FindNextCompatibleNode ( + FdtClient, + "cfi-flash", + Node, + &Node + )) + { + Status = FdtClient->GetNodeProperty ( + FdtClient, + Node, + "reg", + (CONST VOID **)&Reg, + &PropSize + ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n", - __FUNCTION__, Status)); + DEBUG (( + DEBUG_ERROR, + "%a: GetNodeProperty () failed (Status == %r)\n", + __FUNCTION__, + Status + )); continue; } @@ -76,7 +95,8 @@ NorFlashPlatformGetDevices ( // The firmware is not updatable from inside the guest anyway. // if ((PcdGet64 (PcdFvBaseAddress) + PcdGet32 (PcdFvSize) > Base) && - (Base + Size) > PcdGet64 (PcdFvBaseAddress)) { + ((Base + Size) > PcdGet64 (PcdFvBaseAddress))) + { continue; } @@ -97,15 +117,20 @@ NorFlashPlatformGetDevices ( // code, which is not intended to be guest updatable, and is usually backed // in a readonly manner by QEMU anyway. // - Status = FdtClient->SetNodeProperty (FdtClient, Node, "status", - "disabled", sizeof ("disabled")); + Status = FdtClient->SetNodeProperty ( + FdtClient, + Node, + "status", + "disabled", + sizeof ("disabled") + ); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_WARN, "Failed to set NOR flash status to 'disabled'\n")); } } *NorFlashDescriptions = mNorFlashDevices; - *Count = Num; + *Count = Num; return EFI_SUCCESS; }