diff options
| author | Olivier Martin <olivier.martin@arm.com> | 2014-08-26 10:21:48 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-08-26 10:21:48 +0000 |
| commit | 5b38a703b2f0d2cda329cbca63d087a4a9509b46 (patch) | |
| tree | 28ac0e93eb16f59178296b3613dc0c0d014219d3 /EmbeddedPkg | |
| parent | 22044caa2cf9a484a01c6290fa5bcee5f157c8b4 (diff) | |
| download | edk2-platforms-5b38a703b2f0d2cda329cbca63d087a4a9509b46.tar.xz | |
EmbeddedPkg/FdtLib: Added support to load FDT from Firmware Volume
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15908 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EmbeddedPkg')
| -rw-r--r-- | EmbeddedPkg/Include/libfdt_env.h | 15 | ||||
| -rw-r--r-- | EmbeddedPkg/Library/FdtLib/FdtConfigurationTable.c | 103 | ||||
| -rw-r--r-- | EmbeddedPkg/Library/FdtLib/FdtLib.inf | 1 |
3 files changed, 118 insertions, 1 deletions
diff --git a/EmbeddedPkg/Include/libfdt_env.h b/EmbeddedPkg/Include/libfdt_env.h index 18a8450b92..c4dc83c024 100644 --- a/EmbeddedPkg/Include/libfdt_env.h +++ b/EmbeddedPkg/Include/libfdt_env.h @@ -94,4 +94,19 @@ InstallFdtFromSemihosting ( IN CONST CHAR16* FileName
);
+/**
+ Load and Install FDT from Firmware Volume
+
+ @param Filename Guid of the FDT blob to load from firmware volume
+
+ @return EFI_SUCCESS Fdt Blob was successfully installed into the configuration table
+ from firmware volume
+ @return EFI_NOT_FOUND Failed to locate the file in firmware volume
+ @return EFI_OUT_OF_RESOURCES Failed to allocate memory to contain the blob
+**/
+EFI_STATUS
+InstallFdtFromFv (
+ IN CONST EFI_GUID *FileName
+ );
+
#endif /* _LIBFDT_ENV_H */
diff --git a/EmbeddedPkg/Library/FdtLib/FdtConfigurationTable.c b/EmbeddedPkg/Library/FdtLib/FdtConfigurationTable.c index 42c5d44ea9..aece1df1cc 100644 --- a/EmbeddedPkg/Library/FdtLib/FdtConfigurationTable.c +++ b/EmbeddedPkg/Library/FdtLib/FdtConfigurationTable.c @@ -12,12 +12,13 @@ *
**/
-#include <Uefi.h>
+#include <PiDxe.h>
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Protocol/DevicePath.h>
+#include <Protocol/FirmwareVolume2.h>
#include <Protocol/SimpleFileSystem.h>
#include <Guid/Fdt.h>
@@ -176,3 +177,103 @@ CLOSE_FILES: Fs->Close (Fs);
return Status;
}
+
+/**
+ Load and Install FDT from Firmware Volume
+
+ @param Filename Guid of the FDT blob to load from firmware volume
+
+ @return EFI_SUCCESS Fdt Blob was successfully installed into the configuration table
+ from firmware volume
+ @return EFI_NOT_FOUND Fail to locate the file in firmware volume
+ @return EFI_OUT_OF_RESOURCES Fail to allocate memory to contain the blob
+**/
+EFI_STATUS
+InstallFdtFromFv (
+ IN CONST EFI_GUID *FileName
+ )
+{
+ EFI_STATUS Status;
+ EFI_HANDLE *HandleBuffer;
+ UINTN NumberOfHandles;
+ UINT32 FvStatus;
+ UINTN Index;
+ EFI_FIRMWARE_VOLUME2_PROTOCOL *FvInstance;
+ INTN SectionInstance;
+ UINTN FdtSize;
+ VOID* FdtBlob;
+ EFI_PHYSICAL_ADDRESS FdtBase;
+
+ FvStatus = 0;
+ SectionInstance = 0;
+
+ // Locate all the Firmware Volume protocols.
+ Status = gBS->LocateHandleBuffer (
+ ByProtocol,
+ &gEfiFirmwareVolume2ProtocolGuid,
+ NULL,
+ &NumberOfHandles,
+ &HandleBuffer
+ );
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
+ // Looking for FV that contains the FDT blob
+ for (Index = 0; Index < NumberOfHandles; Index++) {
+ //
+ // Get the protocol on this handle
+ // This should not fail because of LocateHandleBuffer
+ //
+ Status = gBS->HandleProtocol (
+ HandleBuffer[Index],
+ &gEfiFirmwareVolume2ProtocolGuid,
+ (VOID**) &FvInstance
+ );
+ if (EFI_ERROR (Status)) {
+ goto FREE_HANDLE_BUFFER;
+ }
+
+ while (Status == EFI_SUCCESS) {
+ // FdtBlob must be allocated by ReadSection
+ FdtBlob = NULL;
+
+ // See if it contains the FDT file
+ Status = FvInstance->ReadSection (
+ FvInstance,
+ FileName,
+ EFI_SECTION_RAW,
+ SectionInstance,
+ &FdtBlob,
+ &FdtSize,
+ &FvStatus
+ );
+ if (!EFI_ERROR (Status)) {
+ // When the FDT blob is attached to the Configuration Table it is recommended to load it as Runtime Service Data
+ // to prevent the kernel to overwrite its data
+ Status = gBS->AllocatePages (AllocateAnyPages, EfiRuntimeServicesData, EFI_SIZE_TO_PAGES (FdtSize), &FdtBase);
+ if (EFI_ERROR (Status)) {
+ goto FREE_HANDLE_BUFFER;
+ }
+
+ // Copy the FDT to the Runtime memory
+ gBS->CopyMem ((VOID*)(UINTN)FdtBase, FdtBlob, FdtSize);
+ // Free the buffer allocated by FvInstance->ReadSection()
+ gBS->FreePool (FdtBlob);
+
+ // Install the FDT as part of the UEFI Configuration Table
+ Status = InstallFdtIntoConfigurationTable ((VOID*)(UINTN)FdtBase, FdtSize);
+ if (EFI_ERROR (Status)) {
+ gBS->FreePages (FdtBase, EFI_SIZE_TO_PAGES (FdtSize));
+ }
+ break;
+ }
+ }
+ }
+
+FREE_HANDLE_BUFFER:
+ // Free any allocated buffers
+ gBS->FreePool (HandleBuffer);
+
+ return Status;
+}
diff --git a/EmbeddedPkg/Library/FdtLib/FdtLib.inf b/EmbeddedPkg/Library/FdtLib/FdtLib.inf index 0d8d629b7b..d18caa67ea 100644 --- a/EmbeddedPkg/Library/FdtLib/FdtLib.inf +++ b/EmbeddedPkg/Library/FdtLib/FdtLib.inf @@ -44,6 +44,7 @@ [Protocols]
gEfiDevicePathProtocolGuid
gEfiSimpleFileSystemProtocolGuid
+ gEfiFirmwareVolume2ProtocolGuid
[Guids]
gEfiFileInfoGuid
|