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

ahb: add mmio_ahb option

Browse Source
This commit is contained in:
Wesley W. Terpstra 2016-05-26 14:49:27 -07:00 committed by Andrew Waterman
parent 31f1dcaf84
commit 2ddada1732
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,7 @@ class BaseConfig extends Config (
} }
case NExtInterrupts => 2 case NExtInterrupts => 2
case NExtMMIOAXIChannels => 0 case NExtMMIOAXIChannels => 0
case NExtMMIOAHBChannels => 0
case PLICKey => PLICConfig(site(NTiles), site(UseVM), site(NExtInterrupts), 0) case PLICKey => PLICConfig(site(NTiles), site(UseVM), site(NExtInterrupts), 0)
case DMKey => new DefaultDebugModuleConfig(site(NTiles), site(XLen)) case DMKey => new DefaultDebugModuleConfig(site(NTiles), site(XLen))
case FDivSqrt => true case FDivSqrt => true

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

@ -21,6 +21,7 @@ case object BankIdLSB extends Field[Int]
case object NOutstandingMemReqsPerChannel extends Field[Int] case object NOutstandingMemReqsPerChannel extends Field[Int]
/** Number of exteral MMIO ports */ /** Number of exteral MMIO ports */
case object NExtMMIOAXIChannels extends Field[Int] case object NExtMMIOAXIChannels extends Field[Int]
case object NExtMMIOAHBChannels extends Field[Int]
/** Whether to divide HTIF clock */ /** Whether to divide HTIF clock */
case object UseHtifClockDiv extends Field[Boolean] case object UseHtifClockDiv extends Field[Boolean]
/** Function for building some kind of coherence manager agent */ /** Function for building some kind of coherence manager agent */
@ -81,6 +82,7 @@ class TopIO(implicit p: Parameters) extends BasicTopIO()(p) {
val mem = Vec(nMemChannels, new NastiIO) val mem = Vec(nMemChannels, new NastiIO)
val interrupts = Vec(p(NExtInterrupts), Bool()).asInput val interrupts = Vec(p(NExtInterrupts), Bool()).asInput
val mmio_axi = Vec(p(NExtMMIOAXIChannels), new NastiIO) val mmio_axi = Vec(p(NExtMMIOAXIChannels), new NastiIO)
val mmio_ahb = Vec(p(NExtMMIOAHBChannels), new HastiMasterIO)
val debug = new DebugBusIO()(p).flip val debug = new DebugBusIO()(p).flip
} }
@ -145,6 +147,7 @@ class Top(topParams: Parameters) extends Module with HasTopLevelParameters {
uncore.io.debugBus <> io.debug uncore.io.debugBus <> io.debug
io.mmio_axi <> uncore.io.mmio_axi io.mmio_axi <> uncore.io.mmio_axi
io.mmio_ahb <> uncore.io.mmio_ahb
io.mem <> uncore.io.mem io.mem <> uncore.io.mem
} }
@ -162,6 +165,7 @@ class Uncore(implicit val p: Parameters) extends Module
val tiles_uncached = Vec(nUncachedTilePorts, new ClientUncachedTileLinkIO).flip val tiles_uncached = Vec(nUncachedTilePorts, new ClientUncachedTileLinkIO).flip
val prci = Vec(nTiles, new PRCITileIO).asOutput val prci = Vec(nTiles, new PRCITileIO).asOutput
val mmio_axi = Vec(p(NExtMMIOAXIChannels), new NastiIO) val mmio_axi = Vec(p(NExtMMIOAXIChannels), new NastiIO)
val mmio_ahb = Vec(p(NExtMMIOAHBChannels), new HastiMasterIO)
val interrupts = Vec(p(NExtInterrupts), Bool()).asInput val interrupts = Vec(p(NExtInterrupts), Bool()).asInput
val debugBus = new DebugBusIO()(p).flip val debugBus = new DebugBusIO()(p).flip
} }
@ -228,12 +232,23 @@ class Uncore(implicit val p: Parameters) extends Module
val bootROM = Module(new ROMSlave(TopUtils.makeBootROM())) val bootROM = Module(new ROMSlave(TopUtils.makeBootROM()))
bootROM.io <> mmioNetwork.port("int:bootrom") bootROM.io <> mmioNetwork.port("int:bootrom")
val mmioEndpoint = p(NExtMMIOAXIChannels) match { // The memory map presently has only one external I/O region
case 0 => Module(new NastiErrorSlave).io val ext = mmioNetwork.port("ext")
case 1 => io.mmio_axi(0) val mmio_axi = p(NExtMMIOAXIChannels)
// The memory map presently has only one external I/O region val mmio_ahb = p(NExtMMIOAHBChannels)
require (mmio_axi + mmio_ahb <= 1)
if (mmio_ahb == 1) {
val ahb = Module(new AHBBridge)
io.mmio_ahb(0) <> ahb.io.ahb
ahb.io.tl <> ext
} else {
val mmioEndpoint = mmio_axi match {
case 0 => Module(new NastiErrorSlave).io
case 1 => io.mmio_axi(0)
}
TopUtils.connectTilelinkNasti(mmioEndpoint, ext)
} }
TopUtils.connectTilelinkNasti(mmioEndpoint, mmioNetwork.port("ext"))
} }
} }