From 0800fd3ed99c1ca5fcde73905162df863911d73e Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Thu, 13 Jul 2017 13:18:50 -0700 Subject: [PATCH 1/3] PLIC: Add maxPri as well as ndev in DTS --- src/main/scala/devices/tilelink/Plic.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/scala/devices/tilelink/Plic.scala b/src/main/scala/devices/tilelink/Plic.scala index ab07e9f4..382962e4 100644 --- a/src/main/scala/devices/tilelink/Plic.scala +++ b/src/main/scala/devices/tilelink/Plic.scala @@ -68,6 +68,7 @@ class TLPLIC(params: PLICParams)(implicit p: Parameters) extends LazyModule val extra = Map( "interrupt-controller" -> Nil, "riscv,ndev" -> Seq(ResourceInt(nDevices)), + "riscv,maxpri" -> Seq(ResourceInt(maxPriorities)), "#interrupt-cells" -> Seq(ResourceInt(1))) Description(name, mapping ++ extra) } From f646bed3eafa7c11850fc6137d30b9101603b66f Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Thu, 13 Jul 2017 13:37:22 -0700 Subject: [PATCH 2/3] PLIC: Use longer DTS name for Max Priorities. I used the singular because there is really only one max priority --- src/main/scala/devices/tilelink/Plic.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/devices/tilelink/Plic.scala b/src/main/scala/devices/tilelink/Plic.scala index 382962e4..6e88a1d4 100644 --- a/src/main/scala/devices/tilelink/Plic.scala +++ b/src/main/scala/devices/tilelink/Plic.scala @@ -68,7 +68,7 @@ class TLPLIC(params: PLICParams)(implicit p: Parameters) extends LazyModule val extra = Map( "interrupt-controller" -> Nil, "riscv,ndev" -> Seq(ResourceInt(nDevices)), - "riscv,maxpri" -> Seq(ResourceInt(maxPriorities)), + "riscv,max-priority" -> Seq(ResourceInt(maxPriorities)), "#interrupt-cells" -> Seq(ResourceInt(1))) Description(name, mapping ++ extra) } From 35464782b513df87082d6b973602cdb6df06aa25 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Thu, 13 Jul 2017 15:57:10 -0700 Subject: [PATCH 3/3] PLIC: maxPriorities comes from params --- src/main/scala/devices/tilelink/Plic.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/devices/tilelink/Plic.scala b/src/main/scala/devices/tilelink/Plic.scala index 6e88a1d4..4b124de5 100644 --- a/src/main/scala/devices/tilelink/Plic.scala +++ b/src/main/scala/devices/tilelink/Plic.scala @@ -68,7 +68,7 @@ class TLPLIC(params: PLICParams)(implicit p: Parameters) extends LazyModule val extra = Map( "interrupt-controller" -> Nil, "riscv,ndev" -> Seq(ResourceInt(nDevices)), - "riscv,max-priority" -> Seq(ResourceInt(maxPriorities)), + "riscv,max-priority" -> Seq(ResourceInt(params.maxPriorities)), "#interrupt-cells" -> Seq(ResourceInt(1))) Description(name, mapping ++ extra) }