From nobody Fri May 3 18:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1570113445; cv=none; d=zoho.com; s=zohoarc; b=opcvQjAq8F92DEiyyOHF8cvdoytSbhhmd5aMU4viV2lKWHNVbKh7lE2mJVMoyaAMiWtA2SJunqeWcqa0Q8vVcJRbSWP2zOACfMb1ASyDGq0MkXnOY38UFLl2zhNjPAUmAQ+0+6FF7YwIjnG1I+34jQzvV4fBLS1K/PdXcFMS/ZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570113445; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=lH3ZvDLMTAEWN8P7tskaJXYrxDuUSOc9MNLIBV2AHk0=; b=O8IonDTF+eNz5Q5mub4xOaBmANvSQNFQdLcGNodEaAumitMymfp4U75RNaWAw9NRj0gIDIfsxnHuoHH/9KpU05CcdkzZZHSkacCCWgGHlluSNB2Ov2Pns8BZbD8vCmuIkpz3NFp+eHjyrS4OdOHg97wkM783cDZae1CVVgSM9kg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1570113445760920.0630173397795; Thu, 3 Oct 2019 07:37:25 -0700 (PDT) Received: from localhost ([::1]:36868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iG2EM-0004kN-HH for importer@patchew.org; Thu, 03 Oct 2019 10:37:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35323) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iG2DW-0004F6-3x for qemu-devel@nongnu.org; Thu, 03 Oct 2019 10:36:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iG2DU-0001Kv-Lq for qemu-devel@nongnu.org; Thu, 03 Oct 2019 10:36:29 -0400 Received: from 10.mo177.mail-out.ovh.net ([46.105.73.133]:57445) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iG2DU-0001Jr-FL for qemu-devel@nongnu.org; Thu, 03 Oct 2019 10:36:28 -0400 Received: from player693.ha.ovh.net (unknown [10.108.42.168]) by mo177.mail-out.ovh.net (Postfix) with ESMTP id 1165C10CE6E for ; Thu, 3 Oct 2019 16:36:25 +0200 (CEST) Received: from kaod.org (lfbn-1-2229-223.w90-76.abo.wanadoo.fr [90.76.50.223]) (Authenticated sender: clg@kaod.org) by player693.ha.ovh.net (Postfix) with ESMTPSA id F3A26A8428FA; Thu, 3 Oct 2019 14:36:21 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Subject: [PATCH] ppc/pnv: Remove the XICSFabric Interface from the POWER9 machine Date: Thu, 3 Oct 2019 16:36:17 +0200 Message-Id: <20191003143617.21682-1-clg@kaod.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 533958034936073190 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrgeekgdektdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.73.133 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: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The POWER8 PowerNV machine needs to implement a XICSFabric interface as this is the POWER8 interrupt controller model. But the POWER9 machine uselessly inherits of XICSFabric from the common PowerNV machine definition. Open code machine definitions to have a better control on the different interfaces each machine should define. Fixes: f30c843ced50 ("ppc/pnv: Introduce PowerNV machines with fixed CPU mo= dels") Signed-off-by: C=C3=A9dric Le Goater --- hw/ppc/pnv.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 77a86c6a2301..7cf64b6d2533 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1485,23 +1485,21 @@ static void pnv_machine_class_init(ObjectClass *oc,= void *data) .parent =3D TYPE_PNV9_CHIP, \ } =20 -#define DEFINE_PNV_MACHINE_TYPE(cpu, class_initfn) \ - { \ - .name =3D MACHINE_TYPE_NAME(cpu), \ - .parent =3D TYPE_PNV_MACHINE, \ - .instance_size =3D sizeof(PnvMachineState), \ - .instance_init =3D pnv_machine_instance_init, \ - .class_init =3D class_initfn, \ - .interfaces =3D (InterfaceInfo[]) { \ - { TYPE_XICS_FABRIC }, \ - { TYPE_INTERRUPT_STATS_PROVIDER }, \ - { }, \ - }, \ - } - static const TypeInfo types[] =3D { - DEFINE_PNV_MACHINE_TYPE("powernv8", pnv_machine_power8_class_init), - DEFINE_PNV_MACHINE_TYPE("powernv9", pnv_machine_power9_class_init), + { + .name =3D MACHINE_TYPE_NAME("powernv9"), + .parent =3D TYPE_PNV_MACHINE, + .class_init =3D pnv_machine_power9_class_init, + }, + { + .name =3D MACHINE_TYPE_NAME("powernv8"), + .parent =3D TYPE_PNV_MACHINE, + .class_init =3D pnv_machine_power8_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_XICS_FABRIC }, + { }, + }, + }, { .name =3D TYPE_PNV_MACHINE, .parent =3D TYPE_MACHINE, @@ -1510,7 +1508,6 @@ static const TypeInfo types[] =3D { .instance_init =3D pnv_machine_instance_init, .class_init =3D pnv_machine_class_init, .interfaces =3D (InterfaceInfo[]) { - { TYPE_XICS_FABRIC }, { TYPE_INTERRUPT_STATS_PROVIDER }, { }, }, --=20 2.21.0