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_redist: Use set_pending_table_bit() in mov handling 

We can use our new set_pending_table_bit() utility function
in gicv3_redist_mov_lpi() to clear the bit in the source
pending table, rather than doing the "load, clear bit, store"
ourselves.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220408141550.1271295-34-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-04-08 15:15:42 +01:00
parent 932f0480d0
commit ab6ef25179
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/intc/arm_gicv3_redist.c
View File

@ -909,11 +909,9 @@ void gicv3_redist_mov_lpi(GICv3CPUState *src, GICv3CPUState *dest, int irq)
* we choose to NOP. If LPIs are disabled on source there's nothing * we choose to NOP. If LPIs are disabled on source there's nothing
* to be transferred anyway. * to be transferred anyway.
*/ */
AddressSpace *as = &src->gic->dma_as;
uint64_t idbits; uint64_t idbits;
uint32_t pendt_size; uint32_t pendt_size;
uint64_t src_baddr; uint64_t src_baddr;
uint8_t src_pend;
if (!(src->gicr_ctlr & GICR_CTLR_ENABLE_LPIS) || if (!(src->gicr_ctlr & GICR_CTLR_ENABLE_LPIS) ||
!(dest->gicr_ctlr & GICR_CTLR_ENABLE_LPIS)) { !(dest->gicr_ctlr & GICR_CTLR_ENABLE_LPIS)) {
@ -932,15 +930,10 @@ void gicv3_redist_mov_lpi(GICv3CPUState *src, GICv3CPUState *dest, int irq)
src_baddr = src->gicr_pendbaser & R_GICR_PENDBASER_PHYADDR_MASK; src_baddr = src->gicr_pendbaser & R_GICR_PENDBASER_PHYADDR_MASK;
address_space_read(as, src_baddr + (irq / 8), if (!set_pending_table_bit(src, src_baddr, irq, 0)) {
MEMTXATTRS_UNSPECIFIED, &src_pend, sizeof(src_pend));
if (!extract32(src_pend, irq % 8, 1)) {
/* Not pending on source, nothing to do */ /* Not pending on source, nothing to do */
return; return;
} }
src_pend &= ~(1 << (irq % 8));
address_space_write(as, src_baddr + (irq / 8),
MEMTXATTRS_UNSPECIFIED, &src_pend, sizeof(src_pend));
if (irq == src->hpplpi.irq) { if (irq == src->hpplpi.irq) {
/* /*
* We just made this LPI not-pending so only need to update * We just made this LPI not-pending so only need to update