mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/intc/arm_gicv3_its: Remove maxids union from TableDesc

Browse Source 
The TableDesc struct defines properties of the in-guest-memory tables
which the guest tells us about by writing to the GITS_BASER<n>
registers.  This struct currently has a union 'maxids', but all the
fields of the union have the same type (uint32_t) and do the same
thing (record one-greater-than the maximum ID value that can be used
as an index into the table).

We're about to add another table type (the GICv4 vPE table); rather
than adding another specifically-named union field for that table
type with the same type as the other union fields, remove the union
entirely and just have a 'uint32_t max_ids' struct field.

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>
This commit is contained in:
Peter Maydell 2022-01-07 17:07:58 +00:00
parent 8d2d6dd9bb
commit 6c1db43de4
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/intc/arm_gicv3_its.c
View File

@ -287,10 +287,10 @@ static bool process_its_cmd(GICv3ITSState *s, uint64_t value, uint32_t offset,
* In this implementation, in case of guest errors we ignore the * In this implementation, in case of guest errors we ignore the
* command and move onto the next command in the queue. * command and move onto the next command in the queue.
*/ */
if (devid > s->dt.maxids.max_devids) { if (devid > s->dt.max_ids) {
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.maxids.max_devids); __func__, devid, s->dt.max_ids);
} 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,
@ -384,7 +384,7 @@ static bool process_mapti(GICv3ITSState *s, uint64_t value, uint32_t offset,
max_Intid = (1ULL << (GICD_TYPER_IDBITS + 1)) - 1; max_Intid = (1ULL << (GICD_TYPER_IDBITS + 1)) - 1;
} }
if ((devid > s->dt.maxids.max_devids) || (icid > s->ct.maxids.max_collids) if ((devid > s->dt.max_ids) || (icid > s->ct.max_ids)
|| !dte_valid || (eventid > max_eventid) || || !dte_valid || (eventid > max_eventid) ||
(!ignore_pInt && (((pIntid < GICV3_LPI_INTID_START) || (!ignore_pInt && (((pIntid < GICV3_LPI_INTID_START) ||
(pIntid > max_Intid)) && (pIntid != INTID_SPURIOUS)))) { (pIntid > max_Intid)) && (pIntid != INTID_SPURIOUS)))) {
@ -505,7 +505,7 @@ static bool process_mapc(GICv3ITSState *s, uint32_t offset)
valid = (value & CMD_FIELD_VALID_MASK); valid = (value & CMD_FIELD_VALID_MASK);
if ((icid > s->ct.maxids.max_collids) || (rdbase >= s->gicv3->num_cpu)) { if ((icid > s->ct.max_ids) || (rdbase >= s->gicv3->num_cpu)) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"ITS MAPC: invalid collection table attributes " "ITS MAPC: invalid collection table attributes "
"icid %d rdbase %" PRIu64 "\n", icid, rdbase); "icid %d rdbase %" PRIu64 "\n", icid, rdbase);
@ -618,7 +618,7 @@ static bool process_mapd(GICv3ITSState *s, uint64_t value, uint32_t offset)
valid = (value & CMD_FIELD_VALID_MASK); valid = (value & CMD_FIELD_VALID_MASK);
if ((devid > s->dt.maxids.max_devids) || if ((devid > s->dt.max_ids) ||
(size > FIELD_EX64(s->typer, GITS_TYPER, IDBITS))) { (size > FIELD_EX64(s->typer, GITS_TYPER, IDBITS))) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"ITS MAPD: invalid device table attributes " "ITS MAPD: invalid device table attributes "
@ -810,7 +810,7 @@ static void extract_table_params(GICv3ITSState *s)
(page_sz / s->dt.entry_sz)); (page_sz / s->dt.entry_sz));
} }
s->dt.maxids.max_devids = (1UL << (FIELD_EX64(s->typer, GITS_TYPER, s->dt.max_ids = (1UL << (FIELD_EX64(s->typer, GITS_TYPER,
DEVBITS) + 1)); DEVBITS) + 1));
s->dt.base_addr = baser_base_addr(value, page_sz); s->dt.base_addr = baser_base_addr(value, page_sz);
@ -842,11 +842,11 @@ static void extract_table_params(GICv3ITSState *s)
} }
if (FIELD_EX64(s->typer, GITS_TYPER, CIL)) { if (FIELD_EX64(s->typer, GITS_TYPER, CIL)) {
s->ct.maxids.max_collids = (1UL << (FIELD_EX64(s->typer, s->ct.max_ids = (1UL << (FIELD_EX64(s->typer,
GITS_TYPER, CIDBITS) + 1)); GITS_TYPER, CIDBITS) + 1));
} else { } else {
/* 16-bit CollectionId supported when CIL == 0 */ /* 16-bit CollectionId supported when CIL == 0 */
s->ct.maxids.max_collids = (1UL << 16); s->ct.max_ids = (1UL << 16);
} }
s->ct.base_addr = baser_base_addr(value, page_sz); s->ct.base_addr = baser_base_addr(value, page_sz);

5
include/hw/intc/arm_gicv3_its_common.h
View File

@ -47,10 +47,7 @@ typedef struct {
uint16_t entry_sz; uint16_t entry_sz;
uint32_t page_sz; uint32_t page_sz;
uint32_t max_entries; uint32_t max_entries;
union { uint32_t max_ids;
uint32_t max_devids;
uint32_t max_collids;
} maxids;
uint64_t base_addr; uint64_t base_addr;
} TableDesc; } TableDesc;