From nobody Tue Feb 10 03:40:39 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=1576740892; cv=none; d=zohomail.com; s=zohoarc; b=YbYXisYpj9PoNl1Dm66xA2Odpq7k5IKrojJtHoVklV5uok0XfmCe8bHZIOBZ9Uq50An1KqDlpqcjLVfIr3JUMcflf3PXlGAyXkkAhNYhEfZmA10R2mX8JMSFYnL9i21bGvkH4We9fx2qZiJwF3j8BoZp8k8ZObs6kV0Rpb7Qk60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576740892; 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=Ey+JZbCWgAsRZYr3tsx1sOsNd5FRJZ1OpLQq6UgJw/M=; b=M9AiUuUe+cVii5N/caFwZj/bceycIo9xEXOv+EaA3Qrj3TK7aS25X6xxaQcSs672HDawUHoSM5D4DH9Rqy9LQNNImV4JqkHeIOuAG33QajN3yzMGTNYXolT0U4hhNpNIMGxKVRlIZGBOQrLhVVp3qUwQNe+VKQEAc5gRe+Zmmg8= 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 1576740892574870.785414558913; Wed, 18 Dec 2019 23:34:52 -0800 (PST) Received: from localhost ([::1]:36792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihqKh-0002Bu-7m for importer@patchew.org; Thu, 19 Dec 2019 02:34:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52552) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihqHA-0007QE-1D for qemu-devel@nongnu.org; Thu, 19 Dec 2019 02:31:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihqH8-0005UV-Ov for qemu-devel@nongnu.org; Thu, 19 Dec 2019 02:31:11 -0500 Received: from 6.mo178.mail-out.ovh.net ([46.105.53.132]:34292) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihqH8-0005Lk-GS for qemu-devel@nongnu.org; Thu, 19 Dec 2019 02:31:10 -0500 Received: from player714.ha.ovh.net (unknown [10.108.1.232]) by mo178.mail-out.ovh.net (Postfix) with ESMTP id F26EF89454 for ; Thu, 19 Dec 2019 08:31:08 +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 player714.ha.ovh.net (Postfix) with ESMTPSA id 62B6FD671FA9; Thu, 19 Dec 2019 07:31:03 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Subject: [PATCH 10/10] ppc/pnv: Add a "pnor" const link property to the BMC internal simulator Date: Thu, 19 Dec 2019 08:30:01 +0100 Message-Id: <20191219073001.26790-11-clg@kaod.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191219073001.26790-1-clg@kaod.org> References: <20191219073001.26790-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 2827134669933218790 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrvddutddguddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeevrogurhhitgcunfgvucfiohgrthgvrhcuoegtlhhgsehkrghougdrohhrgheqnecukfhppedtrddtrddtrddtpdeltddrjeeirdehtddrvddvfeenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjedugedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgepvd 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.53.132 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 This allows to get rid of a call to qdev_get_machine(). Signed-off-by: Greg Kurz Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/pnv.h | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/pnv_bmc.c | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index 4c13d4394a11..d016ab0d0319 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -231,7 +231,7 @@ PnvChip *pnv_get_chip(uint32_t chip_id); */ void pnv_dt_bmc_sensors(IPMIBmc *bmc, void *fdt); void pnv_bmc_powerdown(IPMIBmc *bmc); -IPMIBmc *pnv_bmc_create(void); +IPMIBmc *pnv_bmc_create(PnvPnor *pnor); =20 /* * POWER8 MMIO base addresses diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 7add208f997b..6ef90da92325 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -815,7 +815,7 @@ static void pnv_init(MachineState *machine) g_free(chip_typename); =20 /* Create the machine BMC simulator */ - pnv->bmc =3D pnv_bmc_create(); + pnv->bmc =3D pnv_bmc_create(pnv->pnor); =20 /* Instantiate ISA bus on chip 0 */ pnv->isa_bus =3D pnv_isa_create(pnv->chips[0], &error_fatal); diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c index 07fa1e1c7e45..8863354c1c08 100644 --- a/hw/ppc/pnv_bmc.c +++ b/hw/ppc/pnv_bmc.c @@ -143,8 +143,8 @@ static uint16_t bytes_to_blocks(uint32_t bytes) static void hiomap_cmd(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len, RspBuffer *rsp) { - PnvMachineState *pnv =3D PNV_MACHINE(qdev_get_machine()); - PnvPnor *pnor =3D pnv->pnor; + PnvPnor *pnor =3D PNV_PNOR(object_property_get_link(OBJECT(ibs), "pnor= ", + &error_abort)); uint32_t pnor_size =3D pnor->size; uint32_t pnor_addr =3D PNOR_SPI_OFFSET; bool readonly =3D false; @@ -217,11 +217,13 @@ static const IPMINetfn hiomap_netfn =3D { * Instantiate the machine BMC. PowerNV uses the QEMU internal * simulator but it could also be external. */ -IPMIBmc *pnv_bmc_create(void) +IPMIBmc *pnv_bmc_create(PnvPnor *pnor) { Object *obj; =20 obj =3D object_new(TYPE_IPMI_BMC_SIMULATOR); + object_ref(OBJECT(pnor)); + object_property_add_const_link(obj, "pnor", OBJECT(pnor), &error_abort= ); object_property_set_bool(obj, true, "realized", &error_fatal); =20 /* Install the HIOMAP protocol handlers to access the PNOR */ --=20 2.21.0