[PATCH 2/3] lib: sbi: add in_region

[Xiang W]

It is a common operation to judge whether an address is in a
certain region, and add an inline function. and simplify
sbi_domain_memregion_init and is_region_subset.

Signed-off-by: Xiang W <wxjstz at 126.com>
---
 lib/sbi/sbi_domain.c | 54 +++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c
index fec9074..eba60f6 100644
--- a/lib/sbi/sbi_domain.c
+++ b/lib/sbi/sbi_domain.c
@@ -36,6 +36,14 @@ struct sbi_domain root = {
 	.system_reset_allowed = TRUE,
 };
 
+static inline bool in_region(unsigned long addr, const struct sbi_domain_memregion *reg)
+{
+	unsigned long s, e;
+	s= reg->base;
+	e = reg->order < __riscv_xlen ? reg->base + (BIT(reg->order) - 1) : -1;
+	return (s <= addr) && (addr <= e);
+}
+
 bool sbi_domain_is_assigned_hart(const struct sbi_domain *dom, u32 hartid)
 {
 	if (dom)
@@ -77,27 +85,18 @@ void sbi_domain_memregion_init(unsigned long addr,
 				unsigned long flags,
 				struct sbi_domain_memregion *reg)
 {
-	unsigned long base = 0, order;
+	unsigned long order;
+
+	if (reg == NULL)
+		return;
 
 	for (order = log2roundup(size) ; order <= __riscv_xlen; order++) {
-		if (order < __riscv_xlen) {
-			base = addr & ~((1UL << order) - 1UL);
-			if ((base <= addr) &&
-			    (addr < (base + (1UL << order))) &&
-			    (base <= (addr + size - 1UL)) &&
-			    ((addr + size - 1UL) < (base + (1UL << order))))
-				break;
-		} else {
-			base = 0;
+		reg->base = order < __riscv_xlen ? addr & ~((1UL << order) - 1UL) : 0;
+		reg->order = order;
+		if (in_region(addr,reg) && in_region(addr + size - 1, reg)) {
+			reg->flags = flags;
 			break;
 		}
-
-	}
-
-	if (reg) {
-		reg->base = base;
-		reg->order = order;
-		reg->flags = flags;
 	}
 }
 
@@ -126,10 +125,7 @@ bool sbi_domain_check_addr(const struct sbi_domain *dom,
 		if (mode == PRV_M && !(rflags & SBI_DOMAIN_MEMREGION_MMODE))
 			continue;
 
-		rstart = reg->base;
-		rend = (reg->order < __riscv_xlen) ?
-			rstart + ((1UL << reg->order) - 1) : -1UL;
-		if (rstart <= addr && addr <= rend) {
+		if (in_region(addr, reg)) {
 			rmmio = (rflags & SBI_DOMAIN_MEMREGION_MMIO) ? TRUE : FALSE;
 			if (mmio != rmmio)
 				return FALSE;
@@ -156,15 +152,11 @@ static bool is_region_valid(const struct sbi_domain_memregion *reg)
 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))
+	unsigned long start, end;
+	start = regA->base;
+	end = regA->order < __riscv_xlen ? regA->base + (BIT(regA->order) - 1) : -1;
+
+	if (in_region(start, regB) && in_region(end, regB))
 		return TRUE;
 
 	return FALSE;
@@ -423,7 +415,7 @@ int sbi_domain_register(struct sbi_domain *dom,
 	}
 
 	/* Assign index to domain */
-	dom->index = domain_count++;
+	dom->index = domaireg_mergedn_count++;
 	domidx_to_domain_table[dom->index] = dom;
 
 	/* Clear assigned HARTs of domain */
-- 
2.30.2