From 71c6a68a2f363de3b50ec15151e5d78605666292 Mon Sep 17 00:00:00 2001 From: Nikos Nikoleris Date: Mon, 4 Jun 2018 17:50:46 +0100 Subject: [PATCH] dev-arm: Fix the address range for some I/O devices Previously, many devices were incorrecty configured to respond to an address range of size 0xfff. This changes fixes this and sets it to 0x1000. Change-Id: I4b027a27adf60ceae4859e287d7f34443b398752 Reviewed-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/11116 Reviewed-by: Jason Lowe-Power Maintainer: Andreas Sandberg --- src/dev/arm/amba_fake.cc | 2 +- src/dev/arm/kmi.cc | 2 +- src/dev/arm/pl011.cc | 2 +- src/dev/arm/rtc_pl031.cc | 2 +- src/dev/arm/timer_sp804.cc | 2 +- src/dev/i2c/bus.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dev/arm/amba_fake.cc b/src/dev/arm/amba_fake.cc index 3f8fcd6ee..475ff768a 100644 --- a/src/dev/arm/amba_fake.cc +++ b/src/dev/arm/amba_fake.cc @@ -48,7 +48,7 @@ #include "mem/packet_access.hh" AmbaFake::AmbaFake(const Params *p) - : AmbaPioDevice(p, 0xfff) + : AmbaPioDevice(p, 0x1000) { } diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc index 70c64e47b..8055afe2e 100644 --- a/src/dev/arm/kmi.cc +++ b/src/dev/arm/kmi.cc @@ -52,7 +52,7 @@ #include "mem/packet_access.hh" Pl050::Pl050(const Pl050Params *p) - : AmbaIntDevice(p, 0xfff), control(0), status(0x43), clkdiv(0), + : AmbaIntDevice(p, 0x1000), control(0), status(0x43), clkdiv(0), rawInterrupts(0), ps2(p->ps2) { diff --git a/src/dev/arm/pl011.cc b/src/dev/arm/pl011.cc index b6b41f9c3..e47cc6753 100644 --- a/src/dev/arm/pl011.cc +++ b/src/dev/arm/pl011.cc @@ -54,7 +54,7 @@ #include "sim/sim_exit.hh" Pl011::Pl011(const Pl011Params *p) - : Uart(p, 0xfff), + : Uart(p, 0x1000), intEvent([this]{ generateInterrupt(); }, name()), control(0x300), fbrd(0), ibrd(0), lcrh(0), ifls(0x12), imsc(0), rawInt(0), diff --git a/src/dev/arm/rtc_pl031.cc b/src/dev/arm/rtc_pl031.cc index 3d8e677b9..5b6ce5288 100644 --- a/src/dev/arm/rtc_pl031.cc +++ b/src/dev/arm/rtc_pl031.cc @@ -49,7 +49,7 @@ #include "mem/packet_access.hh" PL031::PL031(Params *p) - : AmbaIntDevice(p, 0xfff), timeVal(mkutctime(&p->time)), + : AmbaIntDevice(p, 0x1000), timeVal(mkutctime(&p->time)), lastWrittenTick(0), loadVal(0), matchVal(0), rawInt(false), maskInt(false), pendingInt(false), matchEvent([this]{ counterMatch(); }, name()) diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc index 86fbc7f05..f28ba7bf0 100644 --- a/src/dev/arm/timer_sp804.cc +++ b/src/dev/arm/timer_sp804.cc @@ -48,7 +48,7 @@ #include "mem/packet_access.hh" Sp804::Sp804(Params *p) - : AmbaPioDevice(p, 0xfff), gic(p->gic), + : AmbaPioDevice(p, 0x1000), gic(p->gic), timer0(name() + ".timer0", this, p->int_num0, p->clock0), timer1(name() + ".timer1", this, p->int_num1, p->clock1) { diff --git a/src/dev/i2c/bus.cc b/src/dev/i2c/bus.cc index af5d6c825..bf8cb8701 100644 --- a/src/dev/i2c/bus.cc +++ b/src/dev/i2c/bus.cc @@ -53,7 +53,7 @@ using std::map; * http://infocenter.arm.com/help/topic/com.arm.doc.dui0440b/Bbajihec.html */ I2CBus::I2CBus(const I2CBusParams *p) - : BasicPioDevice(p, 0xfff), scl(1), sda(1), state(IDLE), currBit(7), + : BasicPioDevice(p, 0x1000), scl(1), sda(1), state(IDLE), currBit(7), i2cAddr(0x00), message(0x00) { vector devs = p->devices; -- 2.30.2