Skip to contentSkip to conversation

Update the QEMU PLIC addresses

PATCH Superseded Alistair Francis 4 participants 14 messages Mar 21, 2019 – Mar 29, 2019 1 message not in the archive

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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

Alistair Francis (5):
riscv: plic: Fix incorrect irq calculation
riscv: sifive_u: Fix PLIC priority base offset and numbering
riscv: sifive_e: Fix PLIC priority base offset
riscv: virt: Fix PLIC priority base offset
riscv: plic: Log guest errors

 hw/riscv/sifive_plic.c      | 16 +++++++++++-----
 hw/riscv/sifive_u.c         |  2 +-
 include/hw/riscv/sifive_e.h |  2 +-
 include/hw/riscv/sifive_u.h |  4 ++--
 include/hw/riscv/virt.h     |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/5 riscv: 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.

---
 hw/riscv/sifive_plic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/sifive_plic.c +2 -2
index 1c703e1a37..70a85cd075 100644
@@ -206,7 +206,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]);
@@ -279,7 +279,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",
Signature · 1 line
2.21.0
#2 lore raw

Re: [Qemu-riscv] [PATCH for 4.0 v1 1/5] riscv: plic: Fix incorrect irq calculation

Quoted 24 lines · Alistair Francis

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.

---
 hw/riscv/sifive_plic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/sifive_plic.c +1 -1
index 1c703e1a37..70a85cd075 100644
@@ -206,7 +206,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]);

hw/riscv/sifive_plic.c static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value, · line 285

Quoted 8 lines
hw/riscv/sifive_plic.c +1 -1
@@ -279,7 +279,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",

I think this breaks bisectability and should be merged with the *_PLIC_PRIORITY_BASE modifications as otherwise we'll end up the priority being set for the brong IRQ.

I'm also not sure how this fixes the bug listed in the OpenSBI PR. As far as I can understand it, all this does is ensure that source 0 is actually treated as illegal (and shrinks the number of sources to match what's actually there, but that shouldn't fix the bug). That looks more like a cleanup than an actual fix.

Am I missing something?

#3 lore raw

Re: [Qemu-riscv] [PATCH for 4.0 v1 1/5] riscv: plic: Fix incorrect irq calculation

Quoted 30 lines · Palmer Dabbelt
Quoted 28 lines · Alistair Francis

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.

---
 hw/riscv/sifive_plic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/sifive_plic.c +1 -2
index 1c703e1a37..70a85cd075 100644
@@ -206,7 +206,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]);
@@ -279,7 +279,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;
Quoted 8 lines

hw/riscv/sifive_plic.c static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value, · line 285

Quoted 4 lines
hw/riscv/sifive_plic.c +1 -0
+        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",

I think this breaks bisectability and should be merged with the *_PLIC_PRIORITY_BASE modifications as otherwise we'll end up the priority being set for the brong IRQ.

Good point, I can merge them together.

Quoted 5 lines

I'm also not sure how this fixes the bug listed in the OpenSBI PR. As far as I can understand it, all this does is ensure that source 0 is actually treated as illegal (and shrinks the number of sources to match what's actually there, but that shouldn't fix the bug). That looks more like a cleanup than an actual fix.

The problem is that before we where off by one. We supported 0 - (n -
1) and this patch set changes QEMU to support 1 - n. This is because of the "addr < plic->priority_base + (plic->num_sources << 2)" comparison. As priority_base is now 0x04 instead of 0x00 the comparison will work correctly.

Alistair

Quoted 2 lines

Am I missing something?

#4 lore raw

Re: [Qemu-riscv] [PATCH for 4.0 v1 1/5] riscv: plic: Fix incorrect irq calculation

Quoted 48 lines · On Wed, 27 Mar 2019 09:29:56 PDT (-0700), [email protected] wrote:
Quoted 30 lines · Palmer Dabbelt
Quoted 28 lines · Alistair Francis

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.

---
 hw/riscv/sifive_plic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/sifive_plic.c +1 -2
index 1c703e1a37..70a85cd075 100644
@@ -206,7 +206,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]);
@@ -279,7 +279,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;
Quoted 8 lines

hw/riscv/sifive_plic.c static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value, · line 285

Quoted 4 lines
hw/riscv/sifive_plic.c +1 -0
+        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",

I think this breaks bisectability and should be merged with the *_PLIC_PRIORITY_BASE modifications as otherwise we'll end up the priority being set for the brong IRQ.

Good point, I can merge them together.

Quoted 5 lines

I'm also not sure how this fixes the bug listed in the OpenSBI PR. As far as I can understand it, all this does is ensure that source 0 is actually treated as illegal (and shrinks the number of sources to match what's actually there, but that shouldn't fix the bug). That looks more like a cleanup than an actual fix.

Quoted 5 lines

The problem is that before we where off by one. We supported 0 - (n -
1) and this patch set changes QEMU to support 1 - n. This is because of the "addr < plic->priority_base + (plic->num_sources << 2)" comparison. As priority_base is now 0x04 instead of 0x00 the comparison will work correctly.

So something in OpenSBI is going through the entire set of sources and initializing the priorities? That makes sense for the off-by-one, I was just wondering because the array shrank so the specific offset in that error would still be invalid with the new patch set.

Quoted 5 lines

Alistair

Quoted 2 lines

Am I missing something?

#5 lore raw

Re: [Qemu-riscv] [PATCH for 4.0 v1 1/5] riscv: plic: Fix incorrect irq calculation

Quoted 56 lines · Palmer Dabbelt
Quoted 48 lines · On Wed, 27 Mar 2019 09:29:56 PDT (-0700), [email protected] wrote:
Quoted 30 lines · Palmer Dabbelt
Quoted 28 lines · Alistair Francis

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.

---
 hw/riscv/sifive_plic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/sifive_plic.c +1 -2
index 1c703e1a37..70a85cd075 100644
@@ -206,7 +206,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]);
@@ -279,7 +279,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;
Quoted 8 lines

hw/riscv/sifive_plic.c static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value, · line 285

Quoted 4 lines
hw/riscv/sifive_plic.c +1 -0
+        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",

I think this breaks bisectability and should be merged with the *_PLIC_PRIORITY_BASE modifications as otherwise we'll end up the priority being set for the brong IRQ.

Good point, I can merge them together.

Quoted 5 lines

I'm also not sure how this fixes the bug listed in the OpenSBI PR. As far as I can understand it, all this does is ensure that source 0 is actually treated as illegal (and shrinks the number of sources to match what's actually there, but that shouldn't fix the bug). That looks more like a cleanup than an actual fix.

Quoted 5 lines

The problem is that before we where off by one. We supported 0 - (n -
1) and this patch set changes QEMU to support 1 - n. This is because of the "addr < plic->priority_base + (plic->num_sources << 2)" comparison. As priority_base is now 0x04 instead of 0x00 the comparison will work correctly.

Quoted 4 lines

So something in OpenSBI is going through the entire set of sources and initializing the priorities? That makes sense for the off-by-one, I was just wondering because the array shrank so the specific offset in that error would still be invalid with the new patch set.

Yep, that is what caught this. The array only shrinks for the FU540 board, the virt board doesn't shrink and that is the board that OpenSBI caught the bug with.

Alistair

Quoted 6 lines
Quoted 6 lines

Alistair

Quoted 2 lines

Am I missing something?

#6 lore raw

Re: [Qemu-riscv] [PATCH for 4.0 v1 1/5] riscv: plic: Fix incorrect irq calculation

Quoted 57 lines · On Thu, 28 Mar 2019 10:34:08 PDT (-0700), [email protected] wrote:
Quoted 56 lines · Palmer Dabbelt
Quoted 53 lines · On Wed, 27 Mar 2019 09:29:56 PDT (-0700), [email protected] wrote:
Quoted 30 lines · Palmer Dabbelt
Quoted 28 lines · Alistair Francis

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.

---
 hw/riscv/sifive_plic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/riscv/sifive_plic.c +1 -2
index 1c703e1a37..70a85cd075 100644
@@ -206,7 +206,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]);
@@ -279,7 +279,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;
Quoted 8 lines

hw/riscv/sifive_plic.c static void sifive_plic_write(void *opaque, hwaddr addr, uint64_t value, · line 285

Quoted 4 lines
hw/riscv/sifive_plic.c +1 -0
+        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",

I think this breaks bisectability and should be merged with the *_PLIC_PRIORITY_BASE modifications as otherwise we'll end up the priority being set for the brong IRQ.

Good point, I can merge them together.

Quoted 5 lines

I'm also not sure how this fixes the bug listed in the OpenSBI PR. As far as I can understand it, all this does is ensure that source 0 is actually treated as illegal (and shrinks the number of sources to match what's actually there, but that shouldn't fix the bug). That looks more like a cleanup than an actual fix.

The problem is that before we where off by one. We supported 0 - (n -
1) and this patch set changes QEMU to support 1 - n. This is because of the "addr < plic->priority_base + (plic->num_sources << 2)" comparison. As priority_base is now 0x04 instead of 0x00 the comparison will work correctly.

Quoted 8 lines
Quoted 4 lines

So something in OpenSBI is going through the entire set of sources and initializing the priorities? That makes sense for the off-by-one, I was just wondering because the array shrank so the specific offset in that error would still be invalid with the new patch set.

Yep, that is what caught this. The array only shrinks for the FU540 board, the virt board doesn't shrink and that is the board that OpenSBI caught the bug with.

OK, that makes sense.

Quoted 9 lines

Alistair

Quoted 6 lines
Quoted 6 lines

Alistair

Quoted 2 lines

Am I missing something?

#7 lore raw

PATCH 2/5 riscv: sifive_u: Fix PLIC priority base offset and numbering

In reply to Alistair Francis

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.

---
 hw/riscv/sifive_u.c         | 2 +-
 include/hw/riscv/sifive_u.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
hw/riscv/sifive_u.c +1 -1
index 5ecc47cea3..88381a7507 100644
@@ -340,7 +340,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)
     const struct MemmapEntry *memmap = sifive_u_memmap;
     MemoryRegion *system_memory = get_system_memory();
     MemoryRegion *mask_rom = g_new(MemoryRegion, 1);
-    qemu_irq plic_gpios[SIFIVE_U_PLIC_NUM_SOURCES];
+    qemu_irq plic_gpios[SIFIVE_U_PLIC_NUM_SOURCES + 1];
     int i;
     Error *err = NULL;
     NICInfo *nd = &nd_table[0];
include/hw/riscv/sifive_u.h +2 -2
index be13cc1304..d859ea20f6 100644
@@ -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 53
 #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
Signature · 1 line
2.21.0
#8 lore raw

PATCH 3/5 riscv: sifive_e: Fix PLIC priority base offset

In reply to Alistair Francis

According to the FE31 manual the PLIC source priority address starts at an offset of 0x04 and not 0x00.

---
 include/hw/riscv/sifive_e.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/riscv/sifive_e.h +1 -1
index 7b6d8aed96..f715f8606f 100644
@@ -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
Signature · 1 line
2.21.0
#9 lore raw

PATCH 4/5 riscv: virt: Fix PLIC priority base offset

In reply to Alistair Francis

Update the virt offsets based on the newly updated SiFive U and SiFive E offsets.

---
 include/hw/riscv/virt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/riscv/virt.h +1 -1
index f12deaebd6..568764b570 100644
@@ -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
#10 lore raw

PATCH 5/5 riscv: plic: Log guest errors

In reply to Alistair Francis

Instead 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
index 70a85cd075..7f373d6c9d 100644
@@ -262,7 +262,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;
 }
 
@@ -289,7 +291,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)
@@ -339,7 +343,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
#11 lore raw
In reply to Alistair Francis
Quoted 11 lines · Alistair Francis

This series updates the PLIC address to match the documentation.

This fixes: https://github.com/riscv/opensbi/issues/97

Alistair Francis (5):
riscv: plic: Fix incorrect irq calculation
riscv: sifive_u: Fix PLIC priority base offset and numbering
riscv: sifive_e: Fix PLIC priority base offset
riscv: virt: Fix PLIC priority base offset
riscv: plic: Log guest errors

Ping! Can this make it into 4.0?

Alistair

Quoted 11 lines
 hw/riscv/sifive_plic.c      | 16 +++++++++++-----
 hw/riscv/sifive_u.c         |  2 +-
 include/hw/riscv/sifive_e.h |  2 +-
 include/hw/riscv/sifive_u.h |  4 ++--
 include/hw/riscv/virt.h     |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

--
2.21.0

#12 lore raw
Quoted 7 lines · On Tue, 26 Mar 2019 15:19:25 PDT (-0700), [email protected] wrote:
Quoted 5 lines · Alistair Francis

This series updates the PLIC address to match the documentation.

This fixes: https://github.com/riscv/opensbi/issues/97

Quoted 8 lines
Quoted 6 lines

Alistair Francis (5):
riscv: plic: Fix incorrect irq calculation
riscv: sifive_u: Fix PLIC priority base offset and numbering
riscv: sifive_e: Fix PLIC priority base offset
riscv: virt: Fix PLIC priority base offset
riscv: plic: Log guest errors

Ping! Can this make it into 4.0?

Sorry, I missed this one. I'll take a look.

Quoted 14 lines

Alistair

Quoted 11 lines
 hw/riscv/sifive_plic.c      | 16 +++++++++++-----
 hw/riscv/sifive_u.c         |  2 +-
 include/hw/riscv/sifive_e.h |  2 +-
 include/hw/riscv/sifive_u.h |  4 ++--
 include/hw/riscv/virt.h     |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

--
2.21.0

A message that is not in the archive (sent off-list or not yet received): [email protected]

#14 lore raw

Re: [Qemu-riscv] [Qemu-devel] [PATCH for 4.0 v1 5/5] riscv: plic: Log guest errors

Le jeu. 21 mars 2019 02:00, Alistair Francis <[email protected]> a écrit :

Quoted 47 lines

Instead 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 +6 -2
index 70a85cd075..7f373d6c9d 100644
@@ -262,7 +262,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;
 }
@@ -289,7 +291,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)
hw/riscv/sifive_plic.c +3 -1
@@ -339,7 +343,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);
 }
 
Quoted 4 lines

static const MemoryRegionOps sifive_plic_ops = {
--
2.21.0

Quoted 1 line