From nobody Sun Feb 8 22:34:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1660126308; cv=none; d=zohomail.com; s=zohoarc; b=R7cpB/qrZqP8/90OShj1nuTqNQs3lYVG6lyDkze69Oa5Rzc54ALd51DWoyQtBz31no77W2nA1aHXliV9dtDzHHs9e48W37+jy57p+sCMZ9pSZzyavCNTv5Ek6R1Wj/U2SO4nRMW+r3Voux0yupGxVAGIXpVxt6kZaP5k5r4zUCY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660126308; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ka9clBzBNCBG6/NCtFaKpDHEGzLyxl2U70eTva2upAU=; b=c+SvPCPFJ/W+T7e4Q4rz+89dQKu1za6vpk2ugyHAfXPeYRqPdNZaq0mELJ2ncDjpfY+jgKBbqp3GTJ14cwU62BcmKaUMz5Jv26jmC7jLIPRa+ERA4UACcwFtISpzWJ5dcoSxezJCSROlAX47qIWD8ltEdo5jqK+WD1G+CEsuLSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1660126308833541.620117093623; Wed, 10 Aug 2022 03:11:48 -0700 (PDT) Received: from localhost ([::1]:36452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLigl-00022A-AX for importer@patchew.org; Wed, 10 Aug 2022 06:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLibF-0006qp-QO; Wed, 10 Aug 2022 06:06:10 -0400 Received: from mail-vs1-xe2c.google.com ([2607:f8b0:4864:20::e2c]:41521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLibD-0000v4-SR; Wed, 10 Aug 2022 06:06:05 -0400 Received: by mail-vs1-xe2c.google.com with SMTP id 129so14584031vsq.8; Wed, 10 Aug 2022 03:06:03 -0700 (PDT) Received: from balboa.COMFAST (201-43-216-47.dsl.telesp.net.br. [201.43.216.47]) by smtp.gmail.com with ESMTPSA id 2-20020a1f1602000000b0037613541b27sm12277919vkw.39.2022.08.10.03.06.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 03:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Ka9clBzBNCBG6/NCtFaKpDHEGzLyxl2U70eTva2upAU=; b=LXaRaKEGQ6AfNic9xeUNbKbsy42qqVxvHDvpSfUzEpIGUkZVgLKM7xM96q0ws9yqLp JJMTCSqfCtRqziryjAMblEw1E2Oay3eZSZABroAgv213pCfeZuDMiEsU2z4yoWJnmP84 46GsxHYHefPieLyjeR5qzLB2+Udfjqus9bBd2nWv7HoBIn2JgtwsSD+RNsj8HcUmLE/C 68YWp6F/dEeG9WNSRnY8I/utdAhbOlwtml0yFKT6roCEPwUAYmjLjiJvdKY2SCI5edeJ 5/BWyzzsbDD+2DMIEnOFdtRa/kpqai7QNsN2Lm13ixl0o0rZLJsUoOjvQglc983xgM1G 1eUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Ka9clBzBNCBG6/NCtFaKpDHEGzLyxl2U70eTva2upAU=; b=hUD4pCJeGdbCAcN5pIksQ5PbFFbEg6nyFeOgnCxTolUfd1kGwLJYCX89X7h+jbTVSK SBIpR7FwUSYT74DPysu0E2CNChsLrxxPuwpAAVC/iarG41atzmWbrKAuOkywKTd9BhfH 1RyF5n73MMV1qLma3GShvjl6s+Qqf2PA5MX6we1jGGwHWCEUt0Es6Gjr0lV6kQXNABsP zGtBlp7kqdoEth3J9xJ3RCTNOEKzZaTtwrgoCJmZK9mb3pn5rRSShYVgjVSXlKPSBEj2 dxg/FkIRi6wsBvEubBm+xlIga1VKadMREdo/wxwcVLY9l3Q2d3kw7370LNg2+DiJo+CD o08A== X-Gm-Message-State: ACgBeo2EHxc2x8UisHvvz+0cie9vLtGfHojlYinEaoEd86Jgjd9GII8R HfpD0faRz8Il3W8UPpwfb2uZH0+8HCA= X-Google-Smtp-Source: AA6agR5tPEF8IjRa61kBrsrb8E18KNHZ7jnubt0RK9XlBtz2V6YNLRZUNwqDWP0ts595G5+z93v0Ww== X-Received: by 2002:a67:c201:0:b0:386:b3ad:6c2c with SMTP id i1-20020a67c201000000b00386b3ad6c2cmr10836069vsj.53.1660125962533; Wed, 10 Aug 2022 03:06:02 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, fbarrat@linux.ibm.com, Daniel Henrique Barboza Subject: [PATCH for-7.2 v3 09/11] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs Date: Wed, 10 Aug 2022 07:05:34 -0300 Message-Id: <20220810100536.473859-10-danielhb413@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220810100536.473859-1-danielhb413@gmail.com> References: <20220810100536.473859-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::e2c; envelope-from=danielhb413@gmail.com; helo=mail-vs1-xe2c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1660126309323100001 Content-Type: text/plain; charset="utf-8" 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 --- 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 a142b8ff8d..feaef8137f 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, D= eviceState *child) static PnvPhb4PecState *pnv_phb4_get_pec(PnvChip *chip, PnvPHB4 *phb, Error **errp) { - Pnv9Chip *chip9 =3D PNV9_CHIP(chip); + PnvPHB *phb_base =3D phb->phb_base; + PnvPhb4PecState *pecs =3D NULL; int chip_id =3D phb->chip_id; int index =3D phb->phb_id; int i, j; =20 + if (phb_base->version =3D=3D 4) { + Pnv9Chip *chip9 =3D PNV9_CHIP(chip); + + pecs =3D chip9->pecs; + } else if (phb_base->version =3D=3D 5) { + Pnv10Chip *chip10 =3D PNV10_CHIP(chip); + + pecs =3D chip10->pecs; + } else { + return NULL; + } + for (i =3D 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 =3D &chip9->pecs[i]; + PnvPhb4PecState *pec =3D &pecs[i]; =20 for (j =3D 0; j < pec->num_phbs; j++) { if (index =3D=3D pnv_phb4_pec_get_phb_id(pec, j)) { --=20 2.36.1