diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2022-02-01 19:32:04 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2022-02-08 10:56:29 +0000 |
commit | da4680ce3a03b0cc13fe7a2b98b815c039517f26 (patch) | |
tree | 922f06459a93764c2c74dfd3e6155b43c78724e2 /include/hw/intc/arm_gicv3_its_common.h | |
parent | 7eb54267f243a336deaf3c806a5b5422365ee861 (diff) | |
download | qemu-da4680ce3a03b0cc13fe7a2b98b815c039517f26.zip qemu-da4680ce3a03b0cc13fe7a2b98b815c039517f26.tar.gz qemu-da4680ce3a03b0cc13fe7a2b98b815c039517f26.tar.bz2 |
hw/intc/arm_gicv3_its: Drop TableDesc and CmdQDesc valid fields
Currently we track in the TableDesc and CmdQDesc structs the state of
the GITS_BASER<n> and GITS_CBASER Valid bits. However we aren't very
consistent abut checking the valid field: we test it in update_cte()
and update_dte(), but not anywhere else we look things up in tables.
The GIC specification says that it is UNPREDICTABLE if a guest fails
to set any of these Valid bits before enabling the ITS via
GITS_CTLR.Enabled. So we can choose to handle Valid == 0 as
equivalent to a zero-length table. This is in fact how we're already
catching this case in most of the table-access paths: when Valid is 0
we leave the num_entries fields in TableDesc or CmdQDesc set to zero,
and then the out-of-bounds check "index >= num_entries" that we have
to do anyway before doing any of these table lookups will always be
true, catching the no-valid-table case without any extra code.
So we can remove the checks on the valid field from update_cte()
and update_dte(): since these happen after the bounds check there
was never any case when the test could fail. That means the valid
fields would be entirely unused, so just remove them.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220201193207.2771604-11-peter.maydell@linaro.org
Diffstat (limited to 'include/hw/intc/arm_gicv3_its_common.h')
-rw-r--r-- | include/hw/intc/arm_gicv3_its_common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/hw/intc/arm_gicv3_its_common.h b/include/hw/intc/arm_gicv3_its_common.h index 3e2ad2d..0f13049 100644 --- a/include/hw/intc/arm_gicv3_its_common.h +++ b/include/hw/intc/arm_gicv3_its_common.h @@ -42,7 +42,6 @@ #define GITS_TRANSLATER 0x0040 typedef struct { - bool valid; bool indirect; uint16_t entry_sz; uint32_t page_sz; @@ -51,7 +50,6 @@ typedef struct { } TableDesc; typedef struct { - bool valid; uint32_t num_entries; uint64_t base_addr; } CmdQDesc; |