lib: sbi: Simplified mmio match checking

We simplify the mmio flag matching in sbi_domain_check_addr().

Signed-off-by: Xiang W <wxjstz@126.com>
Reviewed-by: Anup Patel <anup@brainfault.org>

diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c
index f24a8e5..fec9074 100644 (file)
--- a/lib/sbi/sbi_domain.c
+++ b/lib/sbi/sbi_domain.c
@@ -105,7 +105,7 @@ bool sbi_domain_check_addr(const struct sbi_domain *dom,
                           unsigned long addr, unsigned long mode,
                           unsigned long access_flags)
 {
-       bool mmio = FALSE;
+       bool rmmio, mmio = FALSE;
        struct sbi_domain_memregion *reg;
        unsigned long rstart, rend, rflags, rwx = 0;
 
@@ -130,8 +130,8 @@ bool sbi_domain_check_addr(const struct sbi_domain *dom,
                rend = (reg->order < __riscv_xlen) ?
                        rstart + ((1UL << reg->order) - 1) : -1UL;
                if (rstart <= addr && addr <= rend) {
-                       if ((mmio && !(rflags & SBI_DOMAIN_MEMREGION_MMIO)) ||
-                           (!mmio && (rflags & SBI_DOMAIN_MEMREGION_MMIO)))
+                       rmmio = (rflags & SBI_DOMAIN_MEMREGION_MMIO) ? TRUE : FALSE;
+                       if (mmio != rmmio)
                                return FALSE;
                        return ((rflags & rwx) == rwx) ? TRUE : FALSE;
                }