From 927bba9d605238ee3fde21ac5913c8ed5ab9fba8 Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Fri, 9 Mar 2012 09:59:29 -0500
Subject: ARM: Update stats for valgrind fix and replace config.inis which are
 out of date.

---
 .../ref/arm/linux/realview-o3/config.ini           | 144 +++++++++++----------
 1 file changed, 75 insertions(+), 69 deletions(-)

(limited to 'tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini')

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
index 2ad88f280..5275111e5 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
@@ -8,18 +8,19 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
-boot_loader=/dist/m5/system/binaries/boot.arm
-boot_loader_mem=system.nvmem
+children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+atags_addr=256
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
+boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=timing
-memories=system.nvmem system.physmem
+memories=system.physmem system.realview.nvmem
 midr_regval=890224640
 num_work_ids=16
 physmem=system.physmem
@@ -32,18 +33,18 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=system.membus.port[7]
+system_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
 delay=50000
 nack_delay=4000
-ranges=268435456:520093695 1073741824:18446744073709551615
+ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
 write_ack=false
-master=system.iobus.port[0]
-slave=system.membus.port[0]
+master=system.iobus.slave[0]
+slave=system.membus.master[0]
 
 [system.cf0]
 type=IdeDisk
@@ -62,7 +63,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu]
@@ -164,7 +165,7 @@ icache_port=system.cpu.icache.cpu_side
 
 [system.cpu.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -185,7 +186,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
-mem_side=system.toL2Bus.port[2]
+mem_side=system.toL2Bus.slave[1]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -198,7 +199,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[4]
+port=system.toL2Bus.slave[3]
 
 [system.cpu.fuPool]
 type=FUPool
@@ -465,7 +466,7 @@ opLat=3
 
 [system.cpu.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -486,7 +487,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
-mem_side=system.toL2Bus.port[1]
+mem_side=system.toL2Bus.slave[0]
 
 [system.cpu.interrupts]
 type=ArmInterrupts
@@ -502,7 +503,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[3]
+port=system.toL2Bus.slave[2]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -519,11 +520,12 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.bridge.master system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.clcd.dma system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side
+master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side
+slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
-addr_range=0:268435455
+addr_ranges=0:268435455
 assoc=8
 block_size=64
 forward_snoops=false
@@ -543,12 +545,12 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[28]
-mem_side=system.membus.port[8]
+cpu_side=system.iobus.master[25]
+mem_side=system.membus.slave[1]
 
 [system.l2c]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
 forward_snoops=true
@@ -568,8 +570,8 @@ tgts_per_mshr=16
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[9]
+cpu_side=system.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
 
 [system.membus]
 type=Bus
@@ -581,7 +583,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-port=system.bridge.slave 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.system_port system.iocache.mem_side system.l2c.mem_side
+master=system.bridge.slave system.realview.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
+slave=system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -599,16 +602,6 @@ 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=
@@ -616,13 +609,15 @@ latency=30000
 latency_var=0
 null=false
 range=0:134217727
-zero=true
-port=system.membus.port[2]
+zero=false
+port=system.membus.master[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 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
+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 nvmem 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
+max_mem_size=268435456
+mem_start_addr=0
 pci_cfg_base=0
 system=system
 
@@ -631,7 +626,7 @@ type=A9SCU
 pio_addr=520093696
 pio_latency=1000
 system=system
-pio=system.membus.port[5]
+pio=system.membus.master[5]
 
 [system.realview.aaci_fake]
 type=AmbaFake
@@ -640,7 +635,7 @@ ignore_access=false
 pio_addr=268451840
 pio_latency=1000
 system=system
-pio=system.iobus.port[24]
+pio=system.iobus.master[21]
 
 [system.realview.cf_ctrl]
 type=IdeController
@@ -694,9 +689,9 @@ pci_func=0
 pio_latency=1000
 platform=system.realview
 system=system
-config=system.iobus.port[10]
-dma=system.iobus.port[11]
-pio=system.iobus.port[9]
+config=system.iobus.master[8]
+dma=system.iobus.slave[2]
+pio=system.iobus.master[7]
 
 [system.realview.clcd]
 type=Pl111
@@ -710,8 +705,8 @@ pio_addr=268566528
 pio_latency=10000
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[6]
-pio=system.iobus.port[5]
+dma=system.iobus.slave[1]
+pio=system.iobus.master[4]
 
 [system.realview.dmac_fake]
 type=AmbaFake
@@ -720,7 +715,7 @@ ignore_access=false
 pio_addr=268632064
 pio_latency=1000
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -736,7 +731,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[27]
+pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
@@ -748,7 +743,7 @@ int_latency=10000
 it_lines=128
 platform=system.realview
 system=system
-pio=system.membus.port[3]
+pio=system.membus.master[3]
 
 [system.realview.gpio0_fake]
 type=AmbaFake
@@ -757,7 +752,7 @@ ignore_access=false
 pio_addr=268513280
 pio_latency=1000
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.master[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -766,7 +761,7 @@ ignore_access=false
 pio_addr=268517376
 pio_latency=1000
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.master[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -775,7 +770,7 @@ ignore_access=false
 pio_addr=268521472
 pio_latency=1000
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.master[18]
 
 [system.realview.kmi0]
 type=Pl050
@@ -788,7 +783,7 @@ pio_addr=268460032
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[7]
+pio=system.iobus.master[5]
 
 [system.realview.kmi1]
 type=Pl050
@@ -801,7 +796,7 @@ pio_addr=268464128
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[8]
+pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -817,7 +812,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.port[4]
+pio=system.membus.master[4]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
@@ -828,7 +823,7 @@ int_num_watchdog=30
 pio_addr=520095232
 pio_latency=1000
 system=system
-pio=system.membus.port[6]
+pio=system.membus.master[6]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -837,7 +832,17 @@ ignore_access=false
 pio_addr=268455936
 pio_latency=1000
 system=system
-pio=system.iobus.port[25]
+pio=system.iobus.master[22]
+
+[system.realview.nvmem]
+type=PhysicalMemory
+file=
+latency=30000
+latency_var=0
+null=false
+range=2147483648:2214592511
+zero=true
+port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -847,7 +852,7 @@ pio_latency=1000
 proc_id0=201326592
 proc_id1=201327138
 system=system
-pio=system.iobus.port[2]
+pio=system.iobus.master[1]
 
 [system.realview.rtc_fake]
 type=AmbaFake
@@ -856,7 +861,7 @@ ignore_access=false
 pio_addr=268529664
 pio_latency=1000
 system=system
-pio=system.iobus.port[26]
+pio=system.iobus.master[23]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -865,7 +870,7 @@ ignore_access=false
 pio_addr=268492800
 pio_latency=1000
 system=system
-pio=system.iobus.port[23]
+pio=system.iobus.master[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -874,7 +879,7 @@ ignore_access=false
 pio_addr=269357056
 pio_latency=1000
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.master[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -883,7 +888,7 @@ ignore_access=true
 pio_addr=268439552
 pio_latency=1000
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.master[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -892,7 +897,7 @@ ignore_access=false
 pio_addr=268488704
 pio_latency=1000
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.master[19]
 
 [system.realview.timer0]
 type=Sp804
@@ -905,7 +910,7 @@ int_num1=36
 pio_addr=268505088
 pio_latency=1000
 system=system
-pio=system.iobus.port[3]
+pio=system.iobus.master[2]
 
 [system.realview.timer1]
 type=Sp804
@@ -918,7 +923,7 @@ int_num1=37
 pio_addr=268509184
 pio_latency=1000
 system=system
-pio=system.iobus.port[4]
+pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
@@ -931,7 +936,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 terminal=system.terminal
-pio=system.iobus.port[1]
+pio=system.iobus.master[0]
 
 [system.realview.uart1_fake]
 type=AmbaFake
@@ -940,7 +945,7 @@ ignore_access=false
 pio_addr=268476416
 pio_latency=1000
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.master[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -949,7 +954,7 @@ ignore_access=false
 pio_addr=268480512
 pio_latency=1000
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.master[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -958,7 +963,7 @@ ignore_access=false
 pio_addr=268484608
 pio_latency=1000
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.master[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -967,7 +972,7 @@ ignore_access=false
 pio_addr=268500992
 pio_latency=1000
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
@@ -984,7 +989,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
+master=system.l2c.cpu_side
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.vncserver]
 type=VncServer
-- 
cgit v1.2.3