Skip to contentSkip to conversation

Fix PSIHB interrupts init PQ state

PATCH Applied Frederic Barrat 4 participants 7 messages Jul 3, 2023

lore
Share & tools
lore
#0 lore raw

v2 cover Fix PSIHB interrupts init PQ state

On P9 and 10, the real hardware defines the PQ state of the PSIHB interrupts to be 0b00. Qemu defaults to 0b01.

It doesn't matter to skiboot, which doesn't rely on it and explicitly masks the interrupts during intialization. But this patch fixes it, just in case some other hypervisor checks it.

Changelog:
v2: rename property/struct member
rebase to Daniel's ppc-next branch

Frederic Barrat (2):
pnv/xive: Add property on xive sources to define PQ state on reset pnv/psi: Initialize the PSIHB interrupts to match hardware

 hw/intc/xive.c        | 8 ++++++--
 hw/ppc/pnv_psi.c      | 2 ++
 include/hw/ppc/xive.h | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)
Signature · 1 line
2.41.0
#1 lore raw

PATCH v2 1/2 pnv/xive: Add property on xive sources to define PQ state on reset

The PQ state of a xive interrupt is always initialized to Q=1, which means the interrupt is disabled. Since a xive source can be embedded in many objects, this patch adds a property to allow that behavior to be refined if needed.

---
 hw/intc/xive.c        | 8 ++++++--
 include/hw/ppc/xive.h | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)
hw/intc/xive.c +6 -2
index 84c079b034..f60c878345 100644
@@ -1232,8 +1232,7 @@ static void xive_source_reset(void *dev)
 
     /* Do not clear the LSI bitmap */
 
-    /* PQs are initialized to 0b01 (Q=1) which corresponds to "ints off" */
-    memset(xsrc->status, XIVE_ESB_OFF, xsrc->nr_irqs);
+    memset(xsrc->status, xsrc->reset_pq, xsrc->nr_irqs);
 }
 
 static void xive_source_realize(DeviceState *dev, Error **errp)
@@ -1287,6 +1286,11 @@ static Property xive_source_properties[] = {
     DEFINE_PROP_UINT64("flags", XiveSource, esb_flags, 0),
     DEFINE_PROP_UINT32("nr-irqs", XiveSource, nr_irqs, 0),
     DEFINE_PROP_UINT32("shift", XiveSource, esb_shift, XIVE_ESB_64K_2PAGE),
+    /*
+     * By default, PQs are initialized to 0b01 (Q=1) which corresponds
+     * to "ints off"
+     */
+    DEFINE_PROP_UINT8("reset-pq", XiveSource, reset_pq, XIVE_ESB_OFF),
     DEFINE_PROP_LINK("xive", XiveSource, xive, TYPE_XIVE_NOTIFIER,
                      XiveNotifier *),
     DEFINE_PROP_END_OF_LIST(),
include/hw/ppc/xive.h +1 -0
index 3dfb06e002..9f580a2699 100644
@@ -187,6 +187,7 @@ struct XiveSource {
 
     /* PQ bits and LSI assertion bit */
     uint8_t         *status;
+    uint8_t         reset_pq; /* PQ state on reset */
 
     /* ESB memory region */
     uint64_t        esb_flags;
Signature · 1 line
2.41.0
Reviewed-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] pnv/xive: Add property on xive sources to define PQ state on reset

Quoted 6 lines · Frederic Barrat

The PQ state of a xive interrupt is always initialized to Q=1, which means the interrupt is disabled. Since a xive source can be embedded in many objects, this patch adds a property to allow that behavior to be refined if needed.

Thanks,

C.

Quoted 43 lines
---
  hw/intc/xive.c        | 8 ++++++--
  include/hw/ppc/xive.h | 1 +
  2 files changed, 7 insertions(+), 2 deletions(-)
hw/intc/xive.c +6 -2
index 84c079b034..f60c878345 100644
@@ -1232,8 +1232,7 @@ static void xive_source_reset(void *dev)
 
      /* Do not clear the LSI bitmap */
 
-    /* PQs are initialized to 0b01 (Q=1) which corresponds to "ints off" */
-    memset(xsrc->status, XIVE_ESB_OFF, xsrc->nr_irqs);
+    memset(xsrc->status, xsrc->reset_pq, xsrc->nr_irqs);
  }
 
  static void xive_source_realize(DeviceState *dev, Error **errp)
@@ -1287,6 +1286,11 @@ static Property xive_source_properties[] = {
      DEFINE_PROP_UINT64("flags", XiveSource, esb_flags, 0),
      DEFINE_PROP_UINT32("nr-irqs", XiveSource, nr_irqs, 0),
      DEFINE_PROP_UINT32("shift", XiveSource, esb_shift, XIVE_ESB_64K_2PAGE),
+    /*
+     * By default, PQs are initialized to 0b01 (Q=1) which corresponds
+     * to "ints off"
+     */
+    DEFINE_PROP_UINT8("reset-pq", XiveSource, reset_pq, XIVE_ESB_OFF),
      DEFINE_PROP_LINK("xive", XiveSource, xive, TYPE_XIVE_NOTIFIER,
                       XiveNotifier *),
      DEFINE_PROP_END_OF_LIST(),
include/hw/ppc/xive.h +1 -0
index 3dfb06e002..9f580a2699 100644
@@ -187,6 +187,7 @@ struct XiveSource {
 
      /* PQ bits and LSI assertion bit */
      uint8_t         *status;
+    uint8_t         reset_pq; /* PQ state on reset */
 
      /* ESB memory region */
      uint64_t        esb_flags;
#3 lore raw

PATCH v2 2/2 pnv/psi: Initialize the PSIHB interrupts to match hardware

In reply to Frederic Barrat

On the powernv9 and powernv10 machines, the PSIHB interrupts are currently initialized with a PQ state of 0b01, i.e. interrupts are disabled. However real hardware initializes them to 0b00 for the PSIHB. This patch updates it, in case an hypervisor is in the mood of checking it.

---
 hw/ppc/pnv_psi.c | 2 ++
 1 file changed, 2 insertions(+)
hw/ppc/pnv_psi.c +2 -0
index 46da58dff8..daaa2f0575 100644
@@ -863,6 +863,8 @@ static void pnv_psi_power9_realize(DeviceState *dev, Error **errp)
     object_property_set_int(OBJECT(xsrc), "nr-irqs", PSIHB9_NUM_IRQS,
                             &error_fatal);
     object_property_set_link(OBJECT(xsrc), "xive", OBJECT(psi), &error_abort);
+    object_property_set_int(OBJECT(xsrc), "reset-pq", XIVE_ESB_RESET,
+                            &error_abort);
     if (!qdev_realize(DEVICE(xsrc), NULL, errp)) {
         return;
     }
Signature · 1 line
2.41.0
Reviewed-by on v2 2/2
#4 lore raw

Re: [PATCH v2 2/2] pnv/psi: Initialize the PSIHB interrupts to match hardware

Quoted 7 lines · Frederic Barrat

On the powernv9 and powernv10 machines, the PSIHB interrupts are currently initialized with a PQ state of 0b01, i.e. interrupts are disabled. However real hardware initializes them to 0b00 for the PSIHB. This patch updates it, in case an hypervisor is in the mood of checking it.

Thanks,

C.

Quoted 17 lines
---
  hw/ppc/pnv_psi.c | 2 ++
  1 file changed, 2 insertions(+)
hw/ppc/pnv_psi.c +2 -0
index 46da58dff8..daaa2f0575 100644
@@ -863,6 +863,8 @@ static void pnv_psi_power9_realize(DeviceState *dev, Error **errp)
      object_property_set_int(OBJECT(xsrc), "nr-irqs", PSIHB9_NUM_IRQS,
                              &error_fatal);
      object_property_set_link(OBJECT(xsrc), "xive", OBJECT(psi), &error_abort);
+    object_property_set_int(OBJECT(xsrc), "reset-pq", XIVE_ESB_RESET,
+                            &error_abort);
      if (!qdev_realize(DEVICE(xsrc), NULL, errp)) {
          return;
      }
#6 lore raw
In reply to Frederic Barrat

Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,

Daniel

Quoted 21 lines · Frederic Barrat

On P9 and 10, the real hardware defines the PQ state of the PSIHB interrupts to be 0b00. Qemu defaults to 0b01.

It doesn't matter to skiboot, which doesn't rely on it and explicitly masks the interrupts during intialization. But this patch fixes it, just in case some other hypervisor checks it.

Changelog:
v2: rename property/struct member
rebase to Daniel's ppc-next branch

Frederic Barrat (2):
pnv/xive: Add property on xive sources to define PQ state on reset pnv/psi: Initialize the PSIHB interrupts to match hardware

  hw/intc/xive.c        | 8 ++++++--
  hw/ppc/pnv_psi.c      | 2 ++
  include/hw/ppc/xive.h | 1 +
  3 files changed, 9 insertions(+), 2 deletions(-)