From c4acc60a4694a45ac154948efa300adbf30d0425 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Tue, 24 Nov 2020 10:13:16 +0530 Subject: include: sbi: Remove opensbi specific reset type defines We can now use the standard SBI SRST extension reset types instead of the opensbi specific (SBI_PLATFORM_RESET_xyz) reset types hence remove related opensbi specific defines. The "platform_" prefix of the reset type parameter of sbi_system_reset() function should also be removed. Signed-off-by: Anup Patel Reviewed-by: Alistair Francis Reviewed-by: Atish Patra --- lib/sbi/sbi_ecall_legacy.c | 2 +- lib/sbi/sbi_system.c | 4 ++-- lib/utils/sys/sifive_test.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/sbi/sbi_ecall_legacy.c b/lib/sbi/sbi_ecall_legacy.c index 909cbe3..683b8dc 100644 --- a/lib/sbi/sbi_ecall_legacy.c +++ b/lib/sbi/sbi_ecall_legacy.c @@ -103,7 +103,7 @@ static int sbi_ecall_legacy_handler(unsigned long extid, unsigned long funcid, } break; case SBI_EXT_0_1_SHUTDOWN: - sbi_system_reset(SBI_PLATFORM_RESET_SHUTDOWN); + sbi_system_reset(SBI_SRST_RESET_TYPE_SHUTDOWN); break; default: ret = SBI_ENOTSUPP; diff --git a/lib/sbi/sbi_system.c b/lib/sbi/sbi_system.c index 96290b3..2f1b7fb 100644 --- a/lib/sbi/sbi_system.c +++ b/lib/sbi/sbi_system.c @@ -18,7 +18,7 @@ #include #include -void __noreturn sbi_system_reset(u32 platform_reset_type) +void __noreturn sbi_system_reset(u32 reset_type) { ulong hbase = 0, hmask; u32 cur_hartid = current_hartid(); @@ -40,7 +40,7 @@ void __noreturn sbi_system_reset(u32 platform_reset_type) /* Platform specific reset if domain allowed system reset */ if (dom->system_reset_allowed) sbi_platform_system_reset(sbi_platform_ptr(scratch), - platform_reset_type); + reset_type); /* If platform specific reset did not work then do sbi_exit() */ sbi_exit(scratch); diff --git a/lib/utils/sys/sifive_test.c b/lib/utils/sys/sifive_test.c index 15369da..06fbfb2 100644 --- a/lib/utils/sys/sifive_test.c +++ b/lib/utils/sys/sifive_test.c @@ -24,11 +24,11 @@ int sifive_test_system_reset(u32 type) * was successful so that QEMU exits */ switch (type) { - case SBI_PLATFORM_RESET_SHUTDOWN: + case SBI_SRST_RESET_TYPE_SHUTDOWN: writew(FINISHER_PASS, sifive_test_base); break; - case SBI_PLATFORM_RESET_COLD: - case SBI_PLATFORM_RESET_WARM: + case SBI_SRST_RESET_TYPE_COLD_REBOOT: + case SBI_SRST_RESET_TYPE_WARM_REBOOT: writew(FINISHER_RESET, sifive_test_base); break; } -- cgit v1.2.3