diff options
-rw-r--r-- | src/dev/arm/RealView.py | 3 | ||||
-rw-r--r-- | system/arm/dt/platforms/vexpress_gem5_v2_base.dtsi | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index 908644899..f83f075f6 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -1085,6 +1085,9 @@ class VExpress_GEM5_V1(VExpress_GEM5_V1_Base): class VExpress_GEM5_V2_Base(VExpress_GEM5_Base): gic = Gicv3(maint_int=ArmPPI(num=25)) + # Limiting to 128 since it will otherwise overlap with PCI space + gic.cpu_max = 128 + def _on_chip_devices(self): return super(VExpress_GEM5_V2_Base,self)._on_chip_devices() + [ self.gic, diff --git a/system/arm/dt/platforms/vexpress_gem5_v2_base.dtsi b/system/arm/dt/platforms/vexpress_gem5_v2_base.dtsi index 1dc235d7f..9cdee8560 100644 --- a/system/arm/dt/platforms/vexpress_gem5_v2_base.dtsi +++ b/system/arm/dt/platforms/vexpress_gem5_v2_base.dtsi @@ -40,9 +40,9 @@ #interrupt-cells = <0x3>; #address-cells = <0x2>; interrupt-controller; - redistributor-stride = <0x0 0x40000>; // 256kB stride, needed for ARM AVS tests... + redistributor-stride = <0x0 0x40000>; // 256kB stride reg = <0x0 0x2c000000 0x0 0x10000 - 0x0 0x2c010000 0x0 0x4000000 // room for 256 redistributors using 128K each (256K strided...) + 0x0 0x2c010000 0x0 0x2000000 // room for 128 redistributors using 128K each (256K strided...) 0x0 0x0 0x0 0x0>; interrupts = <1 9 0xf04>; #size-cells = <0x2>; |