From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AA65C432C1 for ; Wed, 25 Sep 2019 07:46:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D26C820872 for ; Wed, 25 Sep 2019 07:45:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D26C820872 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD1zq-0004Lo-4T for qemu-devel@archiver.kernel.org; Wed, 25 Sep 2019 03:45:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45909) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD1pR-0002lu-9i for qemu-devel@nongnu.org; Wed, 25 Sep 2019 03:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iD1pP-0003GS-Rz for qemu-devel@nongnu.org; Wed, 25 Sep 2019 03:35:12 -0400 Received: from 2.mo1.mail-out.ovh.net ([178.32.119.250]:36528) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iD1pP-0003G6-M8 for qemu-devel@nongnu.org; Wed, 25 Sep 2019 03:35:11 -0400 Received: from player714.ha.ovh.net (unknown [10.109.159.90]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 186A71902E1 for ; Wed, 25 Sep 2019 09:35:08 +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 player714.ha.ovh.net (Postfix) with ESMTPSA id 148FCA22D947; Wed, 25 Sep 2019 07:34:59 +0000 (UTC) Subject: Re: [PATCH 06/20] xics: Create sPAPR specific ICS subtype To: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org References: <20190925064534.19155-1-david@gibson.dropbear.id.au> <20190925064534.19155-7-david@gibson.dropbear.id.au> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <77098fa5-a8a6-0cda-7a19-fd13a2d8db29@kaod.org> Date: Wed, 25 Sep 2019 09:34:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 MIME-Version: 1.0 In-Reply-To: <20190925064534.19155-7-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Ovh-Tracer-Id: 1777795956058065880 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrfedugdduvdefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm 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: 178.32.119.250 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: Jason Wang , Riku Voipio , groug@kaod.org, Laurent Vivier , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Paolo Bonzini , philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 25/09/2019 08:45, David Gibson wrote: > We create a subtype of TYPE_ICS specifically for sPAPR. For now all th= is > does is move the setup of the PAPR specific hcalls and RTAS calls to > the realize() function for this, rather than requiring the PAPR code to > explicitly call xics_spapr_init(). In future it will have some more > function. >=20 > Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater > --- > hw/intc/xics_spapr.c | 34 +++++++++++++++++++++++++++++++++- > hw/ppc/spapr_irq.c | 6 ++---- > include/hw/ppc/xics_spapr.h | 4 +++- > 3 files changed, 38 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c > index 3e9444813a..e6dd004587 100644 > --- a/hw/intc/xics_spapr.c > +++ b/hw/intc/xics_spapr.c > @@ -283,8 +283,18 @@ static void rtas_int_on(PowerPCCPU *cpu, SpaprMach= ineState *spapr, > rtas_st(rets, 0, RTAS_OUT_SUCCESS); > } > =20 > -void xics_spapr_init(SpaprMachineState *spapr) > +static void ics_spapr_realize(DeviceState *dev, Error **errp) > { > + ICSState *ics =3D ICS_SPAPR(dev); > + ICSStateClass *icsc =3D ICS_GET_CLASS(ics); > + Error *local_err =3D NULL; > + > + icsc->parent_realize(dev, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + > spapr_rtas_register(RTAS_IBM_SET_XIVE, "ibm,set-xive", rtas_set_xi= ve); > spapr_rtas_register(RTAS_IBM_GET_XIVE, "ibm,get-xive", rtas_get_xi= ve); > spapr_rtas_register(RTAS_IBM_INT_OFF, "ibm,int-off", rtas_int_off)= ; > @@ -319,3 +329,25 @@ void spapr_dt_xics(SpaprMachineState *spapr, uint3= 2_t nr_servers, void *fdt, > _FDT(fdt_setprop_cell(fdt, node, "linux,phandle", phandle)); > _FDT(fdt_setprop_cell(fdt, node, "phandle", phandle)); > } > + > +static void ics_spapr_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc =3D DEVICE_CLASS(klass); > + ICSStateClass *isc =3D ICS_CLASS(klass); > + > + device_class_set_parent_realize(dc, ics_spapr_realize, > + &isc->parent_realize); > +} > + > +static const TypeInfo ics_spapr_info =3D { > + .name =3D TYPE_ICS_SPAPR, > + .parent =3D TYPE_ICS, > + .class_init =3D ics_spapr_class_init, > +}; > + > +static void xics_spapr_register_types(void) > +{ > + type_register_static(&ics_spapr_info); > +} > + > +type_init(xics_spapr_register_types) > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index 6c45d2a3c0..8c26fa2d1e 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -98,7 +98,7 @@ static void spapr_irq_init_xics(SpaprMachineState *sp= apr, int nr_irqs, > Object *obj; > Error *local_err =3D NULL; > =20 > - obj =3D object_new(TYPE_ICS); > + obj =3D object_new(TYPE_ICS_SPAPR); > object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort)= ; > object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr), > &error_fatal); > @@ -109,9 +109,7 @@ static void spapr_irq_init_xics(SpaprMachineState *= spapr, int nr_irqs, > return; > } > =20 > - spapr->ics =3D ICS(obj); > - > - xics_spapr_init(spapr); > + spapr->ics =3D ICS_SPAPR(obj); > } > =20 > static int spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, boo= l lsi, > diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h > index 5dabc9a138..691a6d00f7 100644 > --- a/include/hw/ppc/xics_spapr.h > +++ b/include/hw/ppc/xics_spapr.h > @@ -31,11 +31,13 @@ > =20 > #define XICS_NODENAME "interrupt-controller" > =20 > +#define TYPE_ICS_SPAPR "ics-spapr" > +#define ICS_SPAPR(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_SPAPR) > + > void spapr_dt_xics(SpaprMachineState *spapr, uint32_t nr_servers, void= *fdt, > uint32_t phandle); > int xics_kvm_connect(SpaprMachineState *spapr, Error **errp); > void xics_kvm_disconnect(SpaprMachineState *spapr, Error **errp); > bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr); > -void xics_spapr_init(SpaprMachineState *spapr); > =20 > #endif /* XICS_SPAPR_H */ >=20