motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix process_its_cmd() 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-7-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-01-11 17:10:41 +00:00
parent ef011555da
commit 593a7cc2d3
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hw/intc/arm_gicv3_its.c
View file

@ -248,7 +248,6 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,
bool ite_valid = false; bool ite_valid = false;
uint64_t cte = 0; uint64_t cte = 0;
bool cte_valid = false; bool cte_valid = false;
ItsCmdResult result = CMD_STALL;
uint64_t rdbase; uint64_t rdbase;
if (cmd == NONE) { if (cmd == NONE) {
@ -262,7 +261,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,
} }
if (res != MEMTX_OK) { if (res != MEMTX_OK) {
return result; return CMD_STALL;
} }
eventid = (value & EVENTID_MASK); eventid = (value & EVENTID_MASK);
@ -270,7 +269,7 @@ static ItsCmdResult process_its_cmd(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);
@ -280,7 +279,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,
ite_valid = get_ite(s, eventid, dte, &icid, &pIntid, &res); ite_valid = get_ite(s, eventid, dte, &icid, &pIntid, &res);
if (res != MEMTX_OK) { if (res != MEMTX_OK) {
return result; return CMD_STALL;
} }
if (ite_valid) { if (ite_valid) {
@ -288,14 +287,14 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,
} }
if (res != MEMTX_OK) { if (res != MEMTX_OK) {
return result; return CMD_STALL;
} }
} else { } else {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: invalid command attributes: " "%s: invalid command attributes: "
"invalid dte: %"PRIx64" for %d (MEM_TX: %d)\n", "invalid dte: %"PRIx64" for %d (MEM_TX: %d)\n",
__func__, dte, devid, res); __func__, dte, devid, res);
return result; return CMD_CONTINUE;
} }
@ -307,7 +306,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: invalid command attributes: devid %d>=%d", "%s: invalid command attributes: devid %d>=%d",
__func__, devid, s->dt.num_ids); __func__, devid, s->dt.num_ids);
return CMD_CONTINUE;
} else if (!dte_valid || !ite_valid || !cte_valid) { } else if (!dte_valid || !ite_valid || !cte_valid) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: invalid command attributes: " "%s: invalid command attributes: "
@ -316,11 +315,13 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,
dte_valid ? "valid" : "invalid", dte_valid ? "valid" : "invalid",
ite_valid ? "valid" : "invalid", ite_valid ? "valid" : "invalid",
cte_valid ? "valid" : "invalid"); cte_valid ? "valid" : "invalid");
return CMD_CONTINUE;
} else if (eventid >= num_eventids) { } else if (eventid >= num_eventids) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: invalid command attributes: eventid %d >= %" "%s: invalid command attributes: eventid %d >= %"
PRId64 "\n", PRId64 "\n",
__func__, eventid, num_eventids); __func__, eventid, num_eventids);
return CMD_CONTINUE;
} else { } else {
/* /*
* Current implementation only supports rdbase == procnum * Current implementation only supports rdbase == procnum
@ -329,7 +330,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,
rdbase = FIELD_EX64(cte, CTE, RDBASE); rdbase = FIELD_EX64(cte, CTE, RDBASE);
if (rdbase >= s->gicv3->num_cpu) { if (rdbase >= s->gicv3->num_cpu) {
return result; return CMD_CONTINUE;
} }
if ((cmd == CLEAR) || (cmd == DISCARD)) { if ((cmd == CLEAR) || (cmd == DISCARD)) {
@ -341,11 +342,10 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,
if (cmd == DISCARD) { if (cmd == DISCARD) {
IteEntry ite = {}; IteEntry ite = {};
/* remove mapping from interrupt translation table */ /* remove mapping from interrupt translation table */
result = update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_STALL; return update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_STALL;
} }
return CMD_CONTINUE;
} }
return result;
} }
static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value,