Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/31941 )
Change subject: dev-arm: generateBasicPioDeviceNode requiring an
ArmInterruptPin
......................................................................
dev-arm: generateBasicPioDeviceNode requiring an ArmInterruptPin
Change-Id: I16ed3b689158defe2a43cccfa053d48dec4a1e41
Signed-off-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31941
Reviewed-by: Andreas Sandberg <andreas.sandb...@arm.com>
Maintainer: Andreas Sandberg <andreas.sandb...@arm.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/dev/Device.py
M src/dev/arm/RealView.py
M src/dev/arm/VirtIOMMIO.py
3 files changed, 8 insertions(+), 10 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/Device.py b/src/dev/Device.py
index d42541d..8950763 100644
--- a/src/dev/Device.py
+++ b/src/dev/Device.py
@@ -57,14 +57,14 @@
state.sizeCells(size) ))
if interrupts:
- if any([i < 32 for i in interrupts]):
+ if any([i.num < 32 for i in interrupts]):
raise(("Interrupt number smaller than 32 "+
" in PioDevice %s") % name)
# subtracting 32 because Linux assumes that SPIs start at 0,
while
# gem5 uses the internal GIC numbering (SPIs start at 32)
node.append(FdtPropertyWords("interrupts", sum(
- [[0, i - 32, 4] for i in interrupts], []) ))
+ [[0, i.num - 32, 4] for i in interrupts], []) ))
return node
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index 5bfc12e..684567f 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -373,7 +373,7 @@
def generateDeviceTree(self, state):
node = self.generateBasicPioDeviceNode(state, 'uart',
self.pio_addr,
- 0x1000, [int(self.interrupt.num)])
+ 0x1000, [ self.interrupt ])
node.appendCompatible(["arm,pl011", "arm,primecell"])
# Hardcoded reference to the realview platform clocks, because the
@@ -409,7 +409,7 @@
def generateDeviceTree(self, state):
node = self.generateBasicPioDeviceNode(state, 'watchdog',
- self.pio_addr, 0x1000, [int(self.interrupt.num)])
+ self.pio_addr, 0x1000, [ self.interrupt ])
node.appendCompatible(['arm,sp805', 'arm,primecell'])
clocks = [state.phandle(self.clk_domain.unproxy(self))]
clock_names = ['wdogclk']
@@ -442,7 +442,7 @@
def generateDeviceTree(self, state):
node = self.generateBasicPioDeviceNode(state, 'rtc', self.pio_addr,
- 0x1000, [int(self.interrupt.num)])
+ 0x1000, [ self.interrupt ])
node.appendCompatible(["arm,pl031", "arm,primecell"])
clock = state.phandle(self.clk_domain.unproxy(self))
@@ -460,7 +460,7 @@
def generateDeviceTree(self, state):
node = self.generateBasicPioDeviceNode(state, 'kmi', self.pio_addr,
- 0x1000, [int(self.interrupt.num)])
+ 0x1000, [ self.interrupt ])
node.appendCompatible(["arm,pl050", "arm,primecell"])
clock = state.phandle(self.clk_domain.unproxy(self))
@@ -523,7 +523,7 @@
port_node.append(endpoint_node)
node = self.generateBasicPioDeviceNode(state, 'hdlcd',
- self.pio_addr, 0x1000, [ self.interrupt.num ])
+ self.pio_addr, 0x1000, [ self.interrupt ])
node.appendCompatible(["arm,hdlcd"])
node.append(FdtPropertyWords("clocks",
state.phandle(self.pxl_clk)))
diff --git a/src/dev/arm/VirtIOMMIO.py b/src/dev/arm/VirtIOMMIO.py
index 919755b..60aee16 100644
--- a/src/dev/arm/VirtIOMMIO.py
+++ b/src/dev/arm/VirtIOMMIO.py
@@ -54,8 +54,6 @@
def generateDeviceTree(self, state):
node = self.generateBasicPioDeviceNode(state, 'virtio',
self.pio_addr,
- int(self.pio_size), [
- int(self.interrupt.num),
- ])
+ int(self.pio_size), [ self.interrupt ])
node.appendCompatible(["virtio,mmio"])
yield node
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31941
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I16ed3b689158defe2a43cccfa053d48dec4a1e41
Gerrit-Change-Number: 31941
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
