qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@kaod.org>
To: <qemu-ppc@nongnu.org>, <qemu-devel@nongnu.org>
Cc: "Frederic Barrat" <fbarrat@linux.ibm.com>,
	"Daniel Henrique Barboza" <danielhb413@gmail.com>,
	"Greg Kurz" <groug@kaod.org>, "Cédric Le Goater" <clg@kaod.org>
Subject: [PATCH v2 06/19] ppc/pnv: Use QOM hierarchy to scan PHB3 devices
Date: Mon, 13 Dec 2021 14:28:17 +0100	[thread overview]
Message-ID: <20211213132830.108372-7-clg@kaod.org> (raw)
In-Reply-To: <20211213132830.108372-1-clg@kaod.org>

When -nodefaults is supported for PHB3 devices, the phbs array under
the chip will be empty. This will break the XICSFabric handlers, and
all interrupt delivery, and the 'info pic' HMP command.

Do a QOM loop on the chip children and look for PHB3 devices instead.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 hw/ppc/pnv.c | 72 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 65196a2a5d00..cbc3f8ed62f7 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -638,16 +638,25 @@ static ISABus *pnv_isa_create(PnvChip *chip, Error **errp)
     return PNV_CHIP_GET_CLASS(chip)->isa_create(chip, errp);
 }
 
+static int pnv_chip_power8_pic_print_info_child(Object *child, void *opaque)
+{
+    Monitor *mon = opaque;
+    PnvPHB3 *phb3 = (PnvPHB3 *) object_dynamic_cast(child, TYPE_PNV_PHB3);
+
+    if (phb3) {
+        pnv_phb3_msi_pic_print_info(&phb3->msis, mon);
+        ics_pic_print_info(&phb3->lsis, mon);
+    }
+    return 0;
+}
+
 static void pnv_chip_power8_pic_print_info(PnvChip *chip, Monitor *mon)
 {
     Pnv8Chip *chip8 = PNV8_CHIP(chip);
-    int i;
 
     ics_pic_print_info(&chip8->psi.ics, mon);
-    for (i = 0; i < chip->num_phbs; i++) {
-        pnv_phb3_msi_pic_print_info(&chip8->phbs[i].msis, mon);
-        ics_pic_print_info(&chip8->phbs[i].lsis, mon);
-    }
+    object_child_foreach(OBJECT(chip),
+                         pnv_chip_power8_pic_print_info_child, mon);
 }
 
 static void pnv_chip_power9_pic_print_info(PnvChip *chip, Monitor *mon)
@@ -1789,10 +1798,32 @@ PowerPCCPU *pnv_chip_find_cpu(PnvChip *chip, uint32_t pir)
     return NULL;
 }
 
+typedef struct ForeachPhb3Args {
+    int irq;
+    ICSState *ics;
+} ForeachPhb3Args;
+
+static int pnv_ics_get_child(Object *child, void *opaque)
+{
+    ForeachPhb3Args *args = opaque;
+    PnvPHB3 *phb3 = (PnvPHB3 *) object_dynamic_cast(child, TYPE_PNV_PHB3);
+
+    if (phb3) {
+        if (ics_valid_irq(&phb3->lsis, args->irq)) {
+            args->ics = &phb3->lsis;
+        }
+        if (ics_valid_irq(ICS(&phb3->msis), args->irq)) {
+            args->ics = ICS(&phb3->msis);
+        }
+    }
+    return args->ics ? 1 : 0;
+}
+
 static ICSState *pnv_ics_get(XICSFabric *xi, int irq)
 {
     PnvMachineState *pnv = PNV_MACHINE(xi);
-    int i, j;
+    ForeachPhb3Args args = { irq, NULL };
+    int i;
 
     for (i = 0; i < pnv->num_chips; i++) {
         PnvChip *chip = pnv->chips[i];
@@ -1801,32 +1832,37 @@ static ICSState *pnv_ics_get(XICSFabric *xi, int irq)
         if (ics_valid_irq(&chip8->psi.ics, irq)) {
             return &chip8->psi.ics;
         }
-        for (j = 0; j < chip->num_phbs; j++) {
-            if (ics_valid_irq(&chip8->phbs[j].lsis, irq)) {
-                return &chip8->phbs[j].lsis;
-            }
-            if (ics_valid_irq(ICS(&chip8->phbs[j].msis), irq)) {
-                return ICS(&chip8->phbs[j].msis);
-            }
+
+        object_child_foreach(OBJECT(chip), pnv_ics_get_child, &args);
+        if (args.ics) {
+            return args.ics;
         }
     }
     return NULL;
 }
 
+static int pnv_ics_resend_child(Object *child, void *opaque)
+{
+    PnvPHB3 *phb3 = (PnvPHB3 *) object_dynamic_cast(child, TYPE_PNV_PHB3);
+
+    if (phb3) {
+        ics_resend(&phb3->lsis);
+        ics_resend(ICS(&phb3->msis));
+    }
+    return 0;
+}
+
 static void pnv_ics_resend(XICSFabric *xi)
 {
     PnvMachineState *pnv = PNV_MACHINE(xi);
-    int i, j;
+    int i;
 
     for (i = 0; i < pnv->num_chips; i++) {
         PnvChip *chip = pnv->chips[i];
         Pnv8Chip *chip8 = PNV8_CHIP(pnv->chips[i]);
 
         ics_resend(&chip8->psi.ics);
-        for (j = 0; j < chip->num_phbs; j++) {
-            ics_resend(&chip8->phbs[j].lsis);
-            ics_resend(ICS(&chip8->phbs[j].msis));
-        }
+        object_child_foreach(OBJECT(chip), pnv_ics_resend_child, NULL);
     }
 }
 
-- 
2.31.1



  parent reply	other threads:[~2021-12-13 13:39 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-13 13:28 [PATCH v2 00/19] ppc/pnv: Add support for user created PHB3/PHB4 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 01/19] ppc/pnv: Change the maximum of PHB3 devices for Power8NVL Cédric Le Goater
2021-12-13 18:30   ` Daniel Henrique Barboza
2021-12-13 13:28 ` [PATCH v2 02/19] ppc/pnv: Introduce a "chip" property under PHB3 Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 03/19] ppc/pnv: Use the chip class to check the index of PHB3 devices Cédric Le Goater
2021-12-13 18:33   ` Daniel Henrique Barboza
2021-12-13 13:28 ` [PATCH v2 04/19] ppc/pnv: Drop the "num-phbs" property Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 05/19] ppc/pnv: Move mapping of the PHB3 CQ regions under pnv_pbcq_realize() Cédric Le Goater
2021-12-13 13:28 ` Cédric Le Goater [this message]
2021-12-13 18:37   ` [PATCH v2 06/19] ppc/pnv: Use QOM hierarchy to scan PHB3 devices Daniel Henrique Barboza
2021-12-13 13:28 ` [PATCH v2 07/19] ppc/pnv: Introduce a num_pecs class attribute for PHB4 PEC devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 08/19] ppc/pnv: Introduce version and device_id class atributes for PHB4 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 09/19] ppc/pnv: Introduce a "chip" property under the PHB4 model Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 10/19] ppc/pnv: Introduce a num_stack class attribute Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 11/19] ppc/pnv: Compute the PHB index from the PHB4 PEC model Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 12/19] ppc/pnv: Remove "system-memory" property from PHB4 PEC Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 13/19] ppc/pnv: Move realize of PEC stacks under the PEC model Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 14/19] ppc/pnv: Use QOM hierarchy to scan PEC PHB4 devices Cédric Le Goater
2021-12-13 18:39   ` Daniel Henrique Barboza
2021-12-13 13:28 ` [PATCH v2 15/19] ppc/pnv: Introduce support for user created PHB3 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 16/19] ppc/pnv: Reparent user created PHB3 devices to the PnvChip Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 17/19] ppc/pnv: Complete user created PHB3 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 18/19] ppc/pnv: Introduce support for user created PHB4 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 19/19] ppc/pnv: Move num_phbs under Pnv8Chip Cédric Le Goater
2022-01-04  9:53   ` Daniel Henrique Barboza
2022-01-04 10:07     ` Cédric Le Goater
2021-12-15 16:56 ` [PATCH v2 00/19] ppc/pnv: Add support for user created PHB3/PHB4 devices Cédric Le Goater
2022-01-04  9:56   ` Daniel Henrique Barboza
2022-01-04 10:07     ` Cédric Le Goater

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211213132830.108372-7-clg@kaod.org \
    --to=clg@kaod.org \
    --cc=danielhb413@gmail.com \
    --cc=fbarrat@linux.ibm.com \
    --cc=groug@kaod.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).