stats: Update to reflect changes to PCI handling

3 files changed, 84 insertions, 112 deletions

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
index 2db2ddc0e..ec0c9ed73 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
@@ -43,7 +43,7 @@ num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
 phys_addr_range_64=40
-readfile=/work/gem5/outgoing/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5_2/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -419,10 +419,9 @@ eventq_index=0
 forward_latency=1
 frontend_latency=2
 response_latency=2
-use_default_range=true
+use_default_range=false
 width=16
-default=system.realview.pciconfig.pio
-master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ide.config system.realview.ethernet.pio system.realview.ethernet.config system.iocache.cpu_side
+master=system.realview.uart.pio system.realview.realview_io.pio system.realview.pci_host.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ethernet.pio system.iocache.cpu_side
 slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma system.realview.ide.dma system.realview.ethernet.dma
 
 [system.iocache]
@@ -449,7 +448,7 @@ tags=system.iocache.tags
 tgts_per_mshr=12
 write_buffers=8
 writeback_clean=false
-cpu_side=system.iobus.master[27]
+cpu_side=system.iobus.master[25]
 mem_side=system.membus.slave[3]
 
 [system.iocache.tags]
@@ -512,12 +511,9 @@ port=system.membus.master[5]
 
 [system.realview]
 type=RealView
-children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pci_host realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
 eventq_index=0
 intrctrl=system.intrctrl
-pci_cfg_base=805306368
-pci_cfg_gen_offsets=false
-pci_io_base=0
 system=system
 
 [system.realview.aaci_fake]
@@ -610,16 +606,15 @@ config_latency=20000
 ctrl_offset=2
 disks=
 eventq_index=0
+host=system.realview.pci_host
 io_shift=2
 pci_bus=2
 pci_dev=0
 pci_func=0
 pio_latency=30000
-platform=system.realview
 system=system
-config=system.iobus.master[9]
 dma=system.iobus.slave[2]
-pio=system.iobus.master[8]
+pio=system.iobus.master[9]
 
 [system.realview.clcd]
 type=Pl111
@@ -635,7 +630,7 @@ pixel_clock=41667
 system=system
 vnc=system.vncserver
 dma=system.iobus.slave[1]
-pio=system.iobus.master[4]
+pio=system.iobus.master[5]
 
 [system.realview.dcc]
 type=SubSystem
@@ -798,13 +793,13 @@ eventq_index=0
 fetch_comp_delay=10000
 fetch_delay=10000
 hardware_address=00:90:00:00:00:01
+host=system.realview.pci_host
 pci_bus=0
 pci_dev=0
 pci_func=0
 phy_epid=896
 phy_pid=680
 pio_latency=30000
-platform=system.realview
 rx_desc_cache_size=64
 rx_fifo_size=393216
 rx_write_delay=0
@@ -814,9 +809,8 @@ tx_fifo_size=393216
 tx_read_delay=0
 wb_comp_delay=10000
 wb_delay=10000
-config=system.iobus.master[26]
 dma=system.iobus.slave[4]
-pio=system.iobus.master[25]
+pio=system.iobus.master[24]
 
 [system.realview.generic_timer]
 type=GenericTimer
@@ -858,7 +852,7 @@ vnc=system.vncserver
 workaround_dma_line_count=true
 workaround_swap_rb=true
 dma=system.membus.slave[0]
-pio=system.iobus.master[5]
+pio=system.iobus.master[6]
 
 [system.realview.ide]
 type=IdeController
@@ -939,14 +933,13 @@ config_latency=20000
 ctrl_offset=0
 disks=system.cf0
 eventq_index=0
+host=system.realview.pci_host
 io_shift=0
 pci_bus=0
 pci_dev=1
 pci_func=0
 pio_latency=30000
-platform=system.realview
 system=system
-config=system.iobus.master[24]
 dma=system.iobus.slave[3]
 pio=system.iobus.master[23]
 
@@ -963,7 +956,7 @@ pio_addr=470155264
 pio_latency=100000
 system=system
 vnc=system.vncserver
-pio=system.iobus.master[6]
+pio=system.iobus.master[7]
 
 [system.realview.kmi1]
 type=Pl050
@@ -978,7 +971,7 @@ pio_addr=470220800
 pio_latency=100000
 system=system
 vnc=system.vncserver
-pio=system.iobus.master[7]
+pio=system.iobus.master[8]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -1101,17 +1094,19 @@ null=false
 range=0:67108863
 port=system.membus.master[1]
 
-[system.realview.pciconfig]
-type=PciConfigAll
-bus=0
+[system.realview.pci_host]
+type=GenericPciHost
 clk_domain=system.clk_domain
+conf_base=805306368
+conf_device_bits=16
+conf_size=268435456
 eventq_index=0
-pio_addr=0
-pio_latency=30000
+pci_dma_base=0
+pci_mem_base=0
+pci_pio_base=0
 platform=system.realview
-size=268435456
 system=system
-pio=system.iobus.default
+pio=system.iobus.master[2]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -1163,7 +1158,7 @@ int_num1=34
 pio_addr=470876160
 pio_latency=100000
 system=system
-pio=system.iobus.master[2]
+pio=system.iobus.master[3]
 
 [system.realview.timer1]
 type=Sp804
@@ -1178,7 +1173,7 @@ int_num1=35
 pio_addr=470941696
 pio_latency=100000
 system=system
-pio=system.iobus.master[3]
+pio=system.iobus.master[4]
 
 [system.realview.uart]
 type=Pl011
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
index 8406c4bfc..ecb1a29da 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
@@ -19,10 +19,6 @@
                 "role": "SLAVE"
             }, 
             "name": "iobus", 
-            "default": {
-                "peer": "system.realview.pciconfig.pio", 
-                "role": "MASTER"
-            }, 
             "forward_latency": 1, 
             "clk_domain": "system.clk_domain", 
             "width": 16, 
@@ -31,6 +27,7 @@
                 "peer": [
                     "system.realview.uart.pio", 
                     "system.realview.realview_io.pio", 
+                    "system.realview.pci_host.pio", 
                     "system.realview.timer0.pio", 
                     "system.realview.timer1.pio", 
                     "system.realview.clcd.pio", 
@@ -38,7 +35,6 @@
                     "system.realview.kmi0.pio", 
                     "system.realview.kmi1.pio", 
                     "system.realview.cf_ctrl.pio", 
-                    "system.realview.cf_ctrl.config", 
                     "system.realview.rtc.pio", 
                     "system.realview.vram.port", 
                     "system.realview.l2x0_fake.pio", 
@@ -53,9 +49,7 @@
                     "system.realview.mmc_fake.pio", 
                     "system.realview.energy_ctrl.pio", 
                     "system.realview.ide.pio", 
-                    "system.realview.ide.config", 
                     "system.realview.ethernet.pio", 
-                    "system.realview.ethernet.config", 
                     "system.iocache.cpu_side"
                 ], 
                 "role": "MASTER"
@@ -64,11 +58,11 @@
             "cxx_class": "NoncoherentXBar", 
             "path": "system.iobus", 
             "type": "NoncoherentXBar", 
-            "use_default_range": true, 
+            "use_default_range": false, 
             "frontend_latency": 2
         }, 
         "symbolfile": "", 
-        "readfile": "/work/gem5/outgoing/gem5/tests/halt.sh", 
+        "readfile": "/work/gem5/outgoing/gem5_2/tests/halt.sh", 
         "have_large_asid_64": false, 
         "phys_addr_range_64": 40, 
         "have_lpae": false, 
@@ -115,7 +109,7 @@
                 "workaround_dma_line_count": true, 
                 "amba_id": 1314816, 
                 "pio": {
-                    "peer": "system.iobus.master[5]", 
+                    "peer": "system.iobus.master[6]", 
                     "role": "SLAVE"
                 }, 
                 "pio_latency": 10000, 
@@ -174,7 +168,23 @@
                 "pio_addr": 471269376, 
                 "type": "PL031"
             }, 
-            "pci_cfg_gen_offsets": false, 
+            "watchdog_fake": {
+                "name": "watchdog_fake", 
+                "pio": {
+                    "peer": "system.iobus.master[17]", 
+                    "role": "SLAVE"
+                }, 
+                "amba_id": 0, 
+                "ignore_access": false, 
+                "pio_latency": 100000, 
+                "clk_domain": "system.clk_domain", 
+                "system": "system", 
+                "eventq_index": 0, 
+                "cxx_class": "AmbaFake", 
+                "path": "system.realview.watchdog_fake", 
+                "pio_addr": 470745088, 
+                "type": "AmbaFake"
+            }, 
             "vgic": {
                 "system": "system", 
                 "name": "vgic", 
@@ -348,7 +358,7 @@
             "timer1": {
                 "name": "timer1", 
                 "pio": {
-                    "peer": "system.iobus.master[3]", 
+                    "peer": "system.iobus.master[4]", 
                     "role": "SLAVE"
                 }, 
                 "amba_id": 1316868, 
@@ -369,7 +379,7 @@
             "timer0": {
                 "name": "timer0", 
                 "pio": {
-                    "peer": "system.iobus.master[2]", 
+                    "peer": "system.iobus.master[3]", 
                     "role": "SLAVE"
                 }, 
                 "amba_id": 1316868, 
@@ -422,6 +432,26 @@
                 "pio_addr": 470286336
             }, 
             "type": "RealView", 
+            "pci_host": {
+                "conf_size": 268435456, 
+                "name": "pci_host", 
+                "conf_device_bits": 16, 
+                "pio": {
+                    "peer": "system.iobus.master[2]", 
+                    "role": "SLAVE"
+                }, 
+                "conf_base": 805306368, 
+                "clk_domain": "system.clk_domain", 
+                "system": "system", 
+                "pci_dma_base": 0, 
+                "platform": "system.realview", 
+                "eventq_index": 0, 
+                "cxx_class": "GenericPciHost", 
+                "path": "system.realview.pci_host", 
+                "pci_pio_base": 0, 
+                "type": "GenericPciHost", 
+                "pci_mem_base": 0
+            }, 
             "lan_fake": {
                 "system": "system", 
                 "ret_data8": 255, 
@@ -617,25 +647,6 @@
                     "type": "RealViewOsc"
                 }
             }, 
-            "pciconfig": {
-                "name": "pciconfig", 
-                "pio": {
-                    "peer": "system.iobus.default", 
-                    "role": "SLAVE"
-                }, 
-                "bus": 0, 
-                "pio_latency": 30000, 
-                "clk_domain": "system.clk_domain", 
-                "system": "system", 
-                "platform": "system.realview", 
-                "eventq_index": 0, 
-                "cxx_class": "PciConfigAll", 
-                "path": "system.realview.pciconfig", 
-                "pio_addr": 0, 
-                "type": "PciConfigAll", 
-                "size": 268435456
-            }, 
-            "pci_cfg_base": 805306368, 
             "path": "system.realview", 
             "vram": {
                 "range": "402653184:436207615", 
@@ -656,7 +667,6 @@
                 }, 
                 "in_addr_map": true
             }, 
-            "pci_io_base": 0, 
             "nvmem": {
                 "range": "0:67108863", 
                 "latency": 30000, 
@@ -685,7 +695,7 @@
                 "vnc": "system.vncserver", 
                 "name": "clcd", 
                 "pio": {
-                    "peer": "system.iobus.master[4]", 
+                    "peer": "system.iobus.master[5]", 
                     "role": "SLAVE"
                 }, 
                 "amba_id": 1315089, 
@@ -723,30 +733,13 @@
                 "pio_addr": 470351872, 
                 "type": "Pl011"
             }, 
-            "watchdog_fake": {
-                "name": "watchdog_fake", 
-                "pio": {
-                    "peer": "system.iobus.master[17]", 
-                    "role": "SLAVE"
-                }, 
-                "amba_id": 0, 
-                "ignore_access": false, 
-                "pio_latency": 100000, 
-                "clk_domain": "system.clk_domain", 
-                "system": "system", 
-                "eventq_index": 0, 
-                "cxx_class": "AmbaFake", 
-                "path": "system.realview.watchdog_fake", 
-                "pio_addr": 470745088, 
-                "type": "AmbaFake"
-            }, 
             "intrctrl": "system.intrctrl", 
             "kmi1": {
                 "vnc": "system.vncserver", 
                 "name": "kmi1", 
                 "int_delay": 1000000, 
                 "pio": {
-                    "peer": "system.iobus.master[7]", 
+                    "peer": "system.iobus.master[8]", 
                     "role": "SLAVE"
                 }, 
                 "amba_id": 1314896, 
@@ -767,7 +760,7 @@
                 "name": "kmi0", 
                 "int_delay": 1000000, 
                 "pio": {
-                    "peer": "system.iobus.master[6]", 
+                    "peer": "system.iobus.master[7]", 
                     "role": "SLAVE"
                 }, 
                 "amba_id": 1314896, 
@@ -794,7 +787,6 @@
                 "Revision": 0, 
                 "LegacyIOBase": 0, 
                 "pio_latency": 30000, 
-                "platform": "system.realview", 
                 "PXCAPLinkCap": 0, 
                 "CapabilityPtr": 0, 
                 "MSIXCAPBaseOffset": 0, 
@@ -828,6 +820,7 @@
                 "PXCAPDevCap2": 0, 
                 "PXCAPDevCtrl": 0, 
                 "MSICAPMaskBits": 0, 
+                "host": "system.realview.pci_host", 
                 "Command": 1, 
                 "SubClassCode": 1, 
                 "pci_func": 0, 
@@ -862,7 +855,7 @@
                 "config_latency": 20000, 
                 "BAR1Size": 4096, 
                 "pio": {
-                    "peer": "system.iobus.master[8]", 
+                    "peer": "system.iobus.master[9]", 
                     "role": "SLAVE"
                 }, 
                 "pci_dev": 0, 
@@ -871,10 +864,6 @@
                 "clk_domain": "system.clk_domain", 
                 "SubsystemVendorID": 0, 
                 "PMCAPBaseOffset": 0, 
-                "config": {
-                    "peer": "system.iobus.master[9]", 
-                    "role": "SLAVE"
-                }, 
                 "MSICAPPendingBits": 0, 
                 "MSIXTableOffset": 0, 
                 "MSICAPMsgUpperAddr": 0, 
@@ -914,7 +903,6 @@
                 "hardware_address": "00:90:00:00:00:01", 
                 "LegacyIOBase": 0, 
                 "pio_latency": 30000, 
-                "platform": "system.realview", 
                 "PXCAPLinkCap": 0, 
                 "CapabilityPtr": 0, 
                 "MSIXCAPBaseOffset": 0, 
@@ -949,6 +937,7 @@
                 "PXCAPDevCap2": 0, 
                 "PXCAPDevCtrl": 0, 
                 "MSICAPMaskBits": 0, 
+                "host": "system.realview.pci_host", 
                 "Command": 0, 
                 "SubClassCode": 0, 
                 "pci_func": 0, 
@@ -986,7 +975,7 @@
                 "config_latency": 20000, 
                 "BAR1Size": 0, 
                 "pio": {
-                    "peer": "system.iobus.master[25]", 
+                    "peer": "system.iobus.master[24]", 
                     "role": "SLAVE"
                 }, 
                 "pci_dev": 0, 
@@ -997,10 +986,6 @@
                 "clk_domain": "system.clk_domain", 
                 "SubsystemVendorID": 32902, 
                 "PMCAPBaseOffset": 0, 
-                "config": {
-                    "peer": "system.iobus.master[26]", 
-                    "role": "SLAVE"
-                }, 
                 "MSICAPPendingBits": 0, 
                 "MSIXTableOffset": 0, 
                 "MSICAPMsgUpperAddr": 0, 
@@ -1025,7 +1010,6 @@
                 "Revision": 0, 
                 "LegacyIOBase": 0, 
                 "pio_latency": 30000, 
-                "platform": "system.realview", 
                 "PXCAPLinkCap": 0, 
                 "CapabilityPtr": 0, 
                 "MSIXCAPBaseOffset": 0, 
@@ -1061,6 +1045,7 @@
                 "PXCAPDevCap2": 0, 
                 "PXCAPDevCtrl": 0, 
                 "MSICAPMaskBits": 0, 
+                "host": "system.realview.pci_host", 
                 "Command": 0, 
                 "SubClassCode": 1, 
                 "pci_func": 0, 
@@ -1104,10 +1089,6 @@
                 "clk_domain": "system.clk_domain", 
                 "SubsystemVendorID": 0, 
                 "PMCAPBaseOffset": 0, 
-                "config": {
-                    "peer": "system.iobus.master[24]", 
-                    "role": "SLAVE"
-                }, 
                 "MSICAPPendingBits": 0, 
                 "MSIXTableOffset": 0, 
                 "MSICAPMsgUpperAddr": 0, 
@@ -1187,7 +1168,7 @@
         "eventq_index": 0, 
         "iocache": {
             "cpu_side": {
-                "peer": "system.iobus.master[27]", 
+                "peer": "system.iobus.master[25]", 
                 "role": "SLAVE"
             }, 
             "clusivity": "mostly_incl", 
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
index 4f7058700..5b276d871 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.783867                       # Nu
 sim_ticks                                2783867052000                       # Number of ticks simulated
 final_tick                               2783867052000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 648383                       # Simulator instruction rate (inst/s)
-host_op_rate                                   789303                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            12642549042                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 580896                       # Number of bytes of host memory used
-host_seconds                                   220.20                       # Real time elapsed on the host
+host_inst_rate                                 948377                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1154497                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            18491991143                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 582460                       # Number of bytes of host memory used
+host_seconds                                   150.54                       # Real time elapsed on the host
 sim_insts                                   142772879                       # Number of instructions simulated
 sim_ops                                     173803124                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -589,6 +589,7 @@ system.iobus.trans_dist::WriteReq               59002                       # Tr
 system.iobus.trans_dist::WriteResp              59002                       # Transaction distribution
 system.iobus.pkt_count_system.bridge.master::system.realview.uart.pio        54116                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.realview_io.pio          116                       # Packet count per connected master and slave (bytes)
+system.iobus.pkt_count_system.bridge.master::system.realview.pci_host.pio          434                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.timer0.pio           34                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.timer1.pio           20                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.kmi0.pio          120                       # Packet count per connected master and slave (bytes)
@@ -604,16 +605,14 @@ system.iobus.pkt_count_system.bridge.master::system.realview.lan_fake.pio
 system.iobus.pkt_count_system.bridge.master::system.realview.usb_fake.pio           10                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.mmc_fake.pio           16                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.ide.pio         7244                       # Packet count per connected master and slave (bytes)
-system.iobus.pkt_count_system.bridge.master::system.realview.ide-pciconf          210                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.ethernet.pio        42268                       # Packet count per connected master and slave (bytes)
-system.iobus.pkt_count_system.bridge.master::system.realview.ethernet-pciconf          164                       # Packet count per connected master and slave (bytes)
-system.iobus.pkt_count_system.bridge.master::system.realview.pciconfig.pio           60                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::total       105404                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.realview.ide.dma::system.iocache.cpu_side        72928                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.realview.ide.dma::total        72928                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count::total                  178332                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.uart.pio        67833                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.realview_io.pio          232                       # Cumulative packet size per connected master and slave (bytes)
+system.iobus.pkt_size_system.bridge.master::system.realview.pci_host.pio          638                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.timer0.pio           68                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.timer1.pio           40                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.kmi0.pio           84                       # Cumulative packet size per connected master and slave (bytes)
@@ -629,10 +628,7 @@ system.iobus.pkt_size_system.bridge.master::system.realview.lan_fake.pio
 system.iobus.pkt_size_system.bridge.master::system.realview.usb_fake.pio           20                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.mmc_fake.pio           32                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.ide.pio         4753                       # Cumulative packet size per connected master and slave (bytes)
-system.iobus.pkt_size_system.bridge.master::system.realview.ide-pciconf          265                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.ethernet.pio        84536                       # Cumulative packet size per connected master and slave (bytes)
-system.iobus.pkt_size_system.bridge.master::system.realview.ethernet-pciconf          253                       # Cumulative packet size per connected master and slave (bytes)
-system.iobus.pkt_size_system.bridge.master::system.realview.pciconfig.pio          120                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::total       159061                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.realview.ide.dma::system.iocache.cpu_side      2321152                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.realview.ide.dma::total      2321152                       # Cumulative packet size per connected master and slave (bytes)