From nobody Tue Feb 10 05:41:22 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1576779865; cv=none; d=zohomail.com; s=zohoarc; b=VNhMnkTY0/GgM5epVSxglb1bGRxUWHZB3oJVLPl2wdXkJTALIEnW304pJse8SNVRLlSxS1/pc2JsdIYctAQnpzbAB0ENmNPlqmJr+8G2X0xyBVQqZC0X1cOLviVpx+vHmbDCl/Debh4MwD9v67hxQ+IpWMME+t+w6KFiHhEQX14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576779865; h=Content-Type: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=MBsrAee2mA4CAIfIETfQyu6crpSfu0MmEF6SjCN8xGI=; b=TRQlu/xhelq2WmXQYnKaQGg11MwnmDoHs8mPE9CmGAcDPuvs1Pe7ZInbqgariZdehwyoj1GqPjDYIYVR1s1694kIHca6Miz8KYcLIJUEcedpmRRRUj1a26uHDJ/yvCSGpcsS2+DjHp1o0Xff52wtS+PTyfOjKG6BkuOpd7Qoni0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576779865700750.1685436671908; Thu, 19 Dec 2019 10:24:25 -0800 (PST) Received: from localhost ([::1]:46356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii0TI-0006Lz-Ja for importer@patchew.org; Thu, 19 Dec 2019 13:24:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44941) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii0Id-0001aK-36 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 13:13:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ii0Ib-0007Si-S2 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 13:13:22 -0500 Received: from 14.mo6.mail-out.ovh.net ([46.105.56.113]:48771) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ii0Ib-0007L4-Ki for qemu-devel@nongnu.org; Thu, 19 Dec 2019 13:13:21 -0500 Received: from player734.ha.ovh.net (unknown [10.108.16.7]) by mo6.mail-out.ovh.net (Postfix) with ESMTP id 31AD11F5A7B for ; Thu, 19 Dec 2019 19:13:20 +0100 (CET) Received: from kaod.org (lfbn-tou-1-1227-223.w90-76.abo.wanadoo.fr [90.76.50.223]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id BC265D6D642F; Thu, 19 Dec 2019 18:13:14 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Subject: [PATCH v2 13/13] pnv/xive: Deduce the PnvXive pointer from XiveTCTX::xptr Date: Thu, 19 Dec 2019 19:11:55 +0100 Message-Id: <20191219181155.32530-14-clg@kaod.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191219181155.32530-1-clg@kaod.org> References: <20191219181155.32530-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 13672928469033454566 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrvdduuddguddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeevrogurhhitgcunfgvucfiohgrthgvrhcuoegtlhhgsehkrghougdrohhrgheqnecukfhppedtrddtrddtrddtpdeltddrjeeirdehtddrvddvfeenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeefgedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgepvd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.56.113 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, Greg Kurz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Greg Kurz And use it instead of reaching out to the machine. This allows to get rid of pnv_get_chip(). Signed-off-by: Greg Kurz Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/pnv.h | 2 -- hw/intc/pnv_xive.c | 8 ++------ hw/ppc/pnv.c | 14 -------------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index d016ab0d0319..5f0b7d3374ef 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -221,8 +221,6 @@ struct PnvMachineState { PnvPnor *pnor; }; =20 -PnvChip *pnv_get_chip(uint32_t chip_id); - #define PNV_FDT_ADDR 0x01000000 #define PNV_TIMEBASE_FREQ 512000000ULL =20 diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index 1962f884d6de..79a5dfe9a858 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -472,12 +472,8 @@ static uint8_t pnv_xive_get_block_id(XiveRouter *xrtr) static PnvXive *pnv_xive_tm_get_xive(PowerPCCPU *cpu) { int pir =3D ppc_cpu_pir(cpu); - PnvChip *chip; - PnvXive *xive; - - chip =3D pnv_get_chip(PNV9_PIR2CHIP(pir)); - assert(chip); - xive =3D &PNV9_CHIP(chip)->xive; + XivePresenter *xptr =3D XIVE_TCTX(pnv_cpu_state(cpu)->intc)->xptr; + PnvXive *xive =3D PNV_XIVE(xptr); =20 if (!pnv_xive_is_cpu_enabled(xive, cpu)) { xive_error(xive, "IC: CPU %x is not enabled", pir); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index d100b6f559e2..e1c218dc03f5 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1724,20 +1724,6 @@ static int pnv_match_nvt(XiveFabric *xfb, uint8_t fo= rmat, return total_count; } =20 -PnvChip *pnv_get_chip(uint32_t chip_id) -{ - PnvMachineState *pnv =3D PNV_MACHINE(qdev_get_machine()); - int i; - - for (i =3D 0; i < pnv->num_chips; i++) { - PnvChip *chip =3D pnv->chips[i]; - if (chip->chip_id =3D=3D chip_id) { - return chip; - } - } - return NULL; -} - static void pnv_get_num_chips(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { --=20 2.21.0