From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, clg@kaod.org,
Frederic Barrat <fbarrat@linux.ibm.com>,
Daniel Henrique Barboza <danielhb413@gmail.com>
Subject: [PATCH for-7.2 09/10] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs
Date: Wed, 3 Aug 2022 10:44:58 -0300 [thread overview]
Message-ID: <20220803134459.2633902-10-danielhb413@gmail.com> (raw)
In-Reply-To: <20220803134459.2633902-1-danielhb413@gmail.com>
The function assumes that we're always dealing with a PNV9_CHIP()
object. This is not the case when the pnv-phb device belongs to a
powernv10 machine.
Change pnv_phb4_get_pec() to be able to work with PNV10_CHIP() if
necessary.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/pci-host/pnv_phb.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c
index c241e90036..a5f3a8d256 100644
--- a/hw/pci-host/pnv_phb.c
+++ b/hw/pci-host/pnv_phb.c
@@ -53,17 +53,30 @@ static void pnv_parent_bus_fixup(DeviceState *parent, DeviceState *child)
static PnvPhb4PecState *pnv_phb4_get_pec(PnvChip *chip, PnvPHB4 *phb,
Error **errp)
{
- Pnv9Chip *chip9 = PNV9_CHIP(chip);
+ PnvPHB *phb_base = phb->phb_base;
+ PnvPhb4PecState *pecs = NULL;
int chip_id = phb->chip_id;
int index = phb->phb_id;
int i, j;
+ if (phb_base->version == 4) {
+ Pnv9Chip *chip9 = PNV9_CHIP(chip);
+
+ pecs = chip9->pecs;
+ } else if (phb_base->version == 5) {
+ Pnv10Chip *chip10 = PNV10_CHIP(chip);
+
+ pecs = chip10->pecs;
+ } else {
+ return NULL;
+ }
+
for (i = 0; i < chip->num_pecs; i++) {
/*
* For each PEC, check the amount of phbs it supports
* and see if the given phb4 index matches an index.
*/
- PnvPhb4PecState *pec = &chip9->pecs[i];
+ PnvPhb4PecState *pec = &pecs[i];
for (j = 0; j < pec->num_phbs; j++) {
if (index == pnv_phb4_pec_get_phb_id(pec, j)) {
--
2.36.1
next prev parent reply other threads:[~2022-08-03 14:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-03 13:44 [PATCH for-7.2 00/10] enable pnv-phb user created devices Daniel Henrique Barboza
2022-08-03 13:44 ` [PATCH for-7.2 01/10] ppc/pnv: add phb-id/chip-id PnvPHB3RootBus properties Daniel Henrique Barboza
2022-08-03 16:22 ` Cédric Le Goater
2022-08-03 13:44 ` [PATCH for-7.2 02/10] ppc/pnv: add phb-id/chip-id PnvPHB4RootBus properties Daniel Henrique Barboza
2022-08-03 16:22 ` Cédric Le Goater
2022-08-03 13:44 ` [PATCH for-7.2 03/10] ppc/pnv: set root port chassis and slot using Bus properties Daniel Henrique Barboza
2022-08-03 16:25 ` Cédric Le Goater
2022-08-03 13:44 ` [PATCH for-7.2 04/10] ppc/pnv: add helpers for pnv-phb user devices Daniel Henrique Barboza
2022-08-05 10:41 ` Frederic Barrat
2022-08-08 11:04 ` Daniel Henrique Barboza
2022-08-03 13:44 ` [PATCH for-7.2 05/10] ppc/pnv: turn chip8->phbs[] into a PnvPHB* array Daniel Henrique Barboza
2022-08-03 13:44 ` [PATCH for-7.2 06/10] ppc/pnv: enable user created pnv-phb for powernv8 Daniel Henrique Barboza
2022-08-05 10:50 ` Frederic Barrat
2022-08-08 16:50 ` Daniel Henrique Barboza
2022-08-08 23:30 ` Daniel Henrique Barboza
2022-08-03 13:44 ` [PATCH for-7.2 07/10] ppc/pnv: add PHB4 helpers for user created pnv-phb Daniel Henrique Barboza
2022-08-03 13:44 ` [PATCH for-7.2 08/10] ppc/pnv: enable user created pnv-phb powernv9 Daniel Henrique Barboza
2022-08-03 13:44 ` Daniel Henrique Barboza [this message]
2022-08-03 13:44 ` [PATCH for-7.2 10/10] ppc/pnv: user creatable pnv-phb for powernv10 Daniel Henrique Barboza
2022-08-05 11:06 ` [PATCH for-7.2 00/10] enable pnv-phb user created devices Frederic Barrat
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=20220803134459.2633902-10-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=clg@kaod.org \
--cc=fbarrat@linux.ibm.com \
--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).