From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.53279.1683789187437434982 for ; Thu, 11 May 2023 00:13:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=CHda2rBI; spf=pass (domain: rivosinc.com, ip: 209.85.214.170, mailfrom: dhaval@rivosinc.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1aaebed5bd6so59004565ad.1 for ; Thu, 11 May 2023 00:13:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1683789187; x=1686381187; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=48MlL9JSrD63dNObL/Fcvv0ns/p2GMtUnKQkRiw9xUs=; b=CHda2rBIZ0wmurcGO+B836BvhJ5Htw7Mq0DRxkYL8jrsbqwFTkOEXvLIPVHvfx6cLU DtGxESQm4QOFPJmNjeYQUfwiWEzPV6zUwuqk9W4KN9Z6b5yTsfHbbqs8uIya5vRcXyjE 7IpGsfZTtXFiA8Ph5E5n6ARxSSyv8+RoZWUlF+Qj/nahGJo5CHMIVov1rGFuwjuAh9cr RbC+t6vUGTKS9AUwq9ube3+7Ll1tMea4FTpoXpWV3aMGnCf5tz88108jYdcl/GN8UTsN Hw0WCIBo3z5UepCFMlEN9J9YUEzRm1OuWPsio+ieWJ1Un6FxLJPRSw3Q/WBXy2BRu7Ge oZ5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683789187; x=1686381187; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=48MlL9JSrD63dNObL/Fcvv0ns/p2GMtUnKQkRiw9xUs=; b=OksT/v5/nlRryU2MS9Fug7kLMx3L6xXBzSuC4hKRSoQk5PZPTjg1KOGjcL+O4/LfDt JezbkMR1zzi69xSmqTU3h9ssJV9nrseHbZ3KQlgK4bZz2+kqzHcbL3c+YedHqmYqYKpT fyVYadDC9C1HAuq7A1pCPI2uBP/RBjS4LI3rCrMHZYRQD3e494tfPId5UoUiz7QQYoa8 QkfDHmmHjBdgKxrsYEPBJ+LoRBshDabBiwoofV6qxjrk+3awzz8AgQ3jgjZsu9ITi6Ds ZquzahItoJ+BD8TeLXVkNWxS2aEIfVOYX14bpd2Q4abJ8pkgDgyGfCDAK8iodfmol/sC R8oQ== X-Gm-Message-State: AC+VfDzdhZgJhrfFG+3rDLP8f6G0XeMYwB3DmDZs2gCjyLUaqg5cS0sd 7+sYO0DSlVFeU/HIW+VYqZKuR9PUmhpQEs2x8co= X-Google-Smtp-Source: ACHHUZ60ipxJLeybTutzNR6bavMoCZfgQ/kSZsgBEoRj2+az4wDyH/3rFCwD998KLtwiFCPMJc8ltw== X-Received: by 2002:a17:903:245:b0:1a9:85f2:5df6 with SMTP id j5-20020a170903024500b001a985f25df6mr23980331plh.6.1683789186754; Thu, 11 May 2023 00:13:06 -0700 (PDT) Return-Path: Received: from dhaval.. ([42.106.13.180]) by smtp.gmail.com with ESMTPSA id w20-20020a1709029a9400b001a9884c02e3sm5111214plp.10.2023.05.11.00.13.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 00:13:06 -0700 (PDT) From: "Dhaval Sharma" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo , Sunil V Subject: [PATCH v1 8/8] UefiPayloadPkg: Add RV64 driver to boot to UEFI Shell Date: Thu, 11 May 2023 12:42:26 +0530 Message-Id: <20230511071226.19726-9-dhaval@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511071226.19726-1-dhaval@rivosinc.com> References: <20230511071226.19726-1-dhaval@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Added required Dxe and Arch Proto drivers to ensure we are able to boot to Shell. Test: Able to boot to UEFI Shell Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Cc: Sunil V Signed-off-by: Dhaval Sharma --- UefiPayloadPkg/UefiPayloadPkgRV64.dsc | 33 +++++++------ UefiPayloadPkg/UefiPayloadPkgRV64.fdf | 51 +++++++++++--------- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkgRV64.dsc b/UefiPayloadPkg/UefiPay= loadPkgRV64.dsc index 8b226c483855..81a59f486837 100644 --- a/UefiPayloadPkg/UefiPayloadPkgRV64.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgRV64.dsc @@ -211,7 +211,7 @@ [LibraryClasses.common] CpuExceptionHandlerLib|UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandler= Lib/BaseRiscV64CpuExceptionHandlerLib.inf=0D RiscVSbiLib|MdePkg/Library/BaseRiscVSbiLib/BaseRiscVSbiLib.inf=0D ResetSystemLib|OvmfPkg/RiscVVirt/Library/ResetSystemLib/BaseResetSystemL= ib.inf=0D -=0D + TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf=0D =0D [LibraryClasses.common.SEC]=0D HobLib|UefiPayloadPkg/Library/PayloadEntryHobLib/HobLib.inf=0D @@ -252,7 +252,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] !if $(PERFORMANCE_MEASUREMENT_ENABLE)=0D PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.= inf=0D !endif=0D - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf=0D UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf=0D =0D !ifdef $(DEBUG_ON_SERIAL_PORT)=0D @@ -466,11 +465,25 @@ [Components] #=0D # RISC-V Platform module=0D #=0D - EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf=0D - UefiCpuPkg/CpuTimerDxeRiscV64/CpuTimerDxeRiscV64.inf=0D #=0D # Components that produce the architectural protocols=0D #=0D + UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf=0D + UefiCpuPkg/CpuTimerDxeRiscV64/CpuTimerDxeRiscV64.inf=0D + EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf=0D + MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf=0D + MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf=0D + MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf=0D + MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntim= eDxe.inf=0D + EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf=0D +=0D +!if $(DISABLE_RESET_SYSTEM) =3D=3D FALSE=0D + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf=0D +!endif=0D +!if $(EMU_VARIABLE_ENABLE) =3D=3D TRUE=0D + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf=0D +!endif=0D +=0D !if $(SECURITY_STUB_ENABLE) =3D=3D TRUE=0D MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf=0D !endif=0D @@ -488,17 +501,6 @@ [Components] =0D NULL|UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManag= erLib.inf=0D }=0D - EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf=0D - MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf=0D - MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf=0D - MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf=0D - MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntim= eDxe.inf=0D -!if $(DISABLE_RESET_SYSTEM) =3D=3D FALSE=0D - MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf=0D -!endif=0D -!if $(EMU_VARIABLE_ENABLE) =3D=3D TRUE=0D - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf=0D -!endif=0D #=0D # Following are the DXE drivers=0D #=0D @@ -593,7 +595,6 @@ [LibraryClasses] FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf=0D ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf=0D !include NetworkPkg/NetworkLibs.dsc.inc=0D - TimeBaseLib|EmbeddedPkg//Library/TimeBaseLib/TimeBaseLib.inf=0D OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf=0D =0D [Components]=0D diff --git a/UefiPayloadPkg/UefiPayloadPkgRV64.fdf b/UefiPayloadPkg/UefiPay= loadPkgRV64.fdf index 747c617b0f60..90128713f544 100644 --- a/UefiPayloadPkg/UefiPayloadPkgRV64.fdf +++ b/UefiPayloadPkg/UefiPayloadPkgRV64.fdf @@ -104,34 +104,13 @@ [FV.DXEFV] !if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE=0D INF CryptoPkg/Driver/CryptoDxe.inf=0D !endif=0D -!if $(SECURITY_STUB_ENABLE) =3D=3D TRUE=0D -INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf=0D -!endif=0D INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf=0D INF RuleOverride =3D UI MdeModulePkg/Application/UiApp/UiApp.inf=0D INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf=0D -INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf=0D INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf=0D -INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf=0D -INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf=0D -INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRunt= imeDxe.inf=0D -=0D -!if $(DISABLE_RESET_SYSTEM) =3D=3D FALSE=0D -INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf= =0D -!endif=0D -=0D -!if $(VARIABLE_SUPPORT) =3D=3D "EMU"=0D - INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf=0D -!elseif $(VARIABLE_SUPPORT) =3D=3D "SPI"=0D - INF UefiPayloadPkg/FvbRuntimeDxe/FvbSmm.inf=0D - INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.i= nf=0D - INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf=0D - INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf= =0D -!endif=0D =0D INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf=0D INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf=0D -INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf=0D INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf=0D INF MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.i= nf=0D =0D @@ -161,7 +140,6 @@ [FV.DXEFV] =0D # RISC-V Core Drivers=0D INF UefiCpuPkg/CpuTimerDxeRiscV64/CpuTimerDxeRiscV64.inf=0D -INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf=0D =0D #=0D # ISA Support=0D @@ -221,7 +199,36 @@ [FV.DXEFV] INF ShellPkg/Application/Shell/Shell.inf=0D !endif=0D =0D +#=0D +# PI DXE Drivers producing Architectural Protocols (EFI Services)=0D +#=0D +INF UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf=0D +INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf=0D =0D +!if $(SECURITY_STUB_ENABLE) =3D=3D TRUE=0D +INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf=0D +!endif=0D +=0D +INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf=0D +=0D +!if $(VARIABLE_SUPPORT) =3D=3D "EMU"=0D + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf=0D +!elseif $(VARIABLE_SUPPORT) =3D=3D "SPI"=0D + INF UefiPayloadPkg/FvbRuntimeDxe/FvbSmm.inf=0D + INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.i= nf=0D + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf=0D + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf= =0D +!endif=0D +=0D +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE=0D + INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootCon= figDxe.inf=0D +!endif=0D +=0D +INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRun= timeDxe.inf=0D +INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.in= f=0D +INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf=0D +INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf=0D +INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf=0D ##########################################################################= ######=0D #=0D # Rules are use with the [FV] section's module INF type to define=0D --=20 2.34.1