Mirrors/opensbi
7
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-25 07:41:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: sbi_init: Use hartmask for coldboot wait

Browse Source 
The coldboot_wait_bitmap is of fixed size and has __riscv_xlen
bits. This limits us to scale beyond __riscv_xlen HARTs hence
we replace coldboot_wait_bitmap with coldboot_wait_hmask which
is of type struct sbi_hartmask.

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>
This commit is contained in:
Anup Patel
2020-03-04 17:30:21 +05:30
committed by Anup Patel
parent 71d2b837c4
commit 2b945fc180
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/sbi/sbi_init.c
View File

@@ -75,20 +75,15 @@ static void sbi_boot_prints(struct sbi_scratch *scratch, u32 hartid)
sbi_hart_pmp_dump(scratch); sbi_hart_pmp_dump(scratch);
} }
#define COLDBOOT_WAIT_BITMAP_SIZE __riscv_xlen
static spinlock_t coldboot_lock = SPIN_LOCK_INITIALIZER; static spinlock_t coldboot_lock = SPIN_LOCK_INITIALIZER;
static unsigned long coldboot_done = 0; static unsigned long coldboot_done = 0;
static unsigned long coldboot_wait_bitmap = 0; static struct sbi_hartmask coldboot_wait_hmask = { 0 };
static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid) static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid)
{ {
unsigned long saved_mie; unsigned long saved_mie;
const struct sbi_platform *plat = sbi_platform_ptr(scratch); const struct sbi_platform *plat = sbi_platform_ptr(scratch);
if ((sbi_platform_hart_count(plat) <= hartid) ||
(COLDBOOT_WAIT_BITMAP_SIZE <= hartid))
sbi_hart_hang();
/* Save MIE CSR */ /* Save MIE CSR */
saved_mie = csr_read(CSR_MIE); saved_mie = csr_read(CSR_MIE);
@@ -99,7 +94,7 @@ static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid)
spin_lock(&coldboot_lock); spin_lock(&coldboot_lock);
/* Mark current HART as waiting */ /* Mark current HART as waiting */
coldboot_wait_bitmap |= (1UL << hartid); sbi_hartmask_set_hart(hartid, &coldboot_wait_hmask);
/* Wait for coldboot to finish using WFI */ /* Wait for coldboot to finish using WFI */
while (!coldboot_done) { while (!coldboot_done) {
@@ -109,7 +104,7 @@ static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid)
}; };
/* Unmark current HART as waiting */ /* Unmark current HART as waiting */
coldboot_wait_bitmap &= ~(1UL << hartid); sbi_hartmask_clear_hart(hartid, &coldboot_wait_hmask);
/* Release coldboot lock */ /* Release coldboot lock */
spin_unlock(&coldboot_lock); spin_unlock(&coldboot_lock);
@@ -134,7 +129,8 @@ static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid)
/* Send an IPI to all HARTs waiting for coldboot */ /* Send an IPI to all HARTs waiting for coldboot */
for (int i = 0; i < max_hart; i++) { for (int i = 0; i < max_hart; i++) {
if ((i != hartid) && (coldboot_wait_bitmap & (1UL << i))) if ((i != hartid) &&
sbi_hartmask_test_hart(i, &coldboot_wait_hmask))
sbi_platform_ipi_send(plat, i); sbi_platform_ipi_send(plat, i);
} }
@@ -285,6 +281,7 @@ void __noreturn sbi_init(struct sbi_scratch *scratch)
const struct sbi_platform *plat = sbi_platform_ptr(scratch); const struct sbi_platform *plat = sbi_platform_ptr(scratch);
if ((SBI_HARTMASK_MAX_BITS <= hartid) || if ((SBI_HARTMASK_MAX_BITS <= hartid) ||
(sbi_platform_hart_count(plat) <= hartid) ||
sbi_platform_hart_disabled(plat, hartid)) sbi_platform_hart_disabled(plat, hartid))
sbi_hart_hang(); sbi_hart_hang();