config: allow more than 3GB of memory for x86 simulations

This patch edits the configuration files so that x86 simulations can have
more than 3GB of memory.  It also corrects a bug in the MemConfig.py script.

3 files changed, 27 insertions, 6 deletions

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 58ad1a7c9..84dbb9b3a 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -407,7 +407,16 @@ def makeX86System(mem_mode, numCPUs = 1, mdesc = None, self = None,
     self.mem_mode = mem_mode
 
     # Physical memory
-    self.mem_ranges = [AddrRange(mdesc.mem())]
+    # On the PC platform, the memory region 0xC0000000-0xFFFFFFFF is reserved
+    # for various devices.  Hence, if the physical memory size is greater than
+    # 3GB, we need to split it into two parts.
+    excess_mem_size = \
+        convert.toMemorySize(mdesc.mem()) - convert.toMemorySize('3GB')
+    if excess_mem_size <= 0:
+        self.mem_ranges = [AddrRange(mdesc.mem())]
+    else:
+        self.mem_ranges = [AddrRange('3GB'),
+            AddrRange(Addr('4GB'), size = excess_mem_size)]
 
     # Platform
     self.pc = Pc()
@@ -501,21 +510,32 @@ def makeLinuxX86System(mem_mode, numCPUs = 1, mdesc = None,
     # just to avoid corner cases.
     phys_mem_size = sum(map(lambda r: r.size(), self.mem_ranges))
     assert(phys_mem_size >= 0x200000)
+    assert(len(self.mem_ranges) <= 2)
 
-    self.e820_table.entries = \
+    entries = \
        [
         # Mark the first megabyte of memory as reserved
         X86E820Entry(addr = 0, size = '639kB', range_type = 1),
         X86E820Entry(addr = 0x9fc00, size = '385kB', range_type = 2),
-        # Mark the rest as available
+        # Mark the rest of physical memory as available
         X86E820Entry(addr = 0x100000,
-                size = '%dB' % (phys_mem_size - 0x100000),
+                size = '%dB' % (self.mem_ranges[0].size() - 0x100000),
                 range_type = 1),
         # Reserve the last 16kB of the 32-bit address space for the
         # m5op interface
         X86E820Entry(addr=0xFFFF0000, size='64kB', range_type=2),
         ]
 
+    # In case the physical memory is greater than 3GB, we split it into two
+    # parts and add a separate e820 entry for the second part.  This entry
+    # starts at 0x100000000,  which is the first address after the space
+    # reserved for devices.
+    if len(self.mem_ranges) == 2:
+        entries.append(X86E820Entry(addr = 0x100000000,
+            size = '%dB' % (self.mem_ranges[1].size()), range_type = 1))
+
+    self.e820_table.entries = entries
+
     # Command line
     self.boot_osflags = 'earlyprintk=ttyS0 console=ttyS0 lpj=7999923 ' + \
                         'root=/dev/hda1'
diff --git a/configs/common/MemConfig.py b/configs/common/MemConfig.py
index a74ff1d62..456ff4e1d 100644
--- a/configs/common/MemConfig.py
+++ b/configs/common/MemConfig.py
@@ -189,5 +189,5 @@ def config_mem(options, system):
     system.mem_ctrls = mem_ctrls
 
     # Connect the controllers to the membus
-    for i in xrange(nbr_mem_ctrls):
+    for i in xrange(len(system.mem_ctrls)):
         system.mem_ctrls[i].port = system.membus.master
diff --git a/configs/example/fs.py b/configs/example/fs.py
index cb9b264d2..824c4a2dc 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -96,7 +96,8 @@ if options.benchmark:
         sys.exit(1)
 else:
     if options.dual:
-        bm = [SysConfig(disk=options.disk_image, mem=options.mem_size), SysConfig(disk=options.disk_image, mem=options.mem_size)]
+        bm = [SysConfig(disk=options.disk_image, mem=options.mem_size),
+              SysConfig(disk=options.disk_image, mem=options.mem_size)]
     else:
         bm = [SysConfig(disk=options.disk_image, mem=options.mem_size)]