Update the QEMU PLIC addresses
Subsystems (2)
v3 cover Update the QEMU PLIC addresses
This series updates the PLIC address to match the documentation. This fixes: https://github.com/riscv/opensbi/issues/97
V3:
- Fix SiFive U crash
V2:
- Squash patches to ensure biesctability
Alistair Francis (2):
riscv: plic: Fix incorrect irq calculation
riscv: plic: Log guest errors
hw/riscv/sifive_plic.c | 16 +++++++++++----- include/hw/riscv/sifive_e.h | 2 +- include/hw/riscv/sifive_u.h | 4 ++-- include/hw/riscv/virt.h | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-)
Signature · 1 line
2.21.0
PATCH v3 1/2 riscv: plic: Fix incorrect irq calculation
This patch fixes four different things, to maintain bisectability they have been merged into a single patch. The following fixes are below:
sifive_plic: Fix incorrect irq calculation
The irq is incorrectly calculated to be off by one. It has worked in the past as the priority_base offset has also been set incorrectly. We are about to fix the priority_base offset so first first the irq calculation.
sifive_u: Fix PLIC priority base offset and numbering According to the FU540 manual the PLIC source priority address starts at an offset of 0x04 and not 0x00. The same manual also specifies that the PLIC only has 53 source priorities. Fix these two incorrect header files.
We also need to over extend the plic_gpios[] array as the PLIC sources count from 1 and not 0.
riscv: sifive_e: Fix PLIC priority base offset
According to the FE31 manual the PLIC source priority address starts at an offset of 0x04 and not 0x00.
riscv: virt: Fix PLIC priority base offset
Update the virt offsets based on the newly updated SiFive U and SiFive E offsets.
--- hw/riscv/sifive_plic.c | 4 ++-- include/hw/riscv/sifive_e.h | 2 +- include/hw/riscv/sifive_u.h | 4 ++-- include/hw/riscv/virt.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
hw/riscv/sifive_plic.c +2 -2
@@ -207,7 +207,7 @@ static uint64_t sifive_plic_read(void *opaque, hwaddr addr, unsigned size)if (addr >= plic->priority_base &&/* 4 bytes per source */ addr < plic->priority_base + (plic->num_sources <<2 )) { -uint32_t irq = (addr - plic->priority_base) >>2 ; +uint32_t irq = ((addr - plic->priority_base) >>2 ) +1 ;if (RISCV_DEBUG_PLIC ) {qemu_log ("plic: read priority: irq=%d priority=%d\n" , irq, plic->source_priority[irq]);
@@ -280,7 +280,7 @@ static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value,if (addr >= plic->priority_base &&/* 4 bytes per source */ addr < plic->priority_base + (plic->num_sources <<2 )) { -uint32_t irq = (addr - plic->priority_base) >>2 ; +uint32_t irq = ((addr - plic->priority_base) >>2 ) +1 ; plic->source_priority[irq] = value &7 ;if (RISCV_DEBUG_PLIC ) { qemu_log("plic: write priority: irq=%d priority=%d\n",
include/hw/riscv/sifive_e.h +1 -1
@@ -70,7 +70,7 @@ enum {#define SIFIVE_E_PLIC_HART_CONFIG "M"#define SIFIVE_E_PLIC_NUM_SOURCES 127#define SIFIVE_E_PLIC_NUM_PRIORITIES 7 -#define SIFIVE_E_PLIC_PRIORITY_BASE 0x0 +#define SIFIVE_E_PLIC_PRIORITY_BASE 0x04#define SIFIVE_E_PLIC_PENDING_BASE 0x1000#define SIFIVE_E_PLIC_ENABLE_BASE 0x2000#define SIFIVE_E_PLIC_ENABLE_STRIDE 0x80
include/hw/riscv/sifive_u.h +2 -2
@@ -68,9 +68,9 @@ enum { };#define SIFIVE_U_PLIC_HART_CONFIG "MS" -#define SIFIVE_U_PLIC_NUM_SOURCES 127 +#define SIFIVE_U_PLIC_NUM_SOURCES 54#define SIFIVE_U_PLIC_NUM_PRIORITIES 7 -#define SIFIVE_U_PLIC_PRIORITY_BASE 0x0 +#define SIFIVE_U_PLIC_PRIORITY_BASE 0x04#define SIFIVE_U_PLIC_PENDING_BASE 0x1000#define SIFIVE_U_PLIC_ENABLE_BASE 0x2000#define SIFIVE_U_PLIC_ENABLE_STRIDE 0x80
include/hw/riscv/virt.h +1 -1
@@ -59,7 +59,7 @@ enum {#define VIRT_PLIC_HART_CONFIG "MS"#define VIRT_PLIC_NUM_SOURCES 127#define VIRT_PLIC_NUM_PRIORITIES 7 -#define VIRT_PLIC_PRIORITY_BASE 0x0 +#define VIRT_PLIC_PRIORITY_BASE 0x04#define VIRT_PLIC_PENDING_BASE 0x1000#define VIRT_PLIC_ENABLE_BASE 0x2000#define VIRT_PLIC_ENABLE_STRIDE 0x80
Signature · 1 line
2.21.0
PATCH v3 2/2 riscv: plic: Log guest errors
In reply to Alistair FrancisInstead of using error_report() to print guest errors let's use qemu_log_mask(LOG_GUEST_ERROR,...) to log the error.
--- hw/riscv/sifive_plic.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
hw/riscv/sifive_plic.c +9 -3
@@ -263,7 +263,9 @@ static uint64_t sifive_plic_read(void *opaque, hwaddr addr, unsigned size) } err: -error_report ("plic: invalid register read: %08x" , (uint32_t )addr); +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Invalid register read 0x%" HWADDR_PRIx"\n" , + __func__, addr);return 0 ; }
@@ -290,7 +292,9 @@ static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value, }else if (addr >= plic->pending_base &&/* 1 bit per source */ addr < plic->pending_base + (plic->num_sources >>3 )) { -error_report ("plic: invalid pending write: %08x" , (uint32_t )addr); +qemu_log_mask (LOG_GUEST_ERROR , +"%s: invalid pending write: 0x%" HWADDR_PRIx"" , + __func__, addr);return ; }else if (addr >= plic->enable_base &&/* 1 bit per source */ addr < plic->enable_base + plic->num_addrs * plic->enable_stride)
@@ -340,7 +344,9 @@ static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value, } err: -error_report ("plic: invalid register write: %08x" , (uint32_t )addr); +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Invalid register write 0x%" HWADDR_PRIx"\n" , + __func__, addr); }static const MemoryRegionOps sifive_plic_ops = {
Signature · 1 line
2.21.0