RV CPU driver requires access to HartID and FDT passed by BL. Set it through FirmwareContext. In future this should be passed as part of FDT itself to avoid any custome structures.
Cc: Guo Dong <guo.d...@intel.com> Cc: Ray Ni <ray...@intel.com> Cc: Sean Rhodes <sean@starlabs.systems> Cc: James Lu <james...@intel.com> Cc: Gua Guo <gua....@intel.com> Cc: Sunil V <suni...@ventanamicro.com> Signed-off-by: Dhaval Sharma <dha...@rivosinc.com> --- UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 2 ++ UefiPayloadPkg/UefiPayloadEntry/RiscV64/Rv64FdtParserLib.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf index 9b21b218a657..0cc3c0994aa1 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf @@ -61,6 +61,8 @@ [LibraryClasses] CpuLib FdtLib +[LibraryClasses.RISCV64] + RiscVSbiLib [Guids] gEfiMemoryTypeInformationGuid gEfiFirmwareFileSystem2Guid diff --git a/UefiPayloadPkg/UefiPayloadEntry/RiscV64/Rv64FdtParserLib.c b/UefiPayloadPkg/UefiPayloadEntry/RiscV64/Rv64FdtParserLib.c index 76f0600482f7..7be38bb742f6 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/RiscV64/Rv64FdtParserLib.c +++ b/UefiPayloadPkg/UefiPayloadEntry/RiscV64/Rv64FdtParserLib.c @@ -30,6 +30,7 @@ #include <UniversalPayload/ExtraData.h> #include <UniversalPayload/SerialPortInfo.h> #include <Guid/PcdDataBaseSignatureGuid.h> +#include <Library/BaseRiscVSbiLib.h> #include <libfdt.h> #define E820_RAM 1 @@ -376,6 +377,14 @@ BuildBlHobs ( UINTN FdtPages; UINT64 *FdtHobData; CONST VOID *Fdt; + EFI_FFS_FILE_HEADER *FileHeader; + EFI_FIRMWARE_VOLUME_HEADER *DxeCoreFv; + EFI_STATUS Status; + EFI_RISCV_FIRMWARE_CONTEXT FirmwareContext; + + FirmwareContext.BootHartId = Param1; + FirmwareContext.FlattenedDeviceTree = Param2; + SetFirmwareContextPointer (&FirmwareContext); Fdt = (VOID *)Param2; MinimalNeededSize = FixedPcdGet32 (PcdSystemMemoryUefiRegionSize); -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104679): https://edk2.groups.io/g/devel/message/104679 Mute This Topic: https://groups.io/mt/98822713/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
