From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f46.google.com (mail-oa1-f46.google.com [209.85.160.46]) by mx.groups.io with SMTP id smtpd.web09.9637.1665766153533487452 for ; Fri, 14 Oct 2022 09:49:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=RC/0mHCj; spf=pass (domain: ventanamicro.com, ip: 209.85.160.46, mailfrom: sunilvl@ventanamicro.com) Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-132b8f6f1b2so6480826fac.11 for ; Fri, 14 Oct 2022 09:49:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; 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=yvIMStZbDmJ8i6IQ7Cvz9Z9a1AzmmGTeNDMGZt68spY=; b=RC/0mHCj0NyjAzDjSzuBf6VzeC5oV3wg7I4KKGOijdXuNXtZuAmmGi4elgmV4lKj8Z Ks9nkE9PwAfOTb9IyN2lvjK+F/sAnfrr0roUpepfKVJlXnLQnmYLq+mCwIVJ899Miw+i UZma6fFp++8nK/poAJZ4k+vF6rMPELoXWBAPT+YVeGyzhFzfmJesoqL6JXdLVGvtOhiy J9UjRDapjQwoFFNjzV39PtwVPGM7Qej7fZ/D/94bwyxgMHetvmgLALo8a557qJ1tRLYA 0daT1bXGE1JorVFIJXO2SFP7nKVS+DWm9cvGi/5EC1VPsf6K/XAW+pQqPB5FSbMvMz/b X8+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=yvIMStZbDmJ8i6IQ7Cvz9Z9a1AzmmGTeNDMGZt68spY=; b=4VumtDjyW7N+88NPmi06sXy99FLPc1i8RozuW52dP2np6gZa4Vvii0Vr965tUL3RBe C438NP2iGY1GK5f+Z+qRDwv/N40bGW5D/PPtjNin95j9x5nxKjPKkxNn223iauFJNM6L EOA27GkwShnMr2wKdc9oXI9MKqGe6sHAIYfCx9ZkalJZJwhrDq58AoxHu4R0eVF7TNuE I6lo6gQsrDTcyCYXMMGlGlYeQIFHfswFBhYG1JwCnB4+oArlrd+27I8hcTYy3i09K7vf CkaDbZJD7juIOrWovl8JPJz8OyMLRt0hHodNm9aEtqensubbdBPWytZl0ATGj58Pngy1 CAYg== X-Gm-Message-State: ACrzQf3axYiNzo1fnJZp1xDFg+lhmqrpXrA2sJbtJODQ3f0sRyEbLBmM Pzb42zWDK2hn6ve7Nvw/954A9MaiaMC+3g== X-Google-Smtp-Source: AMsMyM7X8e9n/Tt1LoHMfFvF16yeLaXsnGh1VCVdQ44al70h8ktKFqN1bSJfPM+5Dk+eZvohCTAsog== X-Received: by 2002:a17:90a:4594:b0:20b:23d5:8ead with SMTP id v20-20020a17090a459400b0020b23d58eadmr18137610pjg.127.1665766142121; Fri, 14 Oct 2022 09:49:02 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([49.206.13.138]) by smtp.gmail.com with ESMTPSA id f3-20020a62db03000000b0056265011136sm1963368pfg.112.2022.10.14.09.48.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 09:49:01 -0700 (PDT) From: "Sunil V L" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Rebecca Cran , Peter Grehan , Daniel Schaefer Subject: [edk2-staging/RiscV64QemuVirt PATCH V4 08/34] OvmfPkg/ResetSystemLib: Add support for RISC-V Date: Fri, 14 Oct 2022 22:18:10 +0530 Message-Id: <20221014164836.1513036-9-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221014164836.1513036-1-sunilvl@ventanamicro.com> References: <20221014164836.1513036-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4076 This is mostly copied from edk2-platforms/Platform/RISC-V/PlatformPkg/Library/ResetSystemLib Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Rebecca Cran Cc: Peter Grehan Cc: Daniel Schaefer Signed-off-by: Sunil V L --- OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf | 6 + OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf | 9 +- OvmfPkg/Library/ResetSystemLib/RiscV64/DxeResetShutdown.c | 20 +++ OvmfPkg/Library/ResetSystemLib/RiscV64/ResetSystemLib.c | 128 ++++++++++++++++++++ 4 files changed, 162 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf index a554c6b68cfe..9b2afc36dd95 100644 --- a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf +++ b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf @@ -25,6 +25,9 @@ [Sources.IA32, Sources.X64] Ia32X64/BaseResetShutdown.c Ia32X64/ResetSystemLib.c +[Sources.RISCV64] + RiscV64/ResetSystemLib.c + [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec @@ -36,3 +39,6 @@ [LibraryClasses] IoLib PciLib TimerLib + +[LibraryClasses.RISCV64] + RiscVSbiLib diff --git a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf index acf9c6a93552..c012a163c61a 100644 --- a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf +++ b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf @@ -20,13 +20,17 @@ [Defines] # The following information is for reference only and not required by the build # tools. # -# VALID_ARCHITECTURES = IA32 X64 +# VALID_ARCHITECTURES = IA32 X64 RISCV64 # [Sources.IA32, Sources.X64] Ia32X64/DxeResetShutdown.c Ia32X64/ResetSystemLib.c +[Sources.RISCV64] + RiscV64/ResetSystemLib.c + RiscV64/DxeResetShutdown.c + [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec @@ -39,5 +43,8 @@ [LibraryClasses] PcdLib TimerLib +[LibraryClasses.RISCV64] + RiscVSbiLib + [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId ## CONSUMES diff --git a/OvmfPkg/Library/ResetSystemLib/RiscV64/DxeResetShutdown.c b/OvmfPkg/Library/ResetSystemLib/RiscV64/DxeResetShutdown.c new file mode 100644 index 000000000000..027e235cad11 --- /dev/null +++ b/OvmfPkg/Library/ResetSystemLib/RiscV64/DxeResetShutdown.c @@ -0,0 +1,20 @@ +/** @file + DXE Reset System Library Shutdown API implementation for OVMF. + + Copyright (C) 2020, Red Hat, Inc. + Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +#include // CpuDeadLoop() +#include // ResetShutdown() + +EFI_STATUS +EFIAPI +DxeResetInit ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + return EFI_SUCCESS; +} diff --git a/OvmfPkg/Library/ResetSystemLib/RiscV64/ResetSystemLib.c b/OvmfPkg/Library/ResetSystemLib/RiscV64/ResetSystemLib.c new file mode 100644 index 000000000000..14f7653aa8de --- /dev/null +++ b/OvmfPkg/Library/ResetSystemLib/RiscV64/ResetSystemLib.c @@ -0,0 +1,128 @@ +/** @file + Reset System Library functions for RISC-V + + Copyright (c) 2021, Hewlett Packard Development LP. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include + +/** + This function causes a system-wide reset (cold reset), in which + all circuitry within the system returns to its initial state. This type of reset + is asynchronous to system operation and operates without regard to + cycle boundaries. + + If this function returns, it means that the system does not support cold reset. +**/ +VOID +EFIAPI +ResetCold ( + VOID + ) +{ + // Warm Reset via SBI ecall + SbiSystemReset (SBI_SRST_RESET_TYPE_COLD_REBOOT, SBI_SRST_RESET_REASON_NONE); +} + +/** + This function causes a system-wide initialization (warm reset), in which all processors + are set to their initial state. Pending cycles are not corrupted. + + If this function returns, it means that the system does not support warm reset. +**/ +VOID +EFIAPI +ResetWarm ( + VOID + ) +{ + // Warm Reset via SBI ecall + SbiSystemReset (SBI_SRST_RESET_TYPE_WARM_REBOOT, SBI_SRST_RESET_REASON_NONE); +} + +/** + This function causes the system to enter a power state equivalent + to the ACPI G2/S5 or G3 states. + + If this function returns, it means that the system does not support shutdown reset. +**/ +VOID +EFIAPI +ResetShutdown ( + VOID + ) +{ + // Shut down via SBI ecall + SbiSystemReset (SBI_SRST_RESET_TYPE_SHUTDOWN, SBI_SRST_RESET_REASON_NONE); +} + +/** + This function causes a systemwide reset. The exact type of the reset is + defined by the EFI_GUID that follows the Null-terminated Unicode string passed + into ResetData. If the platform does not recognize the EFI_GUID in ResetData + the platform must pick a supported reset type to perform. The platform may + optionally log the parameters from any non-normal reset that occurs. + + @param[in] DataSize The size, in bytes, of ResetData. + @param[in] ResetData The data buffer starts with a Null-terminated string, + followed by the EFI_GUID. +**/ +VOID +EFIAPI +ResetPlatformSpecific ( + IN UINTN DataSize, + IN VOID *ResetData + ) +{ + // + // Can map to OpenSBI vendor or platform specific reset type. + // + return; +} + +/** + The ResetSystem function resets the entire platform. + + @param[in] ResetType The type of reset to perform. + @param[in] ResetStatus The status code for the reset. + @param[in] DataSize The size, in bytes, of ResetData. + @param[in] ResetData For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown + the data buffer starts with a Null-terminated string, optionally + followed by additional binary data. The string is a description + that the caller may use to further indicate the reason for the + system reset. +**/ +VOID +EFIAPI +ResetSystem ( + IN EFI_RESET_TYPE ResetType, + IN EFI_STATUS ResetStatus, + IN UINTN DataSize, + IN VOID *ResetData OPTIONAL + ) +{ + switch (ResetType) { + case EfiResetWarm: + ResetWarm (); + break; + + case EfiResetCold: + ResetCold (); + break; + + case EfiResetShutdown: + ResetShutdown (); + return; + + case EfiResetPlatformSpecific: + ResetPlatformSpecific (DataSize, ResetData); + return; + + default: + return; + } +} -- 2.38.0