From d24c87f8ba1f32b95c5394775bd0613b45205196 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@eecs.berkeley.edu>
Date: Mon, 6 Jun 2016 04:51:55 -0700
Subject: [PATCH] Update PLIC/PRCI address map (#124)

---
 riscv-tools                     |  2 +-
 src/main/scala/Configs.scala    | 11 +++++------
 src/main/scala/RocketChip.scala | 17 ++++++++---------
 uncore                          |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/riscv-tools b/riscv-tools
index dddbdec8..0a12a545 160000
--- a/riscv-tools
+++ b/riscv-tools
@@ -1 +1 @@
-Subproject commit dddbdec89bb045a3cd134f4776619097c838f20a
+Subproject commit 0a12a54524dba399cacc2955dc3489d8cda58740
diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index 53ff4e9d..cf159b6c 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -28,9 +28,8 @@ class BaseConfig extends Config (
       entries += AddrMapEntry("debug", MemSize(4096, MemAttr(AddrMapProt.RWX)))
       entries += AddrMapEntry("bootrom", MemSize(4096, MemAttr(AddrMapProt.RX)))
       entries += AddrMapEntry("rtc", MemSize(4096, MemAttr(AddrMapProt.RW)))
-      entries += AddrMapEntry("plic", MemRange(0x40000000, 4096 * 1024, MemAttr(AddrMapProt.RW)))
-      for (i <- 0 until site(NTiles))
-        entries += AddrMapEntry(s"prci$i", MemSize(4096, MemAttr(AddrMapProt.RW)))
+      entries += AddrMapEntry("plic", MemRange(0x40000000, 0x4000000, MemAttr(AddrMapProt.RW)))
+      entries += AddrMapEntry("prci", MemSize(0x4000000, MemAttr(AddrMapProt.RW)))
       new AddrMap(entries)
     }
     lazy val globalAddrMap = {
@@ -53,7 +52,8 @@ class BaseConfig extends Config (
     }
     def makeConfigString() = {
       val addrMap = globalAddrMap
-      val plicAddr = addrMap(s"io:int:plic").start
+      val plicAddr = addrMap("io:int:plic").start
+      val prciAddr = addrMap("io:int:prci").start
       val plicInfo = site(PLICKey)
       val xLen = site(XLen)
       val res = new StringBuilder
@@ -79,12 +79,11 @@ class BaseConfig extends Config (
       for (i <- 0 until site(NTiles)) {
         val isa = s"rv${site(XLen)}im${if (site(UseAtomics)) "a" else ""}${if (site(UseFPU)) "fd" else ""}"
         val timecmpAddr = addrMap("io:int:rtc").start + 8*(i+1)
-        val prciAddr = addrMap(s"io:int:prci$i").start
         res append s"  $i {\n"
         res append  "    0 {\n"
         res append s"      isa $isa;\n"
         res append s"      timecmp 0x${timecmpAddr.toString(16)};\n"
-        res append s"      ipi 0x${prciAddr.toString(16)};\n"
+        res append s"      ipi 0x${(prciAddr + 4*i).toString(16)};\n"
         res append s"      plic {\n"
         res append s"        m {\n"
         res append s"         ie 0x${(plicAddr + plicInfo.enableAddr(i, 'M')).toString(16)};\n"
diff --git a/src/main/scala/RocketChip.scala b/src/main/scala/RocketChip.scala
index 91531c5d..0d19f993 100644
--- a/src/main/scala/RocketChip.scala
+++ b/src/main/scala/RocketChip.scala
@@ -211,18 +211,17 @@ class Uncore(implicit val p: Parameters) extends Module
     debugModule.io.tl <> mmioNetwork.port("int:debug")
     debugModule.io.db <> io.debugBus
 
+    val prci = Module(new PRCI)
+    prci.io.tl <> mmioNetwork.port("int:prci")
+    io.prci := prci.io.tiles
+
     for (i <- 0 until nTiles) {
-      val prci = Module(new PRCI)
-      prci.io.tl <> mmioNetwork.port(s"int:prci$i")
-
-      prci.io.id := UInt(i)
-      prci.io.interrupts.mtip := rtc.io.irqs(i)
-      prci.io.interrupts.meip := plic.io.harts(plic.cfg.context(i, 'M'))
+      prci.io.interrupts(i).mtip := rtc.io.irqs(i)
+      prci.io.interrupts(i).meip := plic.io.harts(plic.cfg.context(i, 'M'))
       if (p(UseVM))
-        prci.io.interrupts.seip := plic.io.harts(plic.cfg.context(i, 'S'))
-      prci.io.interrupts.debug := debugModule.io.debugInterrupts(i)
+        prci.io.interrupts(i).seip := plic.io.harts(plic.cfg.context(i, 'S'))
+      prci.io.interrupts(i).debug := debugModule.io.debugInterrupts(i)
 
-      io.prci(i) := prci.io.tile
       io.prci(i).reset := Reg(next=Reg(next=htif.io.cpu(i).reset)) // TODO
     }
 
diff --git a/uncore b/uncore
index 65db9e3e..efc19629 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit 65db9e3eaa174bce72346770d91fe0592f964cb8
+Subproject commit efc19629b3c7e8668a72323ca3cc8514596e5e31