Giacomo Travaglini has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/31936 )
Change subject: dev-arm: Make AmbaInt/DmaDevice use the ArmInterruptPin
......................................................................
dev-arm: Make AmbaInt/DmaDevice use the ArmInterruptPin
Change-Id: I7318b9186cd81f948211e8a955dab7eea6d2a2f5
Signed-off-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
---
M src/dev/arm/RealView.py
M src/dev/arm/amba_device.cc
M src/dev/arm/amba_device.hh
M src/dev/arm/hdlcd.cc
M src/dev/arm/kmi.cc
M src/dev/arm/pl111.cc
M src/dev/arm/rtc_pl031.cc
M src/dev/arm/watchdog_sp805.cc
8 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index b0e8a8e..b3d7305 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -85,8 +85,7 @@
type = 'AmbaIntDevice'
abstract = True
cxx_header = "dev/arm/amba_device.hh"
- gic = Param.BaseGic(Parent.any, "Gic to use for interrupting")
- int_num = Param.UInt32("Interrupt number that connects to GIC")
+ interrupt = Param.ArmInterruptPin("Interrupt that connects to GIC")
int_delay = Param.Latency("100ns",
"Time between action and interrupt generation by device")
@@ -96,8 +95,7 @@
cxx_header = "dev/arm/amba_device.hh"
pio_addr = Param.Addr("Address for AMBA slave interface")
pio_latency = Param.Latency("10ns", "Time between action and
write/read result by AMBA DMA Device")
- gic = Param.BaseGic(Parent.any, "Gic to use for interrupting")
- int_num = Param.UInt32("Interrupt number that connects to GIC")
+ interrupt = Param.ArmInterruptPin("Interrupt that connects to GIC")
amba_id = Param.UInt32("ID of AMBA device for kernel detection")
class A9SCU(BasicPioDevice):
@@ -412,7 +410,7 @@
def generateDeviceTree(self, state):
node = self.generateBasicPioDeviceNode(state, 'watchdog',
- self.pio_addr, 0x1000, [int(self.int_num)])
+ self.pio_addr, 0x1000, [int(self.interrupt.num)])
node.appendCompatible(['arm,sp805', 'arm,primecell'])
clocks = [state.phandle(self.clk_domain.unproxy(self))]
clock_names = ['wdogclk']
@@ -445,7 +443,7 @@
def generateDeviceTree(self, state):
node = self.generateBasicPioDeviceNode(state, 'rtc', self.pio_addr,
- 0x1000, [int(self.int_num)])
+ 0x1000, [int(self.interrupt.num)])
node.appendCompatible(["arm,pl031", "arm,primecell"])
clock = state.phandle(self.clk_domain.unproxy(self))
@@ -463,7 +461,7 @@
def generateDeviceTree(self, state):
node = self.generateBasicPioDeviceNode(state, 'kmi', self.pio_addr,
- 0x1000, [int(self.int_num)])
+ 0x1000, [int(self.interrupt.num)])
node.appendCompatible(["arm,pl050", "arm,primecell"])
clock = state.phandle(self.clk_domain.unproxy(self))
@@ -679,7 +677,7 @@
pio_addr=0x2C080000)
hdlcd = HDLcd(pxl_clk=dcc.osc_pxl,
- pio_addr=0x2b000000, int_num=117,
+ pio_addr=0x2b000000, interrupt=ArmSPI(num=117),
workaround_swap_rb=True)
def _on_chip_devices(self):
@@ -712,9 +710,11 @@
timer0 = Sp804(int_num0=34, int_num1=34, pio_addr=0x1C110000,
clock0='1MHz', clock1='1MHz')
timer1 = Sp804(int_num0=35, int_num1=35, pio_addr=0x1C120000,
clock0='1MHz', clock1='1MHz')
- clcd = Pl111(pio_addr=0x1c1f0000, int_num=46)
- kmi0 = Pl050(pio_addr=0x1c060000, int_num=44, ps2=PS2Keyboard())
- kmi1 = Pl050(pio_addr=0x1c070000, int_num=45, ps2=PS2TouchKit())
+ clcd = Pl111(pio_addr=0x1c1f0000, interrupt=ArmSPI(num=46))
+ kmi0 = Pl050(pio_addr=0x1c060000, interrupt=ArmSPI(num=44),
+ ps2=PS2Keyboard())
+ kmi1 = Pl050(pio_addr=0x1c070000, interrupt=ArmSPI(num=45),
+ ps2=PS2TouchKit())
cf_ctrl = IdeController(disks=[], pci_func=0, pci_dev=0, pci_bus=2,
io_shift = 2, ctrl_offset = 2, Command = 0x1,
BAR0 = 0x1C1A0000, BAR0Size = '256B',
@@ -725,7 +725,7 @@
conf_table_reported = False)
vram = SimpleMemory(range = AddrRange(0x18000000,
size='32MB'),
conf_table_reported = False)
- rtc = PL031(pio_addr=0x1C170000, int_num=36)
+ rtc = PL031(pio_addr=0x1C170000, interrupt=ArmSPI(num=36))
l2x0_fake = IsaFake(pio_addr=0x2C100000, pio_size=0xfff)
uart1_fake = AmbaFake(pio_addr=0x1C0A0000)
@@ -971,7 +971,7 @@
### On-chip devices ###
# Trusted Watchdog, SP805
- trusted_watchdog = Sp805(pio_addr=0x2a490000, int_num=56)
+ trusted_watchdog = Sp805(pio_addr=0x2a490000, interrupt=ArmSPI(num=56))
sys_counter = SystemCounter()
generic_timer = GenericTimer(int_phys_s=ArmPPI(num=29),
@@ -988,7 +988,7 @@
int_phys=ArmSPI(num=58), int_virt=ArmSPI(num=134))
])
- system_watchdog = Sp805(pio_addr=0x2b060000, int_num=130)
+ system_watchdog = Sp805(pio_addr=0x2b060000, interrupt=ArmSPI(num=130))
def _on_chip_devices(self):
return [
@@ -1021,12 +1021,14 @@
interrupt=ArmSPI(num=40), device=Terminal())
]
- kmi0 = Pl050(pio_addr=0x1c060000, int_num=44, ps2=PS2Keyboard())
- kmi1 = Pl050(pio_addr=0x1c070000, int_num=45, ps2=PS2TouchKit())
+ kmi0 = Pl050(pio_addr=0x1c060000, interrupt=ArmSPI(num=44),
+ ps2=PS2Keyboard())
+ kmi1 = Pl050(pio_addr=0x1c070000, interrupt=ArmSPI(num=45),
+ ps2=PS2TouchKit())
- watchdog = Sp805(pio_addr=0x1c0f0000, int_num=32)
+ watchdog = Sp805(pio_addr=0x1c0f0000, interrupt=ArmSPI(num=32))
- rtc = PL031(pio_addr=0x1c170000, int_num=36)
+ rtc = PL031(pio_addr=0x1C170000, interrupt=ArmSPI(num=36))
### gem5-specific off-chip devices ###
pci_host = GenericArmPciHost(
@@ -1177,7 +1179,7 @@
class VExpress_GEM5_V1(VExpress_GEM5_V1_Base):
hdlcd = HDLcd(pxl_clk=VExpress_GEM5_V1_Base.dcc.osc_pxl,
- pio_addr=0x2b000000, int_num=95)
+ pio_addr=0x2b000000, interrupt=ArmSPI(num=95))
def _on_chip_devices(self):
return super(VExpress_GEM5_V1,self)._on_chip_devices() + [
@@ -1205,7 +1207,7 @@
class VExpress_GEM5_V2(VExpress_GEM5_V2_Base):
hdlcd = HDLcd(pxl_clk=VExpress_GEM5_V2_Base.dcc.osc_pxl,
- pio_addr=0x2b000000, int_num=95)
+ pio_addr=0x2b000000, interrupt=ArmSPI(num=95))
def _on_chip_devices(self):
return super(VExpress_GEM5_V2,self)._on_chip_devices() + [
diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc
index 31a21b7..2ab2743 100644
--- a/src/dev/arm/amba_device.cc
+++ b/src/dev/arm/amba_device.cc
@@ -55,7 +55,7 @@
AmbaIntDevice::AmbaIntDevice(const Params *p, Addr pio_size)
: AmbaPioDevice(p, pio_size),
- intNum(p->int_num), gic(p->gic), intDelay(p->int_delay)
+ interrupt(p->interrupt->get()), intDelay(p->int_delay)
{
}
@@ -64,7 +64,7 @@
AmbaDmaDevice::AmbaDmaDevice(const Params *p, Addr pio_size)
: DmaDevice(p), ambaId(AmbaVendor | p->amba_id),
pioAddr(p->pio_addr), pioSize(pio_size),
- pioDelay(p->pio_latency),intNum(p->int_num), gic(p->gic)
+ pioDelay(p->pio_latency), interrupt(p->interrupt->get())
{
}
diff --git a/src/dev/arm/amba_device.hh b/src/dev/arm/amba_device.hh
index fb6eff7..3d7e30c 100644
--- a/src/dev/arm/amba_device.hh
+++ b/src/dev/arm/amba_device.hh
@@ -86,8 +86,7 @@
class AmbaIntDevice : public AmbaPioDevice
{
protected:
- int intNum;
- BaseGic *gic;
+ ArmInterruptPin* const interrupt;
Tick intDelay;
public:
@@ -102,8 +101,7 @@
Addr pioAddr;
Addr pioSize;
Tick pioDelay;
- int intNum;
- BaseGic *gic;
+ ArmInterruptPin* const interrupt;
public:
typedef AmbaDmaDeviceParams Params;
diff --git a/src/dev/arm/hdlcd.cc b/src/dev/arm/hdlcd.cc
index 9b0d6da..3478449 100644
--- a/src/dev/arm/hdlcd.cc
+++ b/src/dev/arm/hdlcd.cc
@@ -592,9 +592,9 @@
int_rawstat = ints;
if (!old_ints && intStatus()) {
- gic->sendInt(intNum);
+ interrupt->raise();
} else if (old_ints && !intStatus()) {
- gic->clearInt(intNum);
+ interrupt->clear();
}
}
diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc
index 732398e..9d991c3 100644
--- a/src/dev/arm/kmi.cc
+++ b/src/dev/arm/kmi.cc
@@ -183,11 +183,11 @@
if (!old_pending && new_pending) {
DPRINTF(Pl050, "Generate interrupt: rawInt=%#x ctrl=%#x int=%#x\n",
rawInterrupts, control, getInterrupt());
- gic->sendInt(intNum);
+ interrupt->raise();
} else if (old_pending && !new_pending) {
DPRINTF(Pl050, "Clear interrupt: rawInt=%#x ctrl=%#x int=%#x\n",
rawInterrupts, control, getInterrupt());
- gic->clearInt(intNum);
+ interrupt->clear();
}
}
diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc
index 3666669..f2b8e50 100644
--- a/src/dev/arm/pl111.cc
+++ b/src/dev/arm/pl111.cc
@@ -303,7 +303,7 @@
lcdMis = lcdImsc & lcdRis;
if (!lcdMis)
- gic->clearInt(intNum);
+ interrupt->clear();
break;
case LcdRis:
@@ -317,7 +317,7 @@
lcdMis = lcdImsc & lcdRis;
if (!lcdMis)
- gic->clearInt(intNum);
+ interrupt->clear();
break;
case LcdUpCurr:
@@ -759,7 +759,7 @@
lcdMis = lcdImsc & lcdRis;
if (lcdMis.underflow || lcdMis.baseaddr || lcdMis.vcomp ||
lcdMis.ahbmaster) {
- gic->sendInt(intNum);
+ interrupt->raise();
DPRINTF(PL111, " -- Generated\n");
}
}
diff --git a/src/dev/arm/rtc_pl031.cc b/src/dev/arm/rtc_pl031.cc
index e09ddbe..713d3f7 100644
--- a/src/dev/arm/rtc_pl031.cc
+++ b/src/dev/arm/rtc_pl031.cc
@@ -187,7 +187,7 @@
pendingInt = maskInt & rawInt;
if (pendingInt && !old_pending) {
DPRINTF(Timer, "-- Causing interrupt\n");
- gic->sendInt(intNum);
+ interrupt->raise();
}
}
diff --git a/src/dev/arm/watchdog_sp805.cc b/src/dev/arm/watchdog_sp805.cc
index 2a07d51..bed6258 100644
--- a/src/dev/arm/watchdog_sp805.cc
+++ b/src/dev/arm/watchdog_sp805.cc
@@ -215,7 +215,7 @@
warn("Watchdog timed out, system reset asserted\n");
} else {
intRaised = true;
- gic->sendInt(intNum);
+ interrupt->raise();
}
}
@@ -223,7 +223,7 @@
Sp805::clearInt()
{
intRaised = false;
- gic->clearInt(intNum);
+ interrupt->clear();
}
void
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31936
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: I7318b9186cd81f948211e8a955dab7eea6d2a2f5
Gerrit-Change-Number: 31936
Gerrit-PatchSet: 1
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
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
