From bc4a2c37473dc6ffe7d78c91c9d8b6aabb3c2a4a Mon Sep 17 00:00:00 2001
From: Dolu1990 <charles.papon.90@gmail.com>
Date: Wed, 27 May 2020 14:19:37 +0200
Subject: [PATCH] Fix SmpCluster jtag

---
 .../vexriscv/demo/smp/VexRiscvSmpCluster.scala  | 17 ++++++++---------
 .../demo/smp/VexRiscvSmpLitexCluster.scala      |  2 --
 src/main/scala/vexriscv/plugin/CsrPlugin.scala  |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala b/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
index 38506f2..422b1e2 100644
--- a/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
+++ b/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
@@ -51,12 +51,12 @@ case class VexRiscvSmpCluster(p : VexRiscvSmpClusterParameter,
       }
       case _ =>
     }
+    if(cpuId == 0) cpuConfig.plugins += new DebugPlugin(debugClockDomain)
     val core = new VexRiscv(cpuConfig)
     core.plugins.foreach {
       case plugin: IBusCachedPlugin => iBus = plugin.iBus.toBmb()
       case plugin: DBusCachedPlugin => dBus = plugin.dBus.toBmb().pipelined(cmdValid = true)
       case plugin: CsrPlugin => {
-        plugin.externalMhartId := cpuId
         plugin.softwareInterrupt := io.softwareInterrupts(cpuId)
         plugin.externalInterrupt := io.externalInterrupts(cpuId)
         plugin.timerInterrupt := io.timerInterrupts(cpuId)
@@ -113,12 +113,12 @@ case class VexRiscvSmpCluster(p : VexRiscvSmpClusterParameter,
 
 
 object VexRiscvSmpClusterGen {
-  def vexRiscvConfig(hartIdWidth : Int,
-                     hartId : Int,
+  def vexRiscvConfig(hartId : Int,
                      ioRange : UInt => Bool = (x => x(31 downto 28) === 0xF),
-                     resetVector : Long = 0x80000000l) = {
-    val iBusWidth = 128
-    val dBusWidth = 64
+                     resetVector : Long = 0x80000000l,
+                     iBusWidth : Int = 128,
+                     dBusWidth : Int = 64) = {
+
     val config = VexRiscvConfig(
       plugins = List(
         new MmuPlugin(
@@ -213,7 +213,7 @@ object VexRiscvSmpClusterGen {
           mulUnrollFactor = 32,
           divUnrollFactor = 1
         ),
-        new CsrPlugin(CsrPluginConfig.openSbi(misa = Riscv.misaToInt("imas")).copy(withExternalMhartid = true, mhartidWidth = hartIdWidth)),
+        new CsrPlugin(CsrPluginConfig.openSbi(mhartid = hartId, misa = Riscv.misaToInt("imas"))),
         new BranchPlugin(
           earlyBranch = false,
           catchAddressMisaligned = true,
@@ -222,14 +222,13 @@ object VexRiscvSmpClusterGen {
         new YamlPlugin(s"cpu$hartId.yaml")
       )
     )
-    if(hartId == 0) config.plugins += new DebugPlugin(null)
     config
   }
   def vexRiscvCluster(cpuCount : Int, resetVector : Long = 0x80000000l) = VexRiscvSmpCluster(
     debugClockDomain = ClockDomain.current.copy(reset = Bool().setName("debugResetIn")),
     p = VexRiscvSmpClusterParameter(
       cpuConfigs = List.tabulate(cpuCount) {
-        vexRiscvConfig(log2Up(cpuCount), _, resetVector = resetVector)
+        vexRiscvConfig(_, resetVector = resetVector)
       }
     )
   )
diff --git a/src/main/scala/vexriscv/demo/smp/VexRiscvSmpLitexCluster.scala b/src/main/scala/vexriscv/demo/smp/VexRiscvSmpLitexCluster.scala
index 3f3047f..30753c2 100644
--- a/src/main/scala/vexriscv/demo/smp/VexRiscvSmpLitexCluster.scala
+++ b/src/main/scala/vexriscv/demo/smp/VexRiscvSmpLitexCluster.scala
@@ -342,7 +342,6 @@ object VexRiscvLitexSmpClusterGen extends App {
       cluster = VexRiscvSmpClusterParameter(
         cpuConfigs = List.tabulate(cpuCount) { hartId =>
           vexRiscvConfig(
-            hartIdWidth = log2Up(cpuCount),
             hartId = hartId,
             ioRange = address => address.msb,
             resetVector = 0
@@ -382,7 +381,6 @@ object VexRiscvLitexSmpClusterOpenSbi extends App{
       cluster = VexRiscvSmpClusterParameter(
         cpuConfigs = List.tabulate(cpuCount) { hartId =>
           vexRiscvConfig(
-            hartIdWidth = log2Up(cpuCount),
             hartId = hartId,
             ioRange =  address => address(31 downto 28) === 0xF,
             resetVector = 0x80000000l
diff --git a/src/main/scala/vexriscv/plugin/CsrPlugin.scala b/src/main/scala/vexriscv/plugin/CsrPlugin.scala
index 23f3323..ebff1e0 100644
--- a/src/main/scala/vexriscv/plugin/CsrPlugin.scala
+++ b/src/main/scala/vexriscv/plugin/CsrPlugin.scala
@@ -87,12 +87,12 @@ object CsrPluginConfig{
   def small : CsrPluginConfig = small(0x00000020l)
   def smallest : CsrPluginConfig = smallest(0x00000020l)
 
-  def openSbi(misa : Int) = CsrPluginConfig(
+  def openSbi(mhartid : Int, misa : Int) = CsrPluginConfig(
     catchIllegalAccess  = true,
     mvendorid           = 0,
     marchid             = 0,
     mimpid              = 0,
-    mhartid             = 0,
+    mhartid             = mhartid,
     misaExtensionsInit  = misa,
     misaAccess          = CsrAccess.READ_ONLY,
     mtvecAccess         = CsrAccess.READ_WRITE,   //Could have been WRITE_ONLY :(