diff options
| author | Nikita Shubin <n.shubin@yadro.com> | 2021-10-01 11:31:16 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2021-10-11 09:59:29 +0530 |
| commit | 516161c46f0d3c73bf6a57e551d6e2489912fc03 (patch) | |
| tree | a2186bbe2c1ac5817c9cce98cd79519e5e7a4752 /lib/sbi | |
| parent | 754d51192b6bf6a4afd9d46c5f736a9f6dd1b404 (diff) | |
lib: sbi: convert reset to list
To support different handlers for different types of resets, we are
adding a sbi_list of restart handlers.
Instead of sbi_system_reset_set_device we use
sbi_system_reset_add_device to reflect the actual meaning.
Signed-off-by: Nikita Shubin <n.shubin@yadro.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
Diffstat (limited to 'lib/sbi')
| -rw-r--r-- | lib/sbi/sbi_init.c | 7 | ||||
| -rw-r--r-- | lib/sbi/sbi_system.c | 39 |
2 files changed, 30 insertions, 16 deletions
diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index f0eb365..843659e 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -84,8 +84,11 @@ static void sbi_boot_print_general(struct sbi_scratch *scratch) hdev = sbi_hsm_get_device(); sbi_printf("Platform HSM Device : %s\n", (hdev) ? hdev->name : "---"); - srdev = sbi_system_reset_get_device(); - sbi_printf("Platform SysReset Device : %s\n", + srdev = sbi_system_reset_get_device(SBI_SRST_RESET_TYPE_COLD_REBOOT, 0); + sbi_printf("Platform Reboot Device : %s\n", + (srdev) ? srdev->name : "---"); + srdev = sbi_system_reset_get_device(SBI_SRST_RESET_TYPE_SHUTDOWN, 0); + sbi_printf("Platform Shutdown Device : %s\n", (srdev) ? srdev->name : "---"); /* Firmware details */ diff --git a/lib/sbi/sbi_system.c b/lib/sbi/sbi_system.c index 479060b..a4e4781 100644 --- a/lib/sbi/sbi_system.c +++ b/lib/sbi/sbi_system.c @@ -18,28 +18,36 @@ #include <sbi/sbi_ipi.h> #include <sbi/sbi_init.h> -static const struct sbi_system_reset_device *reset_dev = NULL; +static SBI_LIST_HEAD(reset_devices_list); -const struct sbi_system_reset_device *sbi_system_reset_get_device(void) +const struct sbi_system_reset_device *sbi_system_reset_get_device( + u32 reset_type, u32 reset_reason) { - return reset_dev; + struct sbi_system_reset_device *dev = 0; + struct sbi_dlist *pos; + + /* Check each reset device registered for supported reset type */ + sbi_list_for_each(pos, &(reset_devices_list)) { + dev = to_system_reset_device(pos); + if (dev->system_reset_check && + dev->system_reset_check(reset_type, reset_reason)) + break; + } + + return dev; } -void sbi_system_reset_set_device(const struct sbi_system_reset_device *dev) +void sbi_system_reset_add_device(struct sbi_system_reset_device *dev) { - if (!dev || reset_dev) + if (!dev || !dev->system_reset_check) return; - reset_dev = dev; + sbi_list_add(&(dev->node), &(reset_devices_list)); } bool sbi_system_reset_supported(u32 reset_type, u32 reset_reason) { - if (reset_dev && reset_dev->system_reset_check && - reset_dev->system_reset_check(reset_type, reset_reason)) - return TRUE; - - return FALSE; + return !!sbi_system_reset_get_device(reset_type, reset_reason); } void __noreturn sbi_system_reset(u32 reset_type, u32 reset_reason) @@ -62,9 +70,12 @@ void __noreturn sbi_system_reset(u32 reset_type, u32 reset_reason) sbi_hsm_hart_stop(scratch, FALSE); /* Platform specific reset if domain allowed system reset */ - if (dom->system_reset_allowed && - reset_dev && reset_dev->system_reset) - reset_dev->system_reset(reset_type, reset_reason); + if (dom->system_reset_allowed) { + const struct sbi_system_reset_device *dev = + sbi_system_reset_get_device(reset_type, reset_reason); + if (dev) + dev->system_reset(reset_type, reset_reason); + } /* If platform specific reset did not work then do sbi_exit() */ sbi_exit(scratch); |