:: commit 09b5a3e2d7decd0d2ea212db004226866bddd336

diff --git a/common/mm/vmm.c b/common/mm/vmm.c
index 0b634ea0..1dec9e99 100644
--- a/common/mm/vmm.c
+++ b/common/mm/vmm.c
@@ -466,6 +466,21 @@ static uint64_t pt_to_vmm_flags_internal(pt_entry_t entry) {
 }
 
 pagemap_t new_pagemap(int paging_mode) {
+    (void)paging_mode;
+
+    uint32_t cpucfg_val;
+
+    asm volatile (
+        "cpucfg %0, %1"
+        : "=r"(cpucfg_val)
+        : "r"(1)
+    );
+
+    uint32_t valen = ((cpucfg_val >> 12) & 0xff) + 1;
+    if (valen < 48) {
+        panic(true, "vmm: VALEN values < 48 not currently supported");
+    }
+
     (void)paging_mode;
     pagemap_t pagemap;
     pagemap.pgd[0] = ext_mem_alloc(PT_SIZE);
diff --git a/common/mm/vmm.h b/common/mm/vmm.h
index 3e15c5e9..01cf7e6b 100644
--- a/common/mm/vmm.h
+++ b/common/mm/vmm.h
@@ -3,7 +3,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <lib/print.h>
 
 #if defined (__x86_64__) || defined (__i386__)
 
@@ -124,22 +123,11 @@ void map_page(pagemap_t pagemap, uint64_t virt_addr, uint64_t phys_addr, uint64_
 
 #elif defined (__loongarch64)
 
-#define paging_mode_va_bits(mode) ({ \
-    (void)(mode); \
-    uint32_t cpucfg_val; \
-    uint32_t cfg_num = 1; \
-    \
-    asm volatile ( \
-        "cpucfg %0, %1" \
-        : "=r"(cpucfg_val) \
-        : "r"(cfg_num) \
-    ); \
-    \
-    ((cpucfg_val >> 12) & 0xff) + 1; \
-})
+#define paging_mode_va_bits(mode) 48
 
 static inline uint64_t paging_mode_higher_half(int paging_mode) {
-    return ~(((uintptr_t)1 << (paging_mode_va_bits(paging_mode) - 1)) - 1);
+    (void)paging_mode;
+    return 0xffff800000000000;
 }
 
 // We use fake flags here because these don't properly map onto the