riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

added HasAddrMapParameters and GlobalAddrMap

Browse Source
This commit is contained in:
Henry Cook 2015-10-06 18:24:08 -07:00
parent 1c489d75c1
commit 9d11b64c75
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
junctions

@ -1 +1 @@
Subproject commit 790f01f9e5df6d9d3ecaf636ccb95d1eb751879d Subproject commit 55471be1a864f606c2961680ff90fa8ca6457441

2
rocket

@ -1 +1 @@
Subproject commit dcc32b8e6eb3b62962db952bba2e34c36137523e Subproject commit 3ced30fd6a4686751e2218c5b268c099851dd179

2
src/main/scala/Configs.scala
View File

@ -169,7 +169,7 @@ class DefaultConfig extends ChiselConfig (
case UseBackupMemoryPort => true case UseBackupMemoryPort => true
case MMIOBase => BigInt(1 << 30) // 1 GB case MMIOBase => BigInt(1 << 30) // 1 GB
case ExternalIOStart => 2 * site(MMIOBase) case ExternalIOStart => 2 * site(MMIOBase)
case NastiAddrMap => AddrMap( case GlobalAddrMap => AddrMap(
AddrMapEntry("mem", None, MemSize(site(MMIOBase), AddrMapConsts.RWX)), AddrMapEntry("mem", None, MemSize(site(MMIOBase), AddrMapConsts.RWX)),
AddrMapEntry("conf", None, MemSubmap(site(ExternalIOStart) - site(MMIOBase), genCsrAddrMap)), AddrMapEntry("conf", None, MemSubmap(site(ExternalIOStart) - site(MMIOBase), genCsrAddrMap)),
AddrMapEntry("io", Some(site(ExternalIOStart)), MemSize(2 * site(MMIOBase), AddrMapConsts.RW))) AddrMapEntry("io", Some(site(ExternalIOStart)), MemSize(2 * site(MMIOBase), AddrMapConsts.RW)))

15
src/main/scala/RocketChip.scala
View File

@ -224,16 +224,17 @@ class OuterMemorySystem(implicit val p: Parameters) extends Module with HasTopLe
val outerTLParams = p.alterPartial({ case TLId => "L2ToMC" }) val outerTLParams = p.alterPartial({ case TLId => "L2ToMC" })
val backendBuffering = TileLinkDepths(0,0,0,0,0) val backendBuffering = TileLinkDepths(0,0,0,0,0)
val addrMap = new AddrHashMap(p(NastiAddrMap)) val addrMap = p(GlobalAddrMap)
val addrHashMap = new AddrHashMap(addrMap)
val nMasters = managerEndpoints.size + 1 val nMasters = managerEndpoints.size + 1
val nSlaves = addrMap.nEntries val nSlaves = addrHashMap.nEntries
println("Generated Address Map") println("Generated Address Map")
for ((name, base, size, _) <- addrMap.sortedEntries) { for ((name, base, size, _) <- addrHashMap.sortedEntries) {
println(f"\t$name%s $base%x - ${base + size - 1}%x") println(f"\t$name%s $base%x - ${base + size - 1}%x")
} }
val interconnect = Module(new NastiTopInterconnect(nMasters, nSlaves)(p)) val interconnect = Module(new NastiTopInterconnect(nMasters, nSlaves, addrMap)(p))
for ((bank, i) <- managerEndpoints.zipWithIndex) { for ((bank, i) <- managerEndpoints.zipWithIndex) {
val unwrap = Module(new ClientTileLinkIOUnwrapper()(outerTLParams)) val unwrap = Module(new ClientTileLinkIOUnwrapper()(outerTLParams))
@ -248,17 +249,17 @@ class OuterMemorySystem(implicit val p: Parameters) extends Module with HasTopLe
for (i <- 0 until nTiles) { for (i <- 0 until nTiles) {
val csrName = s"conf:csr$i" val csrName = s"conf:csr$i"
val csrPort = addrMap(csrName).port val csrPort = addrHashMap(csrName).port
val conv = Module(new SMIIONastiIOConverter(xLen, csrAddrBits)) val conv = Module(new SMIIONastiIOConverter(xLen, csrAddrBits))
conv.io.nasti <> interconnect.io.slaves(csrPort) conv.io.nasti <> interconnect.io.slaves(csrPort)
io.csr(i) <> conv.io.smi io.csr(i) <> conv.io.smi
} }
val conv = Module(new SMIIONastiIOConverter(scrDataBits, scrAddrBits)) val conv = Module(new SMIIONastiIOConverter(scrDataBits, scrAddrBits))
conv.io.nasti <> interconnect.io.slaves(addrMap("conf:scr").port) conv.io.nasti <> interconnect.io.slaves(addrHashMap("conf:scr").port)
io.scr <> conv.io.smi io.scr <> conv.io.smi
io.mmio <> interconnect.io.slaves(addrMap("io").port) io.mmio <> interconnect.io.slaves(addrHashMap("io").port)
val mem_channels = interconnect.io.slaves.take(nMemChannels) val mem_channels = interconnect.io.slaves.take(nMemChannels)

2
uncore

@ -1 +1 @@
Subproject commit c824028e4f38006058ae0757a5339e3273e0ee2b Subproject commit 69e494348c2b3ea7ff3abed392fcff2fb7cf730c