mirror of
https://github.com/qemu/qemu.git
synced 2025-08-13 10:40:14 +00:00
intc/riscv_aplic: Fix target register read when source is inactive
The RISC-V Advanced interrupt Architecture: 4.5.16. Interrupt targets: If interrupt source i is inactive in this domain, register target[i] is read-only zero. Signed-off-by: Yang Jialong <z_bajeer@yeah.net> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> Message-ID: <20250728055114.252024-1-z_bajeer@yeah.net> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
f3c8b7767f
commit
b6f1244678
@ -628,7 +628,7 @@ static void riscv_aplic_request(void *opaque, int irq, int level)
|
||||
|
||||
static uint64_t riscv_aplic_read(void *opaque, hwaddr addr, unsigned size)
|
||||
{
|
||||
uint32_t irq, word, idc;
|
||||
uint32_t irq, word, idc, sm;
|
||||
RISCVAPLICState *aplic = opaque;
|
||||
|
||||
/* Reads must be 4 byte words */
|
||||
@ -696,6 +696,10 @@ static uint64_t riscv_aplic_read(void *opaque, hwaddr addr, unsigned size)
|
||||
} else if ((APLIC_TARGET_BASE <= addr) &&
|
||||
(addr < (APLIC_TARGET_BASE + (aplic->num_irqs - 1) * 4))) {
|
||||
irq = ((addr - APLIC_TARGET_BASE) >> 2) + 1;
|
||||
sm = aplic->sourcecfg[irq] & APLIC_SOURCECFG_SM_MASK;
|
||||
if (sm == APLIC_SOURCECFG_SM_INACTIVE) {
|
||||
return 0;
|
||||
}
|
||||
return aplic->target[irq];
|
||||
} else if (!aplic->msimode && (APLIC_IDC_BASE <= addr) &&
|
||||
(addr < (APLIC_IDC_BASE + aplic->num_harts * APLIC_IDC_SIZE))) {
|
||||
|
Loading…
Reference in New Issue
Block a user