diff options
author | Ali Saidi <Ali.Saidi@ARM.com> | 2011-08-19 15:08:09 -0500 |
---|---|---|
committer | Ali Saidi <Ali.Saidi@ARM.com> | 2011-08-19 15:08:09 -0500 |
commit | ba265abbfd70060cc61a3b4a53b4b1cfcb7a96fe (patch) | |
tree | 5cf148fb600af2da5440a442d10170666ae8bbc9 /tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini | |
parent | c9d5985b8221459e4737c637910dc08513b05660 (diff) | |
download | gem5-ba265abbfd70060cc61a3b4a53b4b1cfcb7a96fe.tar.xz |
ARM: Add some MP regressions and clean up the disk images and kernels a bit
Diffstat (limited to 'tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini')
-rw-r--r-- | tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini | 94 |
1 files changed, 66 insertions, 28 deletions
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini index c163a5ab4..f7597645c 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini @@ -7,19 +7,20 @@ time_sync_spin_threshold=100000000 [system] type=LinuxArmSystem -children=bridge cpu diskmem intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver +children=bridge cf0 cpu intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver boot_cpu_frequency=500 -boot_loader= -boot_loader_mem=Null -boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB slram=slram0,0x8000000,+0x8000000 mtdparts=slram0:- root=/dev/mtdblock0 -flags_addr=0 -gic_cpu_addr=0 +boot_loader=/chips/pd/randd/dist/binaries/boot.arm +boot_loader_mem=system.nvmem +boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1 +flags_addr=268435504 +gic_cpu_addr=520093952 init_param=0 -kernel=/chips/pd/randd/dist/binaries/vmlinux.arm +kernel=/chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=atomic -midr_regval=890236928 +memories=system.nvmem system.physmem +midr_regval=890224640 physmem=system.physmem readfile=tests/halt.sh symbolfile= @@ -35,7 +36,7 @@ work_item_id=-1 type=Bridge delay=50000 filter_ranges_a=0:18446744073709551615 -filter_ranges_b=0:134217727 +filter_ranges_b=0:268435455 nack_delay=4000 req_size_a=16 req_size_b=16 @@ -45,6 +46,26 @@ write_ack=false side_a=system.iobus.port[0] side_b=system.membus.port[0] +[system.cf0] +type=IdeDisk +children=image +delay=1000000 +driveID=master +image=system.cf0.image + +[system.cf0.image] +type=CowDiskImage +children=child +child=system.cf0.image.child +image_file= +read_only=false +table_size=65536 + +[system.cf0.image.child] +type=RawDiskImage +image_file=/chips/pd/randd/dist/disks/linux-arm-ael.img +read_only=true + [system.cpu] type=AtomicSimpleCPU children=dcache dtb icache interrupts itb tracer @@ -172,16 +193,6 @@ port=system.toL2Bus.port[3] [system.cpu.tracer] type=ExeTracer -[system.diskmem] -type=PhysicalMemory -file=/chips/pd/randd/dist/disks/ael-arm.ext2 -latency=30000 -latency_var=0 -null=false -range=134217728:268435455 -zero=false -port=system.membus.port[1] - [system.intrctrl] type=IntrControl sys=system @@ -198,7 +209,7 @@ port=system.bridge.side_a system.realview.uart.pio system.realview.realview_io.p [system.iocache] type=BaseCache -addr_range=0:134217727 +addr_range=0:268435455 assoc=8 block_size=64 forward_snoops=false @@ -226,7 +237,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.iobus.port[25] -mem_side=system.membus.port[6] +mem_side=system.membus.port[7] [system.l2c] type=BaseCache @@ -258,7 +269,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[7] +mem_side=system.membus.port[8] [system.membus] type=Bus @@ -270,10 +281,11 @@ header_cycles=1 use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.bridge.side_b system.diskmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.iocache.mem_side system.l2c.mem_side +port=system.bridge.side_b system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.iocache.mem_side system.l2c.mem_side [system.membus.badaddr_responder] type=IsaFake +fake_mem=false pio_addr=0 pio_latency=1000 pio_size=8 @@ -288,6 +300,16 @@ update_data=false warn_access=warn pio=system.membus.default +[system.nvmem] +type=PhysicalMemory +file= +latency=30000 +latency_var=0 +null=false +range=2147483648:2214592511 +zero=true +port=system.membus.port[1] + [system.physmem] type=PhysicalMemory file= @@ -300,8 +322,9 @@ port=system.membus.port[2] [system.realview] type=RealView -children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake mmc_fake realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake +children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake intrctrl=system.intrctrl +pci_cfg_base=0 system=system [system.realview.a9scu] @@ -364,12 +387,12 @@ SubsystemVendorID=0 VendorID=32902 config_latency=20000 ctrl_offset=2 -disks= +disks=system.cf0 io_shift=1 max_backoff_delay=10000000 min_backoff_delay=4000 -pci_bus=0 -pci_dev=0 +pci_bus=2 +pci_dev=7 pci_func=0 pio_latency=1000 platform=system.realview @@ -406,6 +429,7 @@ pio=system.iobus.port[9] [system.realview.flash_fake] type=IsaFake +fake_mem=true pio_addr=1073741824 pio_latency=1000 pio_size=536870912 @@ -492,6 +516,7 @@ pio=system.iobus.port[7] [system.realview.l2x0_fake] type=IsaFake +fake_mem=false pio_addr=520101888 pio_latency=1000 pio_size=4095 @@ -506,6 +531,18 @@ update_data=false warn_access= pio=system.membus.port[4] +[system.realview.local_cpu_timer] +type=CpuLocalTimer +clock=1000 +gic=system.realview.gic +int_num_timer=29 +int_num_watchdog=30 +pio_addr=520095232 +pio_latency=1000 +platform=system.realview +system=system +pio=system.membus.port[6] + [system.realview.mmc_fake] type=AmbaFake amba_id=0 @@ -522,7 +559,8 @@ idreg=0 pio_addr=268435456 pio_latency=1000 platform=system.realview -proc_id=201326592 +proc_id0=201326592 +proc_id1=201327138 system=system pio=system.iobus.port[2] |