sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dev, arm: Update GIC to use GICv2 register naming

Browse source 
The GICv2 has a new and slightly more consistent register
naming. Update gem5's GIC register names to match the new
documentation.

Change-Id: I8ef114eee8a95bf0b88b37c18a18e137be78675a
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Curtis Dunham <curtis.dunham@arm.com>
This commit is contained in:
Andreas Sandberg 2016-05-06 15:52:34 +01:00
parent a46f77e695
commit 84cfa10b15
2 changed files with 101 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
src/dev/arm/gic_pl390.cc
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010, 2013, 2015 ARM Limited * Copyright (c) 2010, 2013, 2015-2016 ARM Limited
* All rights reserved * All rights reserved
* *
* The license below extends only to copyright in the software and shall * The license below extends only to copyright in the software and shall
@ -144,39 +144,39 @@ Pl390::readDistributor(PacketPtr pkt)
DPRINTF(GIC, "gic distributor read register %#x\n", daddr); DPRINTF(GIC, "gic distributor read register %#x\n", daddr);
if (daddr >= ICDISER_ST && daddr < ICDISER_ED + 4) { if (daddr >= GICD_ISENABLER_ST && daddr < GICD_ISENABLER_ED + 4) {
assert((daddr-ICDISER_ST) >> 2 < 32); assert((daddr-GICD_ISENABLER_ST) >> 2 < 32);
pkt->set<uint32_t>(intEnabled[(daddr-ICDISER_ST)>>2]); pkt->set<uint32_t>(intEnabled[(daddr-GICD_ISENABLER_ST)>>2]);
goto done; goto done;
} }
if (daddr >= ICDICER_ST && daddr < ICDICER_ED + 4) { if (daddr >= GICD_ICENABLER_ST && daddr < GICD_ICENABLER_ED + 4) {
assert((daddr-ICDICER_ST) >> 2 < 32); assert((daddr-GICD_ICENABLER_ST) >> 2 < 32);
pkt->set<uint32_t>(intEnabled[(daddr-ICDICER_ST)>>2]); pkt->set<uint32_t>(intEnabled[(daddr-GICD_ICENABLER_ST)>>2]);
goto done; goto done;
} }
if (daddr >= ICDISPR_ST && daddr < ICDISPR_ED + 4) { if (daddr >= GICD_ISPENDR_ST && daddr < GICD_ISPENDR_ED + 4) {
assert((daddr-ICDISPR_ST) >> 2 < 32); assert((daddr-GICD_ISPENDR_ST) >> 2 < 32);
pkt->set<uint32_t>(pendingInt[(daddr-ICDISPR_ST)>>2]); pkt->set<uint32_t>(pendingInt[(daddr-GICD_ISPENDR_ST)>>2]);
goto done; goto done;
} }
if (daddr >= ICDICPR_ST && daddr < ICDICPR_ED + 4) { if (daddr >= GICD_ICPENDR_ST && daddr < GICD_ICPENDR_ED + 4) {
assert((daddr-ICDICPR_ST) >> 2 < 32); assert((daddr-GICD_ICPENDR_ST) >> 2 < 32);
pkt->set<uint32_t>(pendingInt[(daddr-ICDICPR_ST)>>2]); pkt->set<uint32_t>(pendingInt[(daddr-GICD_ICPENDR_ST)>>2]);
goto done; goto done;
} }
if (daddr >= ICDABR_ST && daddr < ICDABR_ED + 4) { if (daddr >= GICD_ISACTIVER_ST && daddr < GICD_ISACTIVER_ED + 4) {
assert((daddr-ICDABR_ST) >> 2 < 32); assert((daddr-GICD_ISACTIVER_ST) >> 2 < 32);
pkt->set<uint32_t>(activeInt[(daddr-ICDABR_ST)>>2]); pkt->set<uint32_t>(activeInt[(daddr-GICD_ISACTIVER_ST)>>2]);
goto done; goto done;
} }
if (daddr >= ICDIPR_ST && daddr < ICDIPR_ED + 4) { if (daddr >= GICD_IPRIORITYR_ST && daddr < GICD_IPRIORITYR_ED + 4) {
Addr int_num; Addr int_num;
int_num = daddr - ICDIPR_ST; int_num = daddr - GICD_IPRIORITYR_ST;
assert(int_num < INT_LINES_MAX); assert(int_num < INT_LINES_MAX);
DPRINTF(Interrupt, "Reading interrupt priority at int# %#x \n",int_num); DPRINTF(Interrupt, "Reading interrupt priority at int# %#x \n",int_num);
@ -209,9 +209,9 @@ Pl390::readDistributor(PacketPtr pkt)
goto done; goto done;
} }
if (daddr >= ICDIPTR_ST && daddr < ICDIPTR_ED + 4) { if (daddr >= GICD_ITARGETSR_ST && daddr < GICD_ITARGETSR_ED + 4) {
Addr int_num; Addr int_num;
int_num = (daddr-ICDIPTR_ST) ; int_num = (daddr-GICD_ITARGETSR_ST) ;
DPRINTF(GIC, "Reading processor target register for int# %#x \n", DPRINTF(GIC, "Reading processor target register for int# %#x \n",
int_num); int_num);
assert(int_num < INT_LINES_MAX); assert(int_num < INT_LINES_MAX);
@ -245,20 +245,20 @@ Pl390::readDistributor(PacketPtr pkt)
goto done; goto done;
} }
if (daddr >= ICDICFR_ST && daddr < ICDICFR_ED + 4) { if (daddr >= GICD_ICFGR_ST && daddr < GICD_ICFGR_ED + 4) {
assert((daddr-ICDICFR_ST) >> 2 < 64); assert((daddr-GICD_ICFGR_ST) >> 2 < 64);
/** @todo software generated interrutps and PPIs /** @todo software generated interrutps and PPIs
* can't be configured in some ways * can't be configured in some ways
*/ */
pkt->set<uint32_t>(intConfig[(daddr-ICDICFR_ST)>>2]); pkt->set<uint32_t>(intConfig[(daddr-GICD_ICFGR_ST)>>2]);
goto done; goto done;
} }
switch(daddr) { switch(daddr) {
case ICDDCR: case GICD_CTLR:
pkt->set<uint32_t>(enabled); pkt->set<uint32_t>(enabled);
break; break;
case ICDICTR: case GICD_TYPER:
uint32_t tmp; uint32_t tmp;
tmp = ((sys->numRunningContexts() - 1) << 5) | tmp = ((sys->numRunningContexts() - 1) << 5) |
(itLines/INT_BITS_MAX -1) | (itLines/INT_BITS_MAX -1) |
@ -291,19 +291,19 @@ Pl390::readCpu(PacketPtr pkt)
ctx_id); ctx_id);
switch(daddr) { switch(daddr) {
case ICCIIDR: case GICC_IIDR:
pkt->set<uint32_t>(0); pkt->set<uint32_t>(0);
break; break;
case ICCICR: case GICC_CTLR:
pkt->set<uint32_t>(cpuEnabled[ctx_id]); pkt->set<uint32_t>(cpuEnabled[ctx_id]);
break; break;
case ICCPMR: case GICC_PMR:
pkt->set<uint32_t>(cpuPriority[ctx_id]); pkt->set<uint32_t>(cpuPriority[ctx_id]);
break; break;
case ICCBPR: case GICC_BPR:
pkt->set<uint32_t>(cpuBpr[ctx_id]); pkt->set<uint32_t>(cpuBpr[ctx_id]);
break; break;
case ICCIAR: case GICC_IAR:
if (enabled && cpuEnabled[ctx_id]) { if (enabled && cpuEnabled[ctx_id]) {
int active_int = cpuHighestInt[ctx_id]; int active_int = cpuHighestInt[ctx_id];
IAR iar = 0; IAR iar = 0;
@ -356,10 +356,10 @@ Pl390::readCpu(PacketPtr pkt)
} }
break; break;
case ICCRPR: case GICC_RPR:
pkt->set<uint32_t>(iccrpr[0]); pkt->set<uint32_t>(iccrpr[0]);
break; break;
case ICCHPIR: case GICC_HPPIR:
pkt->set<uint32_t>(0); pkt->set<uint32_t>(0);
panic("Need to implement HPIR"); panic("Need to implement HPIR");
break; break;
@ -399,36 +399,36 @@ Pl390::writeDistributor(PacketPtr pkt)
DPRINTF(GIC, "gic distributor write register %#x size %#x value %#x \n", DPRINTF(GIC, "gic distributor write register %#x size %#x value %#x \n",
daddr, pkt->getSize(), pkt_data); daddr, pkt->getSize(), pkt_data);
if (daddr >= ICDISER_ST && daddr < ICDISER_ED + 4) { if (daddr >= GICD_ISENABLER_ST && daddr < GICD_ISENABLER_ED + 4) {
assert((daddr-ICDISER_ST) >> 2 < 32); assert((daddr-GICD_ISENABLER_ST) >> 2 < 32);
intEnabled[(daddr-ICDISER_ST) >> 2] |= pkt->get<uint32_t>(); intEnabled[(daddr-GICD_ISENABLER_ST) >> 2] |= pkt->get<uint32_t>();
goto done; goto done;
} }
if (daddr >= ICDICER_ST && daddr < ICDICER_ED + 4) { if (daddr >= GICD_ICENABLER_ST && daddr < GICD_ICENABLER_ED + 4) {
assert((daddr-ICDICER_ST) >> 2 < 32); assert((daddr-GICD_ICENABLER_ST) >> 2 < 32);
intEnabled[(daddr-ICDICER_ST) >> 2] &= ~pkt->get<uint32_t>(); intEnabled[(daddr-GICD_ICENABLER_ST) >> 2] &= ~pkt->get<uint32_t>();
goto done; goto done;
} }
if (daddr >= ICDISPR_ST && daddr < ICDISPR_ED + 4) { if (daddr >= GICD_ISPENDR_ST && daddr < GICD_ISPENDR_ED + 4) {
assert((daddr-ICDISPR_ST) >> 2 < 32); assert((daddr-GICD_ISPENDR_ST) >> 2 < 32);
pendingInt[(daddr-ICDISPR_ST) >> 2] |= pkt->get<uint32_t>(); pendingInt[(daddr-GICD_ISPENDR_ST) >> 2] |= pkt->get<uint32_t>();
pendingInt[0] &= SGI_MASK; // Don't allow SGIs to be changed pendingInt[0] &= SGI_MASK; // Don't allow SGIs to be changed
updateIntState((daddr-ICDISPR_ST) >> 2); updateIntState((daddr-GICD_ISPENDR_ST) >> 2);
goto done; goto done;
} }
if (daddr >= ICDICPR_ST && daddr < ICDICPR_ED + 4) { if (daddr >= GICD_ICPENDR_ST && daddr < GICD_ICPENDR_ED + 4) {
assert((daddr-ICDICPR_ST) >> 2 < 32); assert((daddr-GICD_ICPENDR_ST) >> 2 < 32);
pendingInt[(daddr-ICDICPR_ST) >> 2] &= ~pkt->get<uint32_t>(); pendingInt[(daddr-GICD_ICPENDR_ST) >> 2] &= ~pkt->get<uint32_t>();
pendingInt[0] &= SGI_MASK; // Don't allow SGIs to be changed pendingInt[0] &= SGI_MASK; // Don't allow SGIs to be changed
updateIntState((daddr-ICDICPR_ST) >> 2); updateIntState((daddr-GICD_ICPENDR_ST) >> 2);
goto done; goto done;
} }
if (daddr >= ICDIPR_ST && daddr < ICDIPR_ED + 4) { if (daddr >= GICD_IPRIORITYR_ST && daddr < GICD_IPRIORITYR_ED + 4) {
Addr int_num = daddr - ICDIPR_ST; Addr int_num = daddr - GICD_IPRIORITYR_ST;
assert(int_num < INT_LINES_MAX); assert(int_num < INT_LINES_MAX);
uint8_t* int_p; uint8_t* int_p;
if (int_num < (SGI_MAX + PPI_MAX)) if (int_num < (SGI_MAX + PPI_MAX))
@ -463,8 +463,8 @@ Pl390::writeDistributor(PacketPtr pkt)
goto done; goto done;
} }
if (daddr >= ICDIPTR_ST && daddr < ICDIPTR_ED + 4) { if (daddr >= GICD_ITARGETSR_ST && daddr < GICD_ITARGETSR_ED + 4) {
Addr int_num = (daddr-ICDIPTR_ST) ; Addr int_num = (daddr-GICD_ITARGETSR_ST) ;
assert(int_num < INT_LINES_MAX); assert(int_num < INT_LINES_MAX);
// First 31 interrupts only target single processor // First 31 interrupts only target single processor
if (int_num >= SGI_MAX) { if (int_num >= SGI_MAX) {
@ -480,32 +480,32 @@ Pl390::writeDistributor(PacketPtr pkt)
cpuTarget[int_num+2] = bits(tmp, 23, 16); cpuTarget[int_num+2] = bits(tmp, 23, 16);
cpuTarget[int_num+3] = bits(tmp, 31, 24); cpuTarget[int_num+3] = bits(tmp, 31, 24);
} }
updateIntState((daddr-ICDIPTR_ST)>>2); updateIntState((daddr-GICD_ITARGETSR_ST)>>2);
} }
goto done; goto done;
} }
if (daddr >= ICDICFR_ST && daddr < ICDICFR_ED + 4) { if (daddr >= GICD_ICFGR_ST && daddr < GICD_ICFGR_ED + 4) {
assert((daddr-ICDICFR_ST) >> 2 < 64); assert((daddr-GICD_ICFGR_ST) >> 2 < 64);
intConfig[(daddr-ICDICFR_ST)>>2] = pkt->get<uint32_t>(); intConfig[(daddr-GICD_ICFGR_ST)>>2] = pkt->get<uint32_t>();
if (pkt->get<uint32_t>() & NN_CONFIG_MASK) if (pkt->get<uint32_t>() & NN_CONFIG_MASK)
warn("GIC N:N mode selected and not supported at this time\n"); warn("GIC N:N mode selected and not supported at this time\n");
goto done; goto done;
} }
switch(daddr) { switch(daddr) {
case ICDDCR: case GICD_CTLR:
enabled = pkt->get<uint32_t>(); enabled = pkt->get<uint32_t>();
DPRINTF(Interrupt, "Distributor enable flag set to = %d\n", enabled); DPRINTF(Interrupt, "Distributor enable flag set to = %d\n", enabled);
break; break;
case ICDICTR: case GICD_TYPER:
/* 0x200 is a made-up flag to enable gem5 extension functionality. /* 0x200 is a made-up flag to enable gem5 extension functionality.
* This reg is not normally written. * This reg is not normally written.
*/ */
gem5ExtensionsEnabled = !!(pkt->get<uint32_t>() & 0x200); gem5ExtensionsEnabled = !!(pkt->get<uint32_t>() & 0x200);
DPRINTF(GIC, "gem5 extensions %s\n", gem5ExtensionsEnabled ? "enabled" : "disabled"); DPRINTF(GIC, "gem5 extensions %s\n", gem5ExtensionsEnabled ? "enabled" : "disabled");
break; break;
case ICDSGIR: case GICD_SGIR:
softInt(ctx_id, pkt->get<uint32_t>()); softInt(ctx_id, pkt->get<uint32_t>());
break; break;
default: default:
@ -531,16 +531,16 @@ Pl390::writeCpu(PacketPtr pkt)
ctx_id, daddr, pkt->get<uint32_t>()); ctx_id, daddr, pkt->get<uint32_t>());
switch(daddr) { switch(daddr) {
case ICCICR: case GICC_CTLR:
cpuEnabled[ctx_id] = pkt->get<uint32_t>(); cpuEnabled[ctx_id] = pkt->get<uint32_t>();
break; break;
case ICCPMR: case GICC_PMR:
cpuPriority[ctx_id] = pkt->get<uint32_t>(); cpuPriority[ctx_id] = pkt->get<uint32_t>();
break; break;
case ICCBPR: case GICC_BPR:
cpuBpr[ctx_id] = pkt->get<uint32_t>(); cpuBpr[ctx_id] = pkt->get<uint32_t>();
break; break;
case ICCEOIR: case GICC_EOIR:
iar = pkt->get<uint32_t>(); iar = pkt->get<uint32_t>();
if (iar.ack_id < SGI_MAX) { if (iar.ack_id < SGI_MAX) {
// Clear out the bit that corrseponds to the cleared int // Clear out the bit that corrseponds to the cleared int
@ -665,7 +665,7 @@ Pl390::updateIntState(int hint)
/*@todo use hint to do less work. */ /*@todo use hint to do less work. */
int highest_int = SPURIOUS_INT; int highest_int = SPURIOUS_INT;
// Priorities below that set in ICCPMR can be ignored // Priorities below that set in GICC_PMR can be ignored
uint8_t highest_pri = cpuPriority[cpu]; uint8_t highest_pri = cpuPriority[cpu];
// Check SGIs // Check SGIs

72
src/dev/arm/gic_pl390.hh
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010, 2013, 2015 ARM Limited * Copyright (c) 2010, 2013, 2015-2016 ARM Limited
* All rights reserved * All rights reserved
* *
* The license below extends only to copyright in the software and shall * The license below extends only to copyright in the software and shall
@ -65,39 +65,45 @@ class Pl390 : public BaseGic
{ {
protected: protected:
// distributor memory addresses // distributor memory addresses
static const int ICDDCR = 0x000; // control register enum {
static const int ICDICTR = 0x004; // controller type GICD_CTLR = 0x000, // control register
static const int ICDIIDR = 0x008; // implementer id GICD_TYPER = 0x004, // controller type
static const int ICDISER_ST = 0x100; // interrupt set enable GICD_IIDR = 0x008, // implementer id
static const int ICDISER_ED = 0x17c; GICD_ISENABLER_ST = 0x100, // interrupt set enable
static const int ICDICER_ST = 0x180; // interrupt clear enable GICD_ISENABLER_ED = 0x17c,
static const int ICDICER_ED = 0x1fc; GICD_ICENABLER_ST = 0x180, // interrupt clear enable
static const int ICDISPR_ST = 0x200; // set pending interrupt GICD_ICENABLER_ED = 0x1fc,
static const int ICDISPR_ED = 0x27c; GICD_ISPENDR_ST = 0x200, // set pending interrupt
static const int ICDICPR_ST = 0x280; // clear pending interrupt GICD_ISPENDR_ED = 0x27c,
static const int ICDICPR_ED = 0x2fc; GICD_ICPENDR_ST = 0x280, // clear pending interrupt
static const int ICDABR_ST = 0x300; // active bit registers GICD_ICPENDR_ED = 0x2fc,
static const int ICDABR_ED = 0x37c; GICD_ISACTIVER_ST = 0x300, // active bit registers
static const int ICDIPR_ST = 0x400; // interrupt priority registers GICD_ISACTIVER_ED = 0x37c,
static const int ICDIPR_ED = 0x7f8; GICD_IPRIORITYR_ST = 0x400, // interrupt priority registers
static const int ICDIPTR_ST = 0x800; // processor target registers GICD_IPRIORITYR_ED = 0x7f8,
static const int ICDIPTR_ED = 0xbf8; GICD_ITARGETSR_ST = 0x800, // processor target registers
static const int ICDICFR_ST = 0xc00; // interrupt config registers GICD_ITARGETSR_ED = 0xbf8,
static const int ICDICFR_ED = 0xcfc; GICD_ICFGR_ST = 0xc00, // interrupt config registers
static const int ICDSGIR = 0xf00; // software generated interrupt GICD_ICFGR_ED = 0xcfc,
static const int DIST_SIZE = 0xfff; GICD_SGIR = 0xf00, // software generated interrupt
DIST_SIZE = 0xfff
};
// cpu memory addressesa // cpu memory addressesa
static const int ICCICR = 0x00; // CPU control register enum {
static const int ICCPMR = 0x04; // Interrupt priority mask GICC_CTLR = 0x00, // CPU control register
static const int ICCBPR = 0x08; // binary point register GICC_PMR = 0x04, // Interrupt priority mask
static const int ICCIAR = 0x0C; // interrupt ack register GICC_BPR = 0x08, // binary point register
static const int ICCEOIR = 0x10; // end of interrupt GICC_IAR = 0x0C, // interrupt ack register
static const int ICCRPR = 0x14; // runing priority GICC_EOIR = 0x10, // end of interrupt
static const int ICCHPIR = 0x18; // highest pending interrupt GICC_RPR = 0x14, // runing priority
static const int ICCABPR = 0x1c; // aliased binary point GICC_HPPIR = 0x18, // highest pending interrupt
static const int ICCIIDR = 0xfc; // cpu interface id register GICC_ABPR = 0x1c, // aliased binary point
static const int CPU_SIZE = 0xff; GICC_IIDR = 0xfc, // cpu interface id register
CPU_SIZE = 0xff
};
static const int SGI_MAX = 16; // Number of Software Gen Interrupts static const int SGI_MAX = 16; // Number of Software Gen Interrupts
static const int PPI_MAX = 16; // Number of Private Peripheral Interrupts static const int PPI_MAX = 16; // Number of Private Peripheral Interrupts
@ -105,7 +111,7 @@ class Pl390 : public BaseGic
/** Mask off SGI's when setting/clearing pending bits */ /** Mask off SGI's when setting/clearing pending bits */
static const int SGI_MASK = 0xFFFF0000; static const int SGI_MASK = 0xFFFF0000;
/** Mask for bits that config N:N mode in ICDICFR's */ /** Mask for bits that config N:N mode in GICD_ICFGR's */
static const int NN_CONFIG_MASK = 0x55555555; static const int NN_CONFIG_MASK = 0x55555555;
static const int CPU_MAX = 256; // Max number of supported CPU interfaces static const int CPU_MAX = 256; // Max number of supported CPU interfaces