diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-03-02 17:49:17 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-03-11 15:30:12 +0530 |
| commit | 44ce5b99e97eb0c3695414cdb64c61f07d9a76a4 (patch) | |
| tree | bdf1778b00df90d69a76f2ee65fb4456aad81f45 /platform | |
| parent | 2b945fc180026d8eef701226a9bf0a82976c71c1 (diff) | |
include: Remove disabled_hart_mask from sbi_platform
The disabled_hard_mask in sbi_platform is only 64bits wide so we
cannot disable a HART with HARTID > 63. To tackle this, we remove
disabled_hart_mask and replace it with hart_disabled() platform
callback.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/andes/ae350/platform.c | 3 | ||||
| -rw-r--r-- | platform/ariane-fpga/platform.c | 1 | ||||
| -rw-r--r-- | platform/kendryte/k210/platform.c | 1 | ||||
| -rw-r--r-- | platform/qemu/virt/platform.c | 1 | ||||
| -rw-r--r-- | platform/sifive/fu540/platform.c | 7 | ||||
| -rw-r--r-- | platform/spike/platform.c | 1 | ||||
| -rw-r--r-- | platform/template/platform.c | 1 | ||||
| -rw-r--r-- | platform/thead/c910/platform.c | 1 |
8 files changed, 6 insertions, 10 deletions
diff --git a/platform/andes/ae350/platform.c b/platform/andes/ae350/platform.c index d14266d..08db3eb 100644 --- a/platform/andes/ae350/platform.c +++ b/platform/andes/ae350/platform.c @@ -156,7 +156,6 @@ static int ae350_system_shutdown(u32 type) /* Platform descriptor. */ const struct sbi_platform_operations platform_ops = { - .final_init = ae350_final_init, .pmp_region_count = ae350_pmp_region_count, @@ -182,13 +181,11 @@ const struct sbi_platform_operations platform_ops = { }; const struct sbi_platform platform = { - .opensbi_version = OPENSBI_VERSION, .platform_version = SBI_PLATFORM_VERSION(0x0, 0x01), .name = "Andes AE350", .features = SBI_PLATFORM_DEFAULT_FEATURES, .hart_count = AE350_HART_COUNT, .hart_stack_size = AE350_HART_STACK_SIZE, - .disabled_hart_mask = 0, .platform_ops_addr = (unsigned long)&platform_ops }; diff --git a/platform/ariane-fpga/platform.c b/platform/ariane-fpga/platform.c index 5ebbff8..1975eb2 100644 --- a/platform/ariane-fpga/platform.c +++ b/platform/ariane-fpga/platform.c @@ -201,6 +201,5 @@ const struct sbi_platform platform = { .features = SBI_ARIANE_FEATURES, .hart_count = ARIANE_HART_COUNT, .hart_stack_size = 4096, - .disabled_hart_mask = 0, .platform_ops_addr = (unsigned long)&platform_ops }; diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c index 8ad1bf8..1b49b39 100644 --- a/platform/kendryte/k210/platform.c +++ b/platform/kendryte/k210/platform.c @@ -139,6 +139,5 @@ const struct sbi_platform platform = { .features = SBI_PLATFORM_HAS_TIMER_VALUE, .hart_count = K210_HART_COUNT, .hart_stack_size = K210_HART_STACK_SIZE, - .disabled_hart_mask = 0, .platform_ops_addr = (unsigned long)&platform_ops }; diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c index 883555c..d2c841c 100644 --- a/platform/qemu/virt/platform.c +++ b/platform/qemu/virt/platform.c @@ -159,6 +159,5 @@ const struct sbi_platform platform = { .features = SBI_PLATFORM_DEFAULT_FEATURES, .hart_count = VIRT_HART_COUNT, .hart_stack_size = VIRT_HART_STACK_SIZE, - .disabled_hart_mask = 0, .platform_ops_addr = (unsigned long)&platform_ops }; diff --git a/platform/sifive/fu540/platform.c b/platform/sifive/fu540/platform.c index 5f3d3ce..4a8c016 100644 --- a/platform/sifive/fu540/platform.c +++ b/platform/sifive/fu540/platform.c @@ -194,6 +194,11 @@ static int fu540_timer_init(bool cold_boot) return clint_warm_timer_init(); } +static bool fu540_hart_disabled(u32 hartid) +{ + return (FU540_HARITD_DISABLED & (1UL << hartid)) ? TRUE : FALSE; +} + static int fu540_system_down(u32 type) { /* For now nothing to do. */ @@ -216,6 +221,7 @@ const struct sbi_platform_operations platform_ops = { .timer_event_stop = clint_timer_event_stop, .timer_event_start = clint_timer_event_start, .timer_init = fu540_timer_init, + .hart_disabled = fu540_hart_disabled, .system_reboot = fu540_system_down, .system_shutdown = fu540_system_down }; @@ -227,6 +233,5 @@ const struct sbi_platform platform = { .features = SBI_PLATFORM_DEFAULT_FEATURES, .hart_count = FU540_HART_COUNT, .hart_stack_size = FU540_HART_STACK_SIZE, - .disabled_hart_mask = FU540_HARITD_DISABLED, .platform_ops_addr = (unsigned long)&platform_ops }; diff --git a/platform/spike/platform.c b/platform/spike/platform.c index c0f93e2..2b9b041 100644 --- a/platform/spike/platform.c +++ b/platform/spike/platform.c @@ -110,6 +110,5 @@ const struct sbi_platform platform = { .features = SBI_PLATFORM_DEFAULT_FEATURES, .hart_count = SPIKE_HART_COUNT, .hart_stack_size = SPIKE_HART_STACK_SIZE, - .disabled_hart_mask = 0, .platform_ops_addr = (unsigned long)&platform_ops }; diff --git a/platform/template/platform.c b/platform/template/platform.c index f959a11..c98bbff 100644 --- a/platform/template/platform.c +++ b/platform/template/platform.c @@ -223,6 +223,5 @@ const struct sbi_platform platform = { .features = SBI_PLATFORM_DEFAULT_FEATURES, .hart_count = 1, .hart_stack_size = 4096, - .disabled_hart_mask = 0, .platform_ops_addr = (unsigned long)&platform_ops }; diff --git a/platform/thead/c910/platform.c b/platform/thead/c910/platform.c index 9d73bf4..482caad 100644 --- a/platform/thead/c910/platform.c +++ b/platform/thead/c910/platform.c @@ -153,6 +153,5 @@ const struct sbi_platform platform = { .features = SBI_THEAD_FEATURES, .hart_count = C910_HART_COUNT, .hart_stack_size = C910_HART_STACK_SIZE, - .disabled_hart_mask = 0, .platform_ops_addr = (unsigned long)&platform_ops }; |