ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/intc/arm_gicv3_its: Fix return codes in process_mapti() 

Fix process_mapti() to consistently return CMD_STALL for memory
errors and CMD_CONTINUE for parameter errors, as we claim in the
comments that we do.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220111171048.3545974-9-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-01-11 17:10:43 +00:00
parent be0ed8fb7f
commit 0241f73160
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/intc/arm_gicv3_its.c
View File

@ -357,7 +357,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value,
MemTxResult res = MEMTX_OK; MemTxResult res = MEMTX_OK;
uint16_t icid = 0; uint16_t icid = 0;
uint64_t dte = 0; uint64_t dte = 0;
ItsCmdResult result = CMD_STALL; IteEntry ite = {};
devid = ((value & DEVID_MASK) >> DEVID_SHIFT); devid = ((value & DEVID_MASK) >> DEVID_SHIFT);
offset += NUM_BYTES_IN_DW; offset += NUM_BYTES_IN_DW;
@ -365,7 +365,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value,
MEMTXATTRS_UNSPECIFIED, &res); MEMTXATTRS_UNSPECIFIED, &res);
if (res != MEMTX_OK) { if (res != MEMTX_OK) {
return result; return CMD_STALL;
} }
eventid = (value & EVENTID_MASK); eventid = (value & EVENTID_MASK);
@ -381,7 +381,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value,
MEMTXATTRS_UNSPECIFIED, &res); MEMTXATTRS_UNSPECIFIED, &res);
if (res != MEMTX_OK) { if (res != MEMTX_OK) {
return result; return CMD_STALL;
} }
icid = value & ICID_MASK; icid = value & ICID_MASK;
@ -389,7 +389,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value,
dte = get_dte(s, devid, &res); dte = get_dte(s, devid, &res);
if (res != MEMTX_OK) { if (res != MEMTX_OK) {
return result; return CMD_STALL;
} }
dte_valid = FIELD_EX64(dte, DTE, VALID); dte_valid = FIELD_EX64(dte, DTE, VALID);
num_eventids = 1ULL << (FIELD_EX64(dte, DTE, SIZE) + 1); num_eventids = 1ULL << (FIELD_EX64(dte, DTE, SIZE) + 1);
@ -409,19 +409,17 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value,
* we ignore this command and move onto the next * we ignore this command and move onto the next
* command in the queue * command in the queue
*/ */
} else { return CMD_CONTINUE;
/* add ite entry to interrupt translation table */
IteEntry ite = {};
ite.itel = FIELD_DP64(ite.itel, ITE_L, VALID, dte_valid);
ite.itel = FIELD_DP64(ite.itel, ITE_L, INTTYPE, ITE_INTTYPE_PHYSICAL);
ite.itel = FIELD_DP64(ite.itel, ITE_L, INTID, pIntid);
ite.itel = FIELD_DP64(ite.itel, ITE_L, DOORBELL, INTID_SPURIOUS);
ite.iteh = FIELD_DP32(ite.iteh, ITE_H, ICID, icid);
result = update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_STALL;
} }
return result; /* add ite entry to interrupt translation table */
ite.itel = FIELD_DP64(ite.itel, ITE_L, VALID, dte_valid);
ite.itel = FIELD_DP64(ite.itel, ITE_L, INTTYPE, ITE_INTTYPE_PHYSICAL);
ite.itel = FIELD_DP64(ite.itel, ITE_L, INTID, pIntid);
ite.itel = FIELD_DP64(ite.itel, ITE_L, DOORBELL, INTID_SPURIOUS);
ite.iteh = FIELD_DP32(ite.iteh, ITE_H, ICID, icid);
return update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_STALL;
} }
static bool update_cte(GICv3ITSState *s, uint16_t icid, bool valid, static bool update_cte(GICv3ITSState *s, uint16_t icid, bool valid,