1 files changed, 33 insertions, 23 deletions
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 39155f2aa..c0b6f00cc 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
@@ -36,7 +36,7 @@ load_addr_mask=268435455
 load_offset=2147483648
 machine_type=VExpress_EMM
 mem_mode=timing
-mem_ranges=2147483648:2415919103
+mem_ranges=2147483648:2415919103:0:0:0:0
 memories=system.physmem system.realview.nvmem system.realview.vram
 mmap_using_noreserve=false
 multi_proc=true
@@ -73,7 +73,7 @@ p_state_clk_gate_bins=20
 p_state_clk_gate_max=1000000000000
 p_state_clk_gate_min=1000
 power_model=Null
-ranges=788529152:805306367 721420288:725614591 805306368:1073741823 1073741824:1610612735 402653184:469762047 469762048:536870911
+ranges=788529152:805306367:0:0:0:0 721420288:725614591:0:0:0:0 805306368:1073741823:0:0:0:0 1073741824:1610612735:0:0:0:0 402653184:469762047:0:0:0:0 469762048:536870911:0:0:0:0
 req_size=16
 resp_size=16
 master=system.iobus.slave[0]
@@ -229,7 +229,7 @@ useIndirect=true
 [system.cpu.dcache]
 type=Cache
 children=tags
-addr_ranges=0:18446744073709551615
+addr_ranges=0:18446744073709551615:0:0:0:0
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
@@ -591,7 +591,7 @@ pipelined=true
 [system.cpu.icache]
 type=Cache
 children=tags
-addr_ranges=0:18446744073709551615
+addr_ranges=0:18446744073709551615:0:0:0:0
 assoc=1
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
@@ -723,7 +723,7 @@ port=system.cpu.toL2Bus.slave[2]
 [system.cpu.l2cache]
 type=Cache
 children=tags
-addr_ranges=0:18446744073709551615
+addr_ranges=0:18446744073709551615:0:0:0:0
 assoc=8
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
@@ -840,7 +840,7 @@ slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 [system.iocache]
 type=Cache
 children=tags
-addr_ranges=2147483648:2415919103
+addr_ranges=2147483648:2415919103:0:0:0:0
 assoc=8
 clk_domain=system.clk_domain
 clusivity=mostly_incl
@@ -885,7 +885,7 @@ size=1024
 
 [system.membus]
 type=CoherentXBar
-children=badaddr_responder
+children=badaddr_responder snoop_filter
 clk_domain=system.clk_domain
 default_p_state=UNDEFINED
 eventq_index=0
@@ -897,7 +897,7 @@ p_state_clk_gate_min=1000
 point_of_coherency=true
 power_model=Null
 response_latency=2
-snoop_filter=Null
+snoop_filter=system.membus.snoop_filter
 snoop_response_latency=4
 system=system
 use_default_range=false
@@ -929,29 +929,36 @@ update_data=false
 warn_access=warn
 pio=system.membus.default
 
+[system.membus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=1
+max_capacity=8388608
+system=system
+
 [system.physmem]
 type=DRAMCtrl
-IDD0=0.075000
+IDD0=0.055000
 IDD02=0.000000
-IDD2N=0.050000
+IDD2N=0.032000
 IDD2N2=0.000000
 IDD2P0=0.000000
 IDD2P02=0.000000
-IDD2P1=0.000000
+IDD2P1=0.032000
 IDD2P12=0.000000
-IDD3N=0.057000
+IDD3N=0.038000
 IDD3N2=0.000000
 IDD3P0=0.000000
 IDD3P02=0.000000
-IDD3P1=0.000000
+IDD3P1=0.038000
 IDD3P12=0.000000
-IDD4R=0.187000
+IDD4R=0.157000
 IDD4R2=0.000000
-IDD4W=0.165000
+IDD4W=0.125000
 IDD4W2=0.000000
-IDD5=0.220000
+IDD5=0.235000
 IDD52=0.000000
-IDD6=0.000000
+IDD6=0.020000
 IDD62=0.000000
 VDD=1.500000
 VDD2=0.000000
@@ -971,6 +978,7 @@ devices_per_rank=8
 dll=true
 eventq_index=0
 in_addr_map=true
+kvm_map=true
 max_accesses_per_row=16
 mem_sched_policy=frfcfs
 min_writes_per_switch=16
@@ -980,7 +988,7 @@ p_state_clk_gate_max=1000000000000
 p_state_clk_gate_min=1000
 page_policy=open_adaptive
 power_model=Null
-range=2147483648:2415919103
+range=2147483648:2415919103:0:0:0:0
 ranks_per_channel=2
 read_buffer_size=32
 static_backend_latency=10000
@@ -1002,9 +1010,9 @@ tRTW=2500
 tWR=15000
 tWTR=7500
 tXAW=30000
-tXP=0
+tXP=6000
 tXPDLL=0
-tXS=0
+tXS=270000
 tXSDLL=0
 write_buffer_size=64
 write_high_thresh_perc=85
@@ -1357,7 +1365,7 @@ default_p_state=UNDEFINED
 dist_addr=738201600
 dist_pio_delay=10000
 eventq_index=0
-gem5_extensions=true
+gem5_extensions=false
 int_latency=10000
 it_lines=128
 p_state_clk_gate_bins=20
@@ -1674,6 +1682,7 @@ conf_table_reported=false
 default_p_state=UNDEFINED
 eventq_index=0
 in_addr_map=true
+kvm_map=true
 latency=30000
 latency_var=0
 null=false
@@ -1681,7 +1690,7 @@ p_state_clk_gate_bins=20
 p_state_clk_gate_max=1000000000000
 p_state_clk_gate_min=1000
 power_model=Null
-range=0:67108863
+range=0:67108863:0:0:0:0
 port=system.membus.master[1]
 
 [system.realview.pci_host]
@@ -1912,6 +1921,7 @@ conf_table_reported=false
 default_p_state=UNDEFINED
 eventq_index=0
 in_addr_map=true
+kvm_map=true
 latency=30000
 latency_var=0
 null=false
@@ -1919,7 +1929,7 @@ p_state_clk_gate_bins=20
 p_state_clk_gate_max=1000000000000
 p_state_clk_gate_min=1000
 power_model=Null
-range=402653184:436207615
+range=402653184:436207615:0:0:0:0
 port=system.iobus.master[11]
 
 [system.realview.watchdog_fake]