Merge pull request #247 from RossBrunton/sizeincrease

Increase main memory size limit in memory map
uxlfoundation · Dec 6, 2023 · d0f09c8 · d0f09c8
2 parents f8ff552 + 94fbd3c
commit d0f09c8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/examples/refsi/hal_refsi/external/refsidrv/source/refsidrv/refsi_device_g.cpp b/examples/refsi/hal_refsi/external/refsidrv/source/refsidrv/refsi_device_g.cpp
@@ -27,8 +27,10 @@
 // Default memory area for storing kernel ELF binaries. When the RefSi device
 // does not have dedicated (TCIM) memory for storing kernel exeutables, a memory
 // window is set up to map this memory area to a reserved area in DMA.
+// We have increased the memory size from 1 << 20 to handle kernels larger than
+// 1MiB
 constexpr const uint64_t REFSI_ELF_BASE = 0x10000ull;
-constexpr const uint64_t REFSI_ELF_SIZE = (1 << 20) - REFSI_ELF_BASE;
+constexpr const uint64_t REFSI_ELF_SIZE = (1 << 27) - REFSI_ELF_BASE;
 
 // Memory area for per-hart storage.
 constexpr const uint64_t G_HART_LOCAL_BASE = 0x20800000;

diff --git a/examples/refsi/hal_refsi/include/device/program.lds b/examples/refsi/hal_refsi/include/device/program.lds
@@ -19,7 +19,7 @@ OUTPUT_ARCH( "riscv" )
 
 MEMORY
 {
-    mainmem : ORIGIN = 0x10000, LENGTH = (1 << 20)
+    mainmem : ORIGIN = 0x10000, LENGTH = (1 << 27)
     localmem : ORIGIN = 0x10000000, LENGTH = 0x200000
 }
 

diff --git a/examples/refsi/hal_refsi/source/refsi_hal_g1.cpp b/examples/refsi/hal_refsi/source/refsi_hal_g1.cpp
@@ -29,8 +29,10 @@
 // Default memory area for storing kernel ELF binaries. When the RefSi device
 // does not have dedicated (TCIM) memory for storing kernel exeutables, a memory
 // window is set up to map this memory area to a reserved area in DMA.
+// We have increased the memory size from 1 << 20 to handle kernels larger than
+// 1MiB
 constexpr const uint64_t REFSI_ELF_BASE = 0x10000ull;
-constexpr const uint64_t REFSI_ELF_SIZE = (1 << 20) - REFSI_ELF_BASE;
+constexpr const uint64_t REFSI_ELF_SIZE = (1 << 27) - REFSI_ELF_BASE;
 
 constexpr const uint64_t REFSI_MAX_HARTS = 64;
 

diff --git a/examples/refsi/hal_refsi/source/refsi_hal_m1.cpp b/examples/refsi/hal_refsi/source/refsi_hal_m1.cpp
@@ -28,8 +28,10 @@
 // Default memory area for storing kernel ELF binaries. When the RefSi device
 // does not have dedicated (TCIM) memory for storing kernel exeutables, a memory
 // window is set up to map this memory area to a reserved area in DMA.
+// We have increased the memory size from 1 << 20 to handle kernels larger than
+// 1MiB
 constexpr const uint64_t REFSI_ELF_BASE = 0x10000ull;
-constexpr const uint64_t REFSI_ELF_SIZE = (1 << 20) - REFSI_ELF_BASE;
+constexpr const uint64_t REFSI_ELF_SIZE = (1 << 27) - REFSI_ELF_BASE;
 
 refsi_m1_hal_device::refsi_m1_hal_device(refsi_device_t device,
                                          riscv::hal_device_info_riscv_t *info,