Skip to contentSkip to conversation

spapr/xive: Use the xics flag to check for XIVE-only IRQ backends

PATCH Applied Cédric Le Goater 2 participants 4 messages Aug 20, 2020 – Aug 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 spapr/xive: Use the xics flag to check for XIVE-only IRQ backends

The sPAPR machine has four different IRQ backends, each implementing the XICS or XIVE interrupt mode or both in the case of the 'dual' backend.

If a machine is started in P8 compat mode, QEMU should necessarily support the XICS interrupt mode and in that case, the XIVE-only IRQ backend is invalid. Currently, spapr_irq_check() tests the pointer value to the IRQ backend to check for this condition, instead use the 'xics' flag. It's equivalent and it will ease the introduction of new XIVE-only IRQ backends if needed.

---
 hw/ppc/spapr_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/spapr_irq.c +1 -1
index 80cf1c3d6bb2..d036c8fef519 100644
@@ -172,7 +172,7 @@ static int spapr_irq_check(SpaprMachineState *spapr, Error **errp)
          * To cover both and not confuse the OS, add an early failure in
          * QEMU.
          */
-        if (spapr->irq == &spapr_irq_xive) {
+        if (!spapr->irq->xics) {
             error_setg(errp, "XIVE-only machines require a POWER9 CPU");
             return -1;
         }
Signature · 1 line
2.25.4
Applied
#1 lore raw
Quoted 4 lines · Cédric Le Goater

The sPAPR machine has four different IRQ backends, each implementing the XICS or XIVE interrupt mode or both in the case of the 'dual' backend.

Quoted 8 lines

If a machine is started in P8 compat mode, QEMU should necessarily support the XICS interrupt mode and in that case, the XIVE-only IRQ backend is invalid. Currently, spapr_irq_check() tests the pointer value to the IRQ backend to check for this condition, instead use the 'xics' flag. It's equivalent and it will ease the introduction of new XIVE-only IRQ backends if needed.

Thanks, applied to ppc-for-5.2.

I still kind of want to remove the last vestiges of those "backends", but I'm unlikely to have time to do so soon.

Quoted 17 lines
---
 hw/ppc/spapr_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/spapr_irq.c +1 -1
index 80cf1c3d6bb2..d036c8fef519 100644
@@ -172,7 +172,7 @@ static int spapr_irq_check(SpaprMachineState *spapr, Error **errp)
          * To cover both and not confuse the OS, add an early failure in
          * QEMU.
          */
-        if (spapr->irq == &spapr_irq_xive) {
+        if (!spapr->irq->xics) {
             error_setg(errp, "XIVE-only machines require a POWER9 CPU");
             return -1;
         }
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
#2 lore raw
Quoted 12 lines · David Gibson
Quoted 11 lines · Cédric Le Goater

The sPAPR machine has four different IRQ backends, each implementing the XICS or XIVE interrupt mode or both in the case of the 'dual' backend.

If a machine is started in P8 compat mode, QEMU should necessarily support the XICS interrupt mode and in that case, the XIVE-only IRQ backend is invalid. Currently, spapr_irq_check() tests the pointer value to the IRQ backend to check for this condition, instead use the 'xics' flag. It's equivalent and it will ease the introduction of new XIVE-only IRQ backends if needed.

Quoted 6 lines
Quoted 1 line

Thanks, applied to ppc-for-5.2.

I still kind of want to remove the last vestiges of those "backends", but I'm unlikely to have time to do so soon.

What did you have in mind ?

Move the 'xics' and 'xive' flags directly under the spapr machine ? It would add state.

C.

Quoted 19 lines
Quoted 18 lines
---
 hw/ppc/spapr_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/spapr_irq.c +1 -1
index 80cf1c3d6bb2..d036c8fef519 100644
@@ -172,7 +172,7 @@ static int spapr_irq_check(SpaprMachineState *spapr, Error **errp)
          * To cover both and not confuse the OS, add an early failure in
          * QEMU.
          */
-        if (spapr->irq == &spapr_irq_xive) {
+        if (!spapr->irq->xics) {
             error_setg(errp, "XIVE-only machines require a POWER9 CPU");
             return -1;
         }
#3 lore raw
Quoted 17 lines · Cédric Le Goater
Quoted 16 lines · David Gibson
Quoted 4 lines · Cédric Le Goater

The sPAPR machine has four different IRQ backends, each implementing the XICS or XIVE interrupt mode or both in the case of the 'dual' backend.

Quoted 8 lines

If a machine is started in P8 compat mode, QEMU should necessarily support the XICS interrupt mode and in that case, the XIVE-only IRQ backend is invalid. Currently, spapr_irq_check() tests the pointer value to the IRQ backend to check for this condition, instead use the 'xics' flag. It's equivalent and it will ease the introduction of new XIVE-only IRQ backends if needed.

Thanks, applied to ppc-for-5.2.

Quoted 7 lines
Quoted 2 lines

I still kind of want to remove the last vestiges of those "backends", but I'm unlikely to have time to do so soon.

What did you have in mind ?

Move the 'xics' and 'xive' flags directly under the spapr machine ? It would add state.

Looking at my draft patches, looks like I was planning to replace the flags with spapr caps. IIRC there was migration breakage with my draft, though, can't remember what would be needed to fix it.

Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson