platform: generic: Don't mark non-MMU HARTs as invalid

Currently, the generic platform fw_platform_init() marks non-MMU
HARTs (e.g. E-core on SiFive Unleashed) as invalid. This means
such non-MMU HARTs won't be allowed to go ahead by sbi_init().

The sbi_init() now has a check for next stage privilege mode when
selecting coldboot HART. This check will force non-MMU HARTS (i.e.
HARTs without S-mode) to proceed in warmboot path and wait in the
HSM STOPPED state. This means we don't need to mark non-MMU HARTs
as invalid in generic platform fw_platform_init().

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Anup Patel
2020-09-09 13:54:03 +05:30
committed by Anup Patel
parent 172fa1601c
commit aaeca7eb4e

View File

@@ -71,7 +71,7 @@ unsigned long fw_platform_init(unsigned long arg0, unsigned long arg1,
unsigned long arg2, unsigned long arg3, unsigned long arg2, unsigned long arg3,
unsigned long arg4) unsigned long arg4)
{ {
const char *model, *mmu_type; const char *model;
void *fdt = (void *)arg1; void *fdt = (void *)arg1;
u32 hartid, hart_count = 0; u32 hartid, hart_count = 0;
int rc, root_offset, cpus_offset, cpu_offset, len; int rc, root_offset, cpus_offset, cpu_offset, len;
@@ -101,10 +101,6 @@ unsigned long fw_platform_init(unsigned long arg0, unsigned long arg1,
if (SBI_HARTMASK_MAX_BITS <= hartid) if (SBI_HARTMASK_MAX_BITS <= hartid)
continue; continue;
mmu_type = fdt_getprop(fdt, cpu_offset, "mmu-type", &len);
if (!mmu_type || !len)
hartid = -1U;
generic_hart_index2id[hart_count++] = hartid; generic_hart_index2id[hart_count++] = hartid;
} }