From b1df1acd201e388a5ce96fd045593ee5b29c0387 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Fri, 9 Apr 2021 09:20:08 +0530 Subject: lib: sbi: Domains can be registered only before finalizing domains The domains are boot-time system-level partitions so we should allow platform support to register domains only before hart domain assignments are finalized. Signed-off-by: Anup Patel Reviewed-by: Xiang W Reviewed-by: Alistair Francis --- lib/sbi/sbi_domain.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c index 195c941..2849241 100644 --- a/lib/sbi/sbi_domain.c +++ b/lib/sbi/sbi_domain.c @@ -19,8 +19,8 @@ struct sbi_domain *hartid_to_domain_table[SBI_HARTMASK_MAX_BITS] = { 0 }; struct sbi_domain *domidx_to_domain_table[SBI_DOMAIN_MAX_INDEX] = { 0 }; - static u32 domain_count = 0; +static bool domain_finalized = false; static struct sbi_hartmask root_hmask = { 0 }; @@ -376,7 +376,8 @@ int sbi_domain_register(struct sbi_domain *dom, u32 cold_hartid = current_hartid(); const struct sbi_platform *plat = sbi_platform_thishart_ptr(); - if (!dom || !assign_mask) + /* Sanity checks */ + if (!dom || !assign_mask || domain_finalized) return SBI_EINVAL; /* Check if domain already discovered */ @@ -490,6 +491,12 @@ int sbi_domain_finalize(struct sbi_scratch *scratch, u32 cold_hartid) } } + /* + * Set the finalized flag so that the root domain + * regions can't be changed. + */ + domain_finalized = true; + return 0; } -- cgit v1.2.3