projects
/
sifive-blocks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/fix-false-comb-loop' into HEAD
[sifive-blocks.git]
/
src
/
main
/
scala
/
devices
/
spi
/
SPIArbiter.scala
diff --git
a/src/main/scala/devices/spi/SPIArbiter.scala
b/src/main/scala/devices/spi/SPIArbiter.scala
index 56c484ed593b46e8321deec29c621418065026a7..df87d9586cafd5c155463bd569eb166cdc623695 100644
(file)
--- a/
src/main/scala/devices/spi/SPIArbiter.scala
+++ b/
src/main/scala/devices/spi/SPIArbiter.scala
@@
-20,7
+20,9
@@
class SPIArbiter(c: SPIParamsBase, n: Int) extends Module {
io.outer.tx.bits := Mux1H(sel, io.inner.map(_.tx.bits))
io.outer.cnt := Mux1H(sel, io.inner.map(_.cnt))
io.outer.fmt := Mux1H(sel, io.inner.map(_.fmt))
io.outer.tx.bits := Mux1H(sel, io.inner.map(_.tx.bits))
io.outer.cnt := Mux1H(sel, io.inner.map(_.cnt))
io.outer.fmt := Mux1H(sel, io.inner.map(_.fmt))
- io.outer.cs := Mux1H(sel, io.inner.map(_.cs))
+ // Workaround for overzealous combinational loop detection
+ io.outer.cs := Mux(sel(1), io.inner(0).cs, io.inner(1).cs)
+ require(n == 2, "SPIArbiter currently only supports 2 clients")
(io.inner zip sel).foreach { case (inner, s) =>
inner.tx.ready := io.outer.tx.ready && s
(io.inner zip sel).foreach { case (inner, s) =>
inner.tx.ready := io.outer.tx.ready && s