From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.4740.1665396753256824232 for ; Mon, 10 Oct 2022 03:12:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=JhqhDhK3; spf=pass (domain: ventanamicro.com, ip: 209.85.214.171, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pl1-f171.google.com with SMTP id n7so9987606plp.1 for ; Mon, 10 Oct 2022 03:12:33 -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=cIQd6ozVXg0iBbieyZYS9EbOvVKVrPPiejAz3hZoI20=; b=JhqhDhK3nUhBshWkA8QUCNROjNR+vhPLsZ0AIcQM/l8zE/TD3Mydut4jn2CvzkjmtN MddwrYt2yRUSF797MeS4LjpZZM4pbR1eNH2tFHXO7mLVM2cbFj+33hpqbOgPW0G5eccM 9rrReI7y/MdbzIeZfvQoO5sZTGDcWDfVjKMa+NQ114NQWdnKfZqulX0S0AKyy6zmSBTM ++nrvpnbuy6cGdibjQt4dQWSdW7wrbZMzP8MAg5Cm9PB163jdhnWI7XLrD8F3QLlgkTT nj3K38xKm+Mcn79pejMIIO7ApFkvdMiPIAmey4h6D1yyIVtoINe3plTKvcmWthAnVL4J sI5g== 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=cIQd6ozVXg0iBbieyZYS9EbOvVKVrPPiejAz3hZoI20=; b=KkvfnIuAxQ29PgZsq5e4Gh1l11nW+AT1ImUwv1In+5+uANwiLqQ6hGwU+fLNeBPPKd FHtO2ok/0koP4o8T1J+Cbj8ahwPoDTjmJmzQEgXLUhRB8fi9i1xIAmL5K0QF+TM6HzNS EvAdafDTPc23emc27bBbNzU2cJnv8+jVEQC5kfjbizWcbka4sGPDdBE1UFxQ7j532POl MulmClGc4tJ6v79R3WR6r2CnG0wK/jZNXuSTy2y/Y4Zag+5lssHZBmCjJyXYEYK5rQar daxJ1u/NJJLJuzXiXP2yTuSwmFCev3SfGF4I/vhpvqk2wFO4JwmuVf1wgBE14ldXUeAO hfww== X-Gm-Message-State: ACrzQf2oC8IhvIsxaY54A9gtUpZ4zQpdD8bhiZ2Xyxnvw1F2Y6bvmMEQ UdE4FU+jYSXmYvCiQG2DDfV06PR85IA3Cw== X-Google-Smtp-Source: AMsMyM4F6QJ20T97ZFb4fV5JPADyvKJCQ36w0LAksPliDfZfVdonvEGkqXQv7Q6Q4CCBsUvwPdiOPQ== X-Received: by 2002:a17:903:20d3:b0:17c:8197:c4db with SMTP id i19-20020a17090320d300b0017c8197c4dbmr17970327plb.43.1665396752491; Mon, 10 Oct 2022 03:12:32 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([49.206.13.138]) by smtp.gmail.com with ESMTPSA id h17-20020a170902f55100b001788ccecbf5sm6302138plf.31.2022.10.10.03.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Oct 2022 03:12:32 -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 08/29] OvmfPkg/ResetSystemLib: Add support for RISC-V Date: Mon, 10 Oct 2022 15:41:41 +0530 Message-Id: <20221010101202.1146624-9-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010101202.1146624-1-sunilvl@ventanamicro.com> References: <20221010101202.1146624-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 --- .../ResetSystemLib/BaseResetSystemLib.inf | 6 + .../ResetSystemLib/DxeResetSystemLib.inf | 9 +- .../ResetSystemLib/RiscV64/DxeResetShutdown.c | 20 +++ .../ResetSystemLib/RiscV64/ResetSystemLib.c | 128 ++++++++++++++++++ 4 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 OvmfPkg/Library/ResetSystemLib/RiscV64/DxeResetShutdown.c create mode 100644 OvmfPkg/Library/ResetSystemLib/RiscV64/ResetSystemLib.c diff --git a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf index 4397f90a24dd..797eedb195ee 100644 --- a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf +++ b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf @@ -25,6 +25,9 @@ [Sources.IA32, Sources.X64] Ia32_X64/BaseResetShutdown.c Ia32_X64/ResetSystemLib.c +[Sources.RISCV64] + RiscV64/ResetSystemLib.c + [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec @@ -36,3 +39,6 @@ [LibraryClasses] IoLib PciLib TimerLib + +[LibraryClasses] + RiscVSbiLib diff --git a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf index 79478453d7cb..abab573f2f06 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] Ia32_X64/DxeResetShutdown.c Ia32_X64/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.25.1