sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: Add support for Versatile Express boards

Browse source
This commit is contained in:
Ali Saidi 2011-08-19 15:08:08 -05:00
parent 23755eb434
commit d2a0a2ec22
6 changed files with 99 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/common/FSConfig.py
View file

@ -210,6 +210,8 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
self.realview = RealViewPBX()
elif machine_type == "RealView_EB":
self.realview = RealViewEB()
elif machine_type == "VersatileExpress":
self.realview = VExpress()
else:
print "Unknown Machine Type"
sys.exit(1)

3
src/arch/arm/ArmSystem.py
View file

@ -41,7 +41,8 @@ from System import System
class ArmMachineType(Enum):
map = {'RealView_EB' : 827,
'RealView_PBX' : 1901 }
'RealView_PBX' : 1901,
'VersatileExpress' : 2272}
class ArmSystem(System):
type = 'ArmSystem'

81
src/dev/arm/RealView.py
View file

@ -75,7 +75,8 @@ class A9SCU(BasicPioDevice):
class RealViewCtrl(BasicPioDevice):
type = 'RealViewCtrl'
proc_id = Param.UInt32(0x0C000000, "Processor ID, SYS_PROCID")
proc_id0 = Param.UInt32(0x0C000000, "Processor ID, SYS_PROCID")
proc_id1 = Param.UInt32(0x0C000222, "Processor ID, SYS_PROCID1")
idreg = Param.UInt32(0x00000000, "ID Register, SYS_ID")
class Gic(PioDevice):
@ -278,3 +279,81 @@ class RealViewEB(RealView):
self.flash_fake.pio = bus.port
self.smcreg_fake.pio = bus.port
class VExpress(RealView):
elba_uart = Pl011(pio_addr=0xE0009000, int_num=42)
uart = Pl011(pio_addr=0xFF009000, int_num=121)
realview_io = RealViewCtrl(proc_id0=0x0C000222, pio_addr=0xFF000000)
gic = Gic(dist_addr=0xE0201000, cpu_addr=0xE0200100)
local_cpu_timer = CpuLocalTimer(int_num_timer=29, int_num_watchdog=30, pio_addr=0xE0200600)
v2m_timer0 = Sp804(int_num0=120, int_num1=120, pio_addr=0xFF011000)
v2m_timer1 = Sp804(int_num0=121, int_num1=121, pio_addr=0xFF012000)
elba_timer0 = Sp804(int_num0=36, int_num1=36, pio_addr=0xE0011000, clock0='50MHz', clock1='50MHz')
elba_timer1 = Sp804(int_num0=37, int_num1=37, pio_addr=0xE0012000, clock0='50MHz', clock1='50MHz')
clcd = Pl111(pio_addr=0xE0022000, int_num=46) # CLCD interrupt no. unknown
kmi0 = Pl050(pio_addr=0xFF006000, int_num=124)
kmi1 = Pl050(pio_addr=0xFF007000, int_num=125)
elba_kmi0 = Pl050(pio_addr=0xE0006000, int_num=52)
elba_kmi1 = Pl050(pio_addr=0xE0007000, int_num=53)
a9scu = A9SCU(pio_addr=0xE0200000)
cf_ctrl = IdeController(disks=[], pci_func=0, pci_dev=0, pci_bus=0,
io_shift = 2, ctrl_offset = 2, Command = 0x1,
BAR0 = 0xFF01A000, BAR0Size = '256B',
BAR1 = 0xFF01A100, BAR1Size = '4096B',
BAR0LegacyIO = True, BAR1LegacyIO = True)
l2x0_fake = IsaFake(pio_addr=0xE0202000, pio_size=0xfff)
dmac_fake = AmbaFake(pio_addr=0xE0020000)
uart1_fake = AmbaFake(pio_addr=0xE000A000)
uart2_fake = AmbaFake(pio_addr=0xE000B000)
uart3_fake = AmbaFake(pio_addr=0xE000C000)
smc_fake = AmbaFake(pio_addr=0xEC000000)
sp810_fake = AmbaFake(pio_addr=0xFF001000, ignore_access=True)
watchdog_fake = AmbaFake(pio_addr=0xE0010000)
aaci_fake = AmbaFake(pio_addr=0xFF004000)
elba_aaci_fake = AmbaFake(pio_addr=0xE0004000)
mmc_fake = AmbaFake(pio_addr=0xE0005000) # not sure if we need this
rtc_fake = AmbaFake(pio_addr=0xE0017000, amba_id=0x41031)
spsc_fake = IsaFake(pio_addr=0xE001B000, pio_size=0x2000)
lan_fake = IsaFake(pio_addr=0xFA000000, pio_size=0xffff)
usb_fake = IsaFake(pio_addr=0xFB000000, pio_size=0x1ffff)
# Attach I/O devices that are on chip
def attachOnChipIO(self, bus):
self.gic.pio = bus.port
self.a9scu.pio = bus.port
# Attach I/O devices to specified bus object. Can't do this
# earlier, since the bus object itself is typically defined at the
# System level.
def attachIO(self, bus):
self.elba_uart.pio = bus.port
self.uart.pio = bus.port
self.realview_io.pio = bus.port
self.local_cpu_timer.pio = bus.port
self.v2m_timer0.pio = bus.port
self.v2m_timer1.pio = bus.port
self.elba_timer0.pio = bus.port
self.elba_timer1.pio = bus.port
self.clcd.pio = bus.port
self.kmi0.pio = bus.port
self.kmi1.pio = bus.port
self.elba_kmi0.pio = bus.port
self.elba_kmi1.pio = bus.port
self.cf_ctrl.pio = bus.port
self.l2x0_fake.pio = bus.port
self.dmac_fake.pio = bus.port
self.uart1_fake.pio = bus.port
self.uart2_fake.pio = bus.port
self.uart3_fake.pio = bus.port
self.smc_fake.pio = bus.port
self.sp810_fake.pio = bus.port
self.watchdog_fake.pio = bus.port
self.aaci_fake.pio = bus.port
self.elba_aaci_fake.pio = bus.port
self.mmc_fake.pio = bus.port
self.rtc_fake.pio = bus.port
self.spsc_fake.pio = bus.port
self.lan_fake.pio = bus.port
self.usb_fake.pio = bus.port

10
src/dev/arm/rv_ctrl.cc
View file

@ -57,8 +57,11 @@ RealViewCtrl::read(PacketPtr pkt)
pkt->allocate();
switch(daddr) {
case ProcId:
pkt->set(params()->proc_id);
case ProcId0:
pkt->set(params()->proc_id0);
break;
case ProcId1:
pkt->set(params()->proc_id1);
break;
case Clock24:
Tick clk;
@ -131,6 +134,9 @@ RealViewCtrl::write(PacketPtr pkt)
case Flags:
flags = pkt->get<uint32_t>();
break;
case FlagsClr:
flags = 0;
break;
default:
warn("Tried to write RVIO at offset %#x that doesn't exist\n",
daddr);

6
src/dev/arm/rv_ctrl.hh
View file

@ -79,7 +79,11 @@ class RealViewCtrl : public BasicPioDevice
Clock24 = 0x5C,
Misc = 0x60,
IoSel = 0x70,
ProcId = 0x84,
ProcId0 = 0x84,
ProcId1 = 0x88,
CfgCtrl = 0xA0,
CfgData = 0xA4,
CfgStat = 0xA8,
TestOsc0 = 0xC0,
TestOsc1 = 0xC4,
TestOsc2 = 0xC8,

5
src/dev/arm/timer_sp804.cc
View file

@ -85,8 +85,6 @@ Sp804::read(PacketPtr pkt)
void
Sp804::Timer::read(PacketPtr pkt, Addr daddr)
{
DPRINTF(Timer, "Reading from Timer at offset: %#x\n", daddr);
switch(daddr) {
case LoadReg:
pkt->set<uint32_t>(loadValue);
@ -116,6 +114,7 @@ Sp804::Timer::read(PacketPtr pkt, Addr daddr)
panic("Tried to read SP804 timer at offset %#x\n", daddr);
break;
}
DPRINTF(Timer, "Reading %#x from Timer at offset: %#x\n", pkt->get<uint32_t>(), daddr);
}
Tick
@ -140,7 +139,7 @@ Sp804::write(PacketPtr pkt)
void
Sp804::Timer::write(PacketPtr pkt, Addr daddr)
{
DPRINTF(Timer, "Writing to Timer at offset: %#x\n", daddr);
DPRINTF(Timer, "Writing %#x to Timer at offset: %#x\n", pkt->get<uint32_t>(), daddr);
switch (daddr) {
case LoadReg:
loadValue = pkt->get<uint32_t>();