diff options
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/arm/Gic.py | 5 | ||||
| -rw-r--r-- | src/dev/arm/RealView.py | 2 | ||||
| -rw-r--r-- | src/dev/arm/gic_pl390.cc | 2 | ||||
| -rw-r--r-- | src/dev/arm/gic_pl390.hh | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/dev/arm/Gic.py b/src/dev/arm/Gic.py index 4cc661f0b..3d49c8597 100644 --- a/src/dev/arm/Gic.py +++ b/src/dev/arm/Gic.py @@ -72,8 +72,9 @@ class Pl390(BaseGic): type = 'Pl390' cxx_header = "dev/arm/gic_pl390.hh" - dist_addr = Param.Addr(0x1f001000, "Address for distributor") - cpu_addr = Param.Addr(0x1f000100, "Address for cpu") + dist_addr = Param.Addr("Address for distributor") + cpu_addr = Param.Addr("Address for cpu") + cpu_size = Param.Addr(0x2000, "Size of cpu register bank") dist_pio_delay = Param.Latency('10ns', "Delay for PIO r/w to distributor") cpu_pio_delay = Param.Latency('10ns', "Delay for PIO r/w to cpu interface") int_latency = Param.Latency('10ns', "Delay for interrupt to get to CPU") diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index a1b313083..d38b86775 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -614,7 +614,7 @@ class RealViewPBX(RealView): realview_io = RealViewCtrl(pio_addr=0x10000000) mcc = VExpressMCC() dcc = CoreTile2A15DCC() - gic = Pl390() + gic = Pl390(cpu_addr=0x1f000100, dist_addr=0x1f001000, cpu_size=0x100) pci_host = GenericPciHost( conf_base=0x30000000, conf_size='256MB', conf_device_bits=16, pci_pio_base=0) diff --git a/src/dev/arm/gic_pl390.cc b/src/dev/arm/gic_pl390.cc index b0c4e99ee..9b671e0ca 100644 --- a/src/dev/arm/gic_pl390.cc +++ b/src/dev/arm/gic_pl390.cc @@ -65,7 +65,7 @@ const AddrRange Pl390::GICD_ICFGR (0xc00, 0xcff); Pl390::Pl390(const Params *p) : BaseGic(p), distRange(RangeSize(p->dist_addr, DIST_SIZE)), - cpuRange(RangeSize(p->cpu_addr, CPU_SIZE)), + cpuRange(RangeSize(p->cpu_addr, p->cpu_size)), addrRanges{distRange, cpuRange}, distPioDelay(p->dist_pio_delay), cpuPioDelay(p->cpu_pio_delay), intLatency(p->int_latency), diff --git a/src/dev/arm/gic_pl390.hh b/src/dev/arm/gic_pl390.hh index 7fd4bcbda..7183877f5 100644 --- a/src/dev/arm/gic_pl390.hh +++ b/src/dev/arm/gic_pl390.hh @@ -110,8 +110,6 @@ class Pl390 : public BaseGic, public BaseGicRegisters GICC_APR2 = 0xd8, // active priority register 2 GICC_APR3 = 0xdc, // active priority register 3 GICC_IIDR = 0xfc, // cpu interface id register - - CPU_SIZE = 0x2000, }; static const int SGI_MAX = 16; // Number of Software Gen Interrupts |