From f612d836fc417905591c06a2becf2fd129bfc78f Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Mon, 13 May 2019 10:32:13 +0100 Subject: [PATCH] dev-arm: Adding a SRAM in VExpress_GEM5_V1 This is added in order to match the RS1 memory map JIRA: https://gem5.atlassian.net/browse/GEM5-768 Change-Id: I51e7aeafe1468a68fe7a3d78c7a6c405114df88f Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34375 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg Tested-by: kokoro --- src/dev/arm/RealView.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index 0d2251d8c..5397de5aa 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -543,6 +543,24 @@ class HDLcd(AmbaDmaDevice): yield node +class MmioSRAM(SimpleMemory): + def generateDeviceTree(self, state): + node = FdtNode("sram@%x" % long(self.range.start)) + node.appendCompatible(["mmio-sram"]) + node.append(FdtPropertyWords("reg", + state.addrCells(self.range.start) + + state.sizeCells(self.range.size()) )) + + local_state = FdtState(addr_cells=2, size_cells=2, cpu_cells=1) + node.append(local_state.addrCellsProperty()) + node.append(local_state.sizeCellsProperty()) + node.append(FdtPropertyWords("ranges", + local_state.addrCells(0) + + state.addrCells(self.range.start) + + state.sizeCells(self.range.size()) )) + + yield node + class FVPBasePwrCtrl(BasicPioDevice): """ Based on Fast Models Base_PowerController v11.8 @@ -898,6 +916,8 @@ Memory map: 0x2d000000-0x2d00ffff: GPU (reserved) + 0x2e000000-0x2e007fff: Non-trusted SRAM + 0x2f000000-0x2fffffff: PCI IO space 0x30000000-0x3fffffff: PCI config space @@ -964,6 +984,10 @@ Interrupts: trusted_sram = SimpleMemory(range=AddrRange(0x04000000, size='256kB'), conf_table_reported=False) + # Non-Trusted SRAM + non_trusted_sram = MmioSRAM(range=AddrRange(0x2e000000, size=0x8000), + conf_table_reported=False) + # Platform control device (off-chip) realview_io = RealViewCtrl(proc_id0=0x14000000, proc_id1=0x14000000, idreg=0x30101100, pio_addr=0x1c010000) @@ -1004,6 +1028,7 @@ Interrupts: memories = [ self.bootmem, self.trusted_sram, + self.non_trusted_sram, self.flash0, ] return memories -- 2.30.2