mirror of
https://github.com/Fishwaldo/opensbi.git
synced 2025-03-18 21:01:26 +00:00
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>
This commit is contained in:
parent
754d51192b
commit
516161c46f
10 changed files with 50 additions and 25 deletions
|
@ -11,6 +11,7 @@
|
|||
#define __SBI_SYSTEM_H__
|
||||
|
||||
#include <sbi/sbi_types.h>
|
||||
#include <sbi/sbi_list.h>
|
||||
|
||||
/** System reset hardware device */
|
||||
struct sbi_system_reset_device {
|
||||
|
@ -22,11 +23,21 @@ struct sbi_system_reset_device {
|
|||
|
||||
/** Reset the system */
|
||||
void (*system_reset)(u32 reset_type, u32 reset_reason);
|
||||
|
||||
/** List */
|
||||
struct sbi_dlist node;
|
||||
};
|
||||
|
||||
const struct sbi_system_reset_device *sbi_system_reset_get_device(void);
|
||||
static inline struct sbi_system_reset_device *to_system_reset_device(
|
||||
struct sbi_dlist *node)
|
||||
{
|
||||
return container_of(node, struct sbi_system_reset_device, node);
|
||||
}
|
||||
|
||||
void sbi_system_reset_set_device(const struct sbi_system_reset_device *dev);
|
||||
const struct sbi_system_reset_device *sbi_system_reset_get_device(
|
||||
u32 reset_type, u32 reset_reason);
|
||||
|
||||
void sbi_system_reset_add_device(struct sbi_system_reset_device *dev);
|
||||
|
||||
bool sbi_system_reset_supported(u32 reset_type, u32 reset_reason);
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -115,7 +115,7 @@ static int gpio_reset_init(void *fdt, int nodeoff,
|
|||
if (len > 0)
|
||||
reset->inactive_delay = fdt32_to_cpu(*val);
|
||||
|
||||
sbi_system_reset_set_device(&gpio_reset);
|
||||
sbi_system_reset_add_device(&gpio_reset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -61,7 +61,7 @@ static int sunxi_wdt_reset_init(void *fdt, int nodeoff,
|
|||
|
||||
sunxi_wdt_base = (volatile void *)(unsigned long)reg_addr;
|
||||
|
||||
sbi_system_reset_set_device(&sunxi_wdt_reset);
|
||||
sbi_system_reset_add_device(&sunxi_wdt_reset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -126,7 +126,7 @@ static int thead_reset_init(void *fdt, int nodeoff,
|
|||
}
|
||||
}
|
||||
|
||||
sbi_system_reset_set_device(&thead_reset);
|
||||
sbi_system_reset_add_device(&thead_reset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -176,7 +176,7 @@ static struct sbi_system_reset_device htif_reset = {
|
|||
|
||||
int htif_system_reset_init(void)
|
||||
{
|
||||
sbi_system_reset_set_device(&htif_reset);
|
||||
sbi_system_reset_add_device(&htif_reset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -59,7 +59,7 @@ static struct sbi_system_reset_device sifive_test_reset = {
|
|||
int sifive_test_init(unsigned long base)
|
||||
{
|
||||
sifive_test_base = (void *)base;
|
||||
sbi_system_reset_set_device(&sifive_test_reset);
|
||||
sbi_system_reset_add_device(&sifive_test_reset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -108,7 +108,7 @@ static struct sbi_system_reset_device k210_reset = {
|
|||
static int k210_early_init(bool cold_boot)
|
||||
{
|
||||
if (cold_boot)
|
||||
sbi_system_reset_set_device(&k210_reset);
|
||||
sbi_system_reset_add_device(&k210_reset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -148,7 +148,7 @@ static int ux600_early_init(bool cold_boot)
|
|||
u32 regval;
|
||||
|
||||
if (cold_boot)
|
||||
sbi_system_reset_set_device(&ux600_reset);
|
||||
sbi_system_reset_add_device(&ux600_reset);
|
||||
|
||||
/* Measure CPU Frequency using Timer */
|
||||
ux600_clk_freq = ux600_get_clk_freq();
|
||||
|
|
Loading…
Add table
Reference in a new issue