Mirrors/opensbi
4
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-12-22 14:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib: sbi_domain: make is_region_subset public

Browse Source 
The helper function is renamed as sbi_domain_memregion_is_subset,
and made public in header file.

Also add a convenient helper of sbi_domain_for_each_memregion_idx.

Signed-off-by: Bo Gan <ganboing@gmail.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20251218104243.562667-4-ganboing@gmail.com
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Bo Gan
2025-12-18 02:42:39 -08:00
committed by Anup Patel
parent 2c1bf5bb73
commit ed1deab09e
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/sbi/sbi_domain.h
View File

@@ -164,6 +164,25 @@ struct sbi_domain_memregion {
unsigned long flags; unsigned long flags;
}; };
/** Check if regionA is sub-region of regionB */
static inline bool sbi_domain_memregion_is_subset(
const struct sbi_domain_memregion *regA,
const struct sbi_domain_memregion *regB)
{
ulong regA_start = regA->base;
ulong regA_end = regA->base + (BIT(regA->order) - 1);
ulong regB_start = regB->base;
ulong regB_end = regB->base + (BIT(regB->order) - 1);
if ((regB_start <= regA_start) &&
(regA_start < regB_end) &&
(regB_start < regA_end) &&
(regA_end <= regB_end))
return true;
return false;
}
/** Representation of OpenSBI domain */ /** Representation of OpenSBI domain */
struct sbi_domain { struct sbi_domain {
/** Node in linked list of domains */ /** Node in linked list of domains */
@@ -222,6 +241,9 @@ extern struct sbi_dlist domain_list;
#define sbi_domain_for_each_memregion(__d, __r) \ #define sbi_domain_for_each_memregion(__d, __r) \
for ((__r) = (__d)->regions; (__r)->order; (__r)++) for ((__r) = (__d)->regions; (__r)->order; (__r)++)
#define sbi_domain_for_each_memregion_idx(__d, __r, __i) \
for ((__r) = (__d)->regions, (__i) = 0; (__r)->order; (__r)++, (__i)++)
/** /**
* Check whether given HART is assigned to specified domain * Check whether given HART is assigned to specified domain
* @param dom pointer to domain * @param dom pointer to domain

23
lib/sbi/sbi_domain.c
View File

@@ -285,29 +285,12 @@ static bool is_region_valid(const struct sbi_domain_memregion *reg)
return true; return true;
} }
/** Check if regionA is sub-region of regionB */
static bool is_region_subset(const struct sbi_domain_memregion *regA,
const struct sbi_domain_memregion *regB)
{
ulong regA_start = regA->base;
ulong regA_end = regA->base + (BIT(regA->order) - 1);
ulong regB_start = regB->base;
ulong regB_end = regB->base + (BIT(regB->order) - 1);
if ((regB_start <= regA_start) &&
(regA_start < regB_end) &&
(regB_start < regA_end) &&
(regA_end <= regB_end))
return true;
return false;
}
/** Check if regionA can be replaced by regionB */ /** Check if regionA can be replaced by regionB */
static bool is_region_compatible(const struct sbi_domain_memregion *regA, static bool is_region_compatible(const struct sbi_domain_memregion *regA,
const struct sbi_domain_memregion *regB) const struct sbi_domain_memregion *regB)
{ {
if (is_region_subset(regA, regB) && regA->flags == regB->flags) if (sbi_domain_memregion_is_subset(regA, regB) &&
regA->flags == regB->flags)
return true; return true;
return false; return false;
@@ -367,7 +350,7 @@ static const struct sbi_domain_memregion *find_next_subset_region(
sbi_domain_for_each_memregion(dom, sreg) { sbi_domain_for_each_memregion(dom, sreg) {
if (sreg == reg || (sreg->base <= addr) || if (sreg == reg || (sreg->base <= addr) ||
!is_region_subset(sreg, reg)) !sbi_domain_memregion_is_subset(sreg, reg))
continue; continue;
if (!ret || (sreg->base < ret->base) || if (!ret || (sreg->base < ret->base) ||