[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/38] hw/intc/arm_gicv3_its: Don't use data if reading command fa
From: |
Peter Maydell |
Subject: |
[PULL 28/38] hw/intc/arm_gicv3_its: Don't use data if reading command failed |
Date: |
Thu, 20 Jan 2022 12:36:20 +0000 |
In process_cmdq(), we read 64 bits of the command packet, which
contain the command identifier, which we then switch() on to dispatch
to an appropriate sub-function. However, if address_space_ldq_le()
reports a memory transaction failure, we still read the command
identifier out of the data and switch() on it. Restructure the code
so that we stop immediately (stalling the command queue) in this
case.
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-5-peter.maydell@linaro.org
---
hw/intc/arm_gicv3_its.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c
index a6c2299a091..c1f76682d04 100644
--- a/hw/intc/arm_gicv3_its.c
+++ b/hw/intc/arm_gicv3_its.c
@@ -672,8 +672,13 @@ static void process_cmdq(GICv3ITSState *s)
data = address_space_ldq_le(as, s->cq.base_addr + cq_offset,
MEMTXATTRS_UNSPECIFIED, &res);
if (res != MEMTX_OK) {
- result = false;
+ s->creadr = FIELD_DP64(s->creadr, GITS_CREADR, STALLED, 1);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: could not read command at 0x%" PRIx64 "\n",
+ __func__, s->cq.base_addr + cq_offset);
+ break;
}
+
cmd = (data & CMD_MASK);
switch (cmd) {
--
2.25.1
- [PULL 04/38] hw/net: Move MV88W8618 network device out of hw/arm/ directory, (continued)
- [PULL 04/38] hw/net: Move MV88W8618 network device out of hw/arm/ directory, Peter Maydell, 2022/01/20
- [PULL 03/38] hw/arm/musicpal: Fix coding style of code related to MV88W8618 device, Peter Maydell, 2022/01/20
- [PULL 16/38] hw/arm/virt: Add a control for the the highmem PCIe MMIO, Peter Maydell, 2022/01/20
- [PULL 13/38] hw/arm/virt: Support for virtio-mem-pci, Peter Maydell, 2022/01/20
- [PULL 10/38] tests/acpi/bios-table-test: Update expected virt/PPTT file, Peter Maydell, 2022/01/20
- [PULL 11/38] docs/can: convert to restructuredText, Peter Maydell, 2022/01/20
- [PULL 15/38] hw/intc/arm_gic: Allow reset of the running priority, Peter Maydell, 2022/01/20
- [PULL 21/38] hw/arm/virt: Drop superfluous checks against highmem, Peter Maydell, 2022/01/20
- [PULL 24/38] hw/arm/aspeed: Add the i3c device to the AST2600 SoC, Peter Maydell, 2022/01/20
- [PULL 36/38] hw/intc/arm_gicv3_its: Check indexes before use, not after, Peter Maydell, 2022/01/20
- [PULL 28/38] hw/intc/arm_gicv3_its: Don't use data if reading command failed,
Peter Maydell <=
- [PULL 30/38] hw/intc/arm_gicv3_its: Fix return codes in process_its_cmd(), Peter Maydell, 2022/01/20
- [PULL 19/38] hw/arm/virt: Use the PA range to compute the memory map, Peter Maydell, 2022/01/20
- [PULL 27/38] hw/intc/arm_gicv3_its: Fix handling of process_its_cmd() return value, Peter Maydell, 2022/01/20
- [PULL 25/38] hw/intc/arm_gicv3_its: Fix event ID bounds checks, Peter Maydell, 2022/01/20
- [PULL 26/38] hw/intc/arm_gicv3_its: Convert int ID check to num_intids convention, Peter Maydell, 2022/01/20
- [PULL 32/38] hw/intc/arm_gicv3_its: Fix return codes in process_mapti(), Peter Maydell, 2022/01/20
- [PULL 33/38] hw/intc/arm_gicv3_its: Fix return codes in process_mapc(), Peter Maydell, 2022/01/20
- [PULL 37/38] hw/intc/arm_gicv3_its: Range-check ICID before indexing into collection table, Peter Maydell, 2022/01/20
- [PULL 38/38] hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR, Peter Maydell, 2022/01/20