2 files changed, 55 insertions, 48 deletions

diff --git a/common/mem.c b/common/mem.c
index 420f6f4..445748c 100644
--- a/common/mem.c
+++ b/common/mem.c
@@ -1,40 +1,47 @@
 #include <apos/types.h>
 #include <apos/mem.h>
+#include <libfdt.h>
 
-const size_t mm_shifts[10] = {
-	MM_O0_SHIFT,
-	MM_O1_SHIFT,
-	MM_O2_SHIFT,
-	MM_O3_SHIFT,
-	MM_O4_SHIFT,
-	MM_O6_SHIFT,
-	MM_O7_SHIFT,
-	MM_O8_SHIFT,
-	MM_O9_SHIFT,
-};
+size_t __mm_shifts[10];
+size_t __mm_widths[10];
+size_t __mm_sizes[10];
+size_t __mm_page_shift;
+size_t __mm_max_order;
 
-const size_t mm_widths[10] = {
-	MM_O0_WIDTH,
-	MM_O1_WIDTH,
-	MM_O2_WIDTH,
-	MM_O3_WIDTH,
-	MM_O4_WIDTH,
-	MM_O5_WIDTH,
-	MM_O6_WIDTH,
-	MM_O7_WIDTH,
-	MM_O8_WIDTH,
-	MM_O9_WIDTH,
-};
+void init_mem(size_t max_order, size_t widths[10], size_t page_shift)
+{
+	__mm_max_order = max_order;
+	__mm_page_shift = page_shift;
 
-const size_t mm_sizes[10] = {
-	MM_O0_SIZE,
-	MM_O1_SIZE,
-	MM_O2_SIZE,
-	MM_O3_SIZE,
-	MM_O4_SIZE,
-	MM_O5_SIZE,
-	MM_O6_SIZE,
-	MM_O7_SIZE,
-	MM_O8_SIZE,
-	MM_O9_SIZE,
-};
+	__mm_shifts[0] = 0;
+	__mm_widths[0] = 1 << widths[0];
+	__mm_sizes[0]  = 1 << __mm_page_shift;
+
+	for(size_t i = 0; i <= __mm_max_order; ++i){
+		__mm_widths[i] = 1 << widths[i];
+		__mm_shifts[i] = __mm_shifts[i - 1] + __mm_widths[i - 1];
+		__mm_sizes[i] = 1 << __mm_shifts[i] << __mm_page_shift;
+	}
+}
+
+enum mm_mode_t get_mmode(void *fdt)
+{
+	int mmu_offset = fdt_path_offset(fdt, "/cpus/cpu");
+	const char *mmu = fdt_getprop(fdt, mmu_offset, "mmu-type", NULL);
+
+	if(strncmp("riscv,sv48", mmu, 10) == 0)
+		return Sv48;
+
+	if(strncmp("riscv,sv39", mmu, 10) == 0)
+		return Sv39;
+
+	if(strncmp("riscv,sv32", mmu, 10) == 0)
+		return Sv32;
+
+	/* fdt is missing mmu-type for some reason, but we can probably use
+	 * these values as fallback */
+	if(__riscv_xlen == 32)
+		return Sv32;
+	else
+		return Sv39;
+}
diff --git a/common/pmem.c b/common/pmem.c
index 4546e00..e40d160 100644
--- a/common/pmem.c
+++ b/common/pmem.c
@@ -71,7 +71,7 @@ static void __mark_free(mm_node_t * op, pnum_t pnum, enum mm_order_t tgt,
 
 void free_page(enum mm_order_t order, pm_t paddr)
 {
-	for (ssize_t i = MM_O0; i <= MAX_ORDER; ++i) {
+	for (size_t i = MM_O0; i <= __mm_max_order; ++i) {
 		if (!pmap->omap[i])
 			continue;
 
@@ -125,7 +125,7 @@ static bool __mark_used(mm_node_t * op, pnum_t pnum, enum mm_order_t tgt,
 
 void mark_used(enum mm_order_t order, pm_t paddr)
 {
-	for (ssize_t i = MM_O0; i <= MAX_ORDER; ++i) {
+	for (size_t i = MM_O0; i <= __mm_max_order; ++i) {
 		if (!pmap->omap[i])
 			continue;
 
@@ -175,13 +175,13 @@ static pnum_t __enum_order(mm_node_t * op, pnum_t offset,
 
 pm_t alloc_page(enum mm_order_t order, pm_t offset)
 {
-	if (order > MAX_ORDER)
+	if (order > __mm_max_order)
 		return 0;
 
 	pnum_t pnum = -1;
 	pm_t base = 0;
 	struct mm_omap_t *omap;
-	for (size_t i = order; i <= MAX_ORDER; ++i) {
+	for (size_t i = order; i <= __mm_max_order; ++i) {
 		if (!pmap->omap[i])
 			continue;
 
@@ -240,7 +240,7 @@ static void __update_omap(struct mm_omap_t *omap, pm_t base, pm_t offset)
 void update_pmap(pm_t offset)
 {
 	pm_t base = (pm_t) pmap;
-	for (size_t i = 0; i <= MAX_ORDER; ++i) {
+	for (size_t i = 0; i <= __mm_max_order; ++i) {
 		if (!pmap->omap[i])
 			continue;
 
@@ -347,16 +347,16 @@ pm_t populate_pmap(pm_t ram_base, size_t ram_size, pm_t cont)
 
 	pm_t ram_region = ram_base;
 	size_t ram_left = ram_size;
-	for (ssize_t i = MAX_ORDER; i >= MM_O0; --i) {
-		size_t entries = ram_left / mm_sizes[i];
+	for (ssize_t i = __mm_max_order; i >= MM_O0; --i) {
+		size_t entries = ram_left / __mm_sizes[i];
 		if (entries == 0)
 			continue;
 
 		cont = __populate_omap(&pmap->omap[i], cont,
 			ram_region, entries, i);
 
-		ram_left -= mm_sizes[i] * entries;
-		ram_region += (mm_sizes[i] * entries);
+		ram_left -= __mm_sizes[i] * entries;
+		ram_region += (__mm_sizes[i] * entries);
 	}
 
 	return cont - start;
@@ -374,15 +374,15 @@ pm_t probe_pmap(pm_t ram_base, size_t ram_size)
 
 	pm_t ram_region = ram_base;
 	size_t ram_left = ram_size;
-	for(ssize_t i = MAX_ORDER; i >= MM_O0; --i){
-		size_t entries = ram_left / mm_sizes[i];
+	for(ssize_t i = __mm_max_order; i >= MM_O0; --i){
+		size_t entries = ram_left / __mm_sizes[i];
 		if(entries == 0)
 			continue;
 
 		cont = __probe_omap(cont, entries, i);
 
-		ram_left -= mm_sizes[i] * entries;
-		ram_region += (mm_sizes[i] * entries);
+		ram_left -= __mm_sizes[i] * entries;
+		ram_region += (__mm_sizes[i] * entries);
 	}
 
 	return cont;