From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487931666717170.12376792400664; Fri, 24 Feb 2017 02:21:06 -0800 (PST) Received: from localhost ([::1]:35916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCzp-0006Xh-Cx for importer@patchew.org; Fri, 24 Feb 2017 05:21:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCxi-00059i-Ih for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:18:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCxe-0005wx-HJ for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:18:54 -0500 Received: from 13.mo5.mail-out.ovh.net ([87.98.182.191]:49434) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCxe-0005t5-BJ for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:18:50 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 6A557DCA18 for ; Fri, 24 Feb 2017 11:18:47 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 78C0228007C; Fri, 24 Feb 2017 11:18:42 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:00 +0100 Message-Id: <1487931503-10607-2-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 614459878302452710 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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: 87.98.182.191 Subject: [Qemu-devel] [PATCH v3 01/24] xics: XICS should not be a SysBusDevice X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: David Gibson Currently xics - the component of the IBM POWER interrupt controller representing the overall interrupt fabric / architecture is represented as a descendent of SysBusDevice. However, this is not really correct - the xics presents nothing in MMIO space so it should be an "unattached" device in the current QOM model. Since this device will always be created by the machine type, not created specifically from the command line, and because it has no migrated state it should be safe to move it around the device composition tree. Therefore this patch changes it to a descendent of TYPE_DEVICE, and makes it an unattached device. Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 2 +- hw/ppc/spapr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 095c16a30082..372b8311fb8b 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -260,7 +260,7 @@ static void xics_common_class_init(ObjectClass *oc, voi= d *data) =20 static const TypeInfo xics_common_info =3D { .name =3D TYPE_XICS_COMMON, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(XICSState), .class_size =3D sizeof(XICSStateClass), .instance_init =3D xics_common_initfn, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5904e6498f49..8af54494f166 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -101,7 +101,7 @@ static XICSState *try_create_xics(const char *type, int= nr_servers, Error *err =3D NULL; DeviceState *dev; =20 - dev =3D qdev_create(NULL, type); + dev =3D DEVICE(object_new(type)); qdev_prop_set_uint32(dev, "nr_servers", nr_servers); qdev_prop_set_uint32(dev, "nr_irqs", nr_irqs); object_property_set_bool(OBJECT(dev), true, "realized", &err); --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487931664911207.82347898784485; Fri, 24 Feb 2017 02:21:04 -0800 (PST) Received: from localhost ([::1]:35915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCzn-0006Vm-Ka for importer@patchew.org; Fri, 24 Feb 2017 05:21:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCxm-0005CJ-7g for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCxi-00062A-5Y for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:18:58 -0500 Received: from 14.mo5.mail-out.ovh.net ([188.165.51.82]:56725) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCxh-00060P-Vk for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:18:54 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 9A7ABDCA80 for ; Fri, 24 Feb 2017 11:18:52 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 63A37280070; Fri, 24 Feb 2017 11:18:47 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:01 +0100 Message-Id: <1487931503-10607-3-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 615867249936272358 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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: 188.165.51.82 Subject: [Qemu-devel] [PATCH v3 02/24] ppc/xics: fix ICP and ICS reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" commit 5b17c7207938 ("xics: XICS should not be a SysBusDevice") changed the nature of the XICS object to be a descendent of TYPE_DEVICE. By doing so, the object is not on a bus and its reset handler is not called anymore. The direct consequence is that the ICP and ICS objects are not correctly initialized and so the IRQ subsystem is broken in the guest. Signed-off-by: C=C3=A9dric Le Goater --- hw/ppc/spapr.c | 1 + include/hw/ppc/xics.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 8af54494f166..fa6a2947c791 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -104,6 +104,7 @@ static XICSState *try_create_xics(const char *type, int= nr_servers, dev =3D DEVICE(object_new(type)); qdev_prop_set_uint32(dev, "nr_servers", nr_servers); qdev_prop_set_uint32(dev, "nr_irqs", nr_irqs); + qdev_set_parent_bus(dev, sysbus_get_default()); object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { error_propagate(errp, err); diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 3f0c31610aa4..1aefd3d52257 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -80,7 +80,7 @@ struct XICSStateClass { =20 struct XICSState { /*< private >*/ - SysBusDevice parent_obj; + DeviceState parent_obj; /*< public >*/ uint32_t nr_servers; uint32_t nr_irqs; --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14879316922123.854951264545207; Fri, 24 Feb 2017 02:21:32 -0800 (PST) Received: from localhost ([::1]:35918 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chD0E-0006uK-RY for importer@patchew.org; Fri, 24 Feb 2017 05:21:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCxr-0005GS-N1 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCxn-00069Q-Gk for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:03 -0500 Received: from 8.mo5.mail-out.ovh.net ([178.32.116.78]:54274) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCxn-00067f-69 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:18:59 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id CD7D5DCA29 for ; Fri, 24 Feb 2017 11:18:57 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 997CF280070; Fri, 24 Feb 2017 11:18:52 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:02 +0100 Message-Id: <1487931503-10607-4-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 617274625431210982 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.116.78 Subject: [Qemu-devel] [PATCH v3 03/24] ppc/xics: remove set_nr_irqs() handler from XICSStateClass X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Today, the ICS (Interrupt Controller Source) object is created and realized by the init and realize routines of the XICS object, but some of the parameters are only known at the machine level. These parameters are passed from the sPAPR machine to the ICS object in a rather convoluted way using property handlers and a class handler of the XICS object. The number of irqs required to allocate the IRQ state objects in the ICS realize routine is one of them. Let's simplify the process by creating the ICS object along with the XICS object at the machine level and link the ICS into the XICS list of ICSs at this level also. In the sPAPR machine, there is only a single ICS but that will change with the PowerNV machine. Also, QOMify the creation of the objects and get rid of the superfluous code. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 51 +++++++++++++++--------------------------------- hw/intc/xics_kvm.c | 44 ++++++++++------------------------------- hw/intc/xics_spapr.c | 34 -------------------------------- hw/ppc/spapr.c | 54 +++++++++++++++++++++++++++++++++++------------= ---- include/hw/ppc/xics.h | 2 -- 5 files changed, 63 insertions(+), 122 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 372b8311fb8b..e70d3b8b1095 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -151,38 +151,6 @@ static void xics_common_reset(DeviceState *d) } } =20 -static void xics_prop_get_nr_irqs(Object *obj, Visitor *v, const char *nam= e, - void *opaque, Error **errp) -{ - XICSState *xics =3D XICS_COMMON(obj); - int64_t value =3D xics->nr_irqs; - - visit_type_int(v, name, &value, errp); -} - -static void xics_prop_set_nr_irqs(Object *obj, Visitor *v, const char *nam= e, - void *opaque, Error **errp) -{ - XICSState *xics =3D XICS_COMMON(obj); - XICSStateClass *info =3D XICS_COMMON_GET_CLASS(xics); - Error *error =3D NULL; - int64_t value; - - visit_type_int(v, name, &value, &error); - if (error) { - error_propagate(errp, error); - return; - } - if (xics->nr_irqs) { - error_setg(errp, "Number of interrupts is already set to %u", - xics->nr_irqs); - return; - } - - assert(info->set_nr_irqs); - info->set_nr_irqs(xics, value, errp); -} - void xics_set_nr_servers(XICSState *xics, uint32_t nr_servers, const char *typename, Error **errp) { @@ -241,9 +209,6 @@ static void xics_common_initfn(Object *obj) XICSState *xics =3D XICS_COMMON(obj); =20 QLIST_INIT(&xics->ics); - object_property_add(obj, "nr_irqs", "int", - xics_prop_get_nr_irqs, xics_prop_set_nr_irqs, - NULL, NULL, NULL); object_property_add(obj, "nr_servers", "int", xics_prop_get_nr_servers, xics_prop_set_nr_servers, NULL, NULL, NULL); @@ -737,6 +702,16 @@ static void ics_simple_initfn(Object *obj) static void ics_simple_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS_SIMPLE(dev); + Object *obj; + Error *err =3D NULL; + + obj =3D object_property_get_link(OBJECT(dev), "xics", &err); + if (!obj) { + error_setg(errp, "%s: required link 'xics' not found: %s", + __func__, error_get_pretty(err)); + return; + } + ics->xics =3D XICS_COMMON(obj); =20 if (!ics->nr_irqs) { error_setg(errp, "Number of interrupts needs to be greater 0"); @@ -746,12 +721,18 @@ static void ics_simple_realize(DeviceState *dev, Erro= r **errp) ics->qirqs =3D qemu_allocate_irqs(ics_simple_set_irq, ics, ics->nr_irq= s); } =20 +static Property ics_simple_properties[] =3D { + DEFINE_PROP_UINT32("nr-irqs", ICSState, nr_irqs, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void ics_simple_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); ICSStateClass *isc =3D ICS_BASE_CLASS(klass); =20 dc->realize =3D ics_simple_realize; + dc->props =3D ics_simple_properties; dc->vmsd =3D &vmstate_ics_simple; dc->reset =3D ics_simple_reset; isc->post_load =3D ics_simple_post_load; diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 17694eaa8709..4a6c0522feb6 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -294,6 +294,16 @@ static void ics_kvm_reset(DeviceState *dev) static void ics_kvm_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS_SIMPLE(dev); + Object *obj; + Error *err =3D NULL; + + obj =3D object_property_get_link(OBJECT(dev), "xics", &err); + if (!obj) { + error_setg(errp, "%s: required link 'xics' not found: %s", + __func__, error_get_pretty(err)); + return; + } + ics->xics =3D XICS_COMMON(obj); =20 if (!ics->nr_irqs) { error_setg(errp, "Number of interrupts needs to be greater 0"); @@ -358,18 +368,6 @@ static void xics_kvm_cpu_setup(XICSState *xics, PowerP= CCPU *cpu) ss->cap_irq_xics_enabled =3D true; } =20 -static void xics_kvm_set_nr_irqs(XICSState *xics, uint32_t nr_irqs, - Error **errp) -{ - ICSState *ics =3D QLIST_FIRST(&xics->ics); - - /* This needs to be deprecated ... */ - xics->nr_irqs =3D nr_irqs; - if (ics) { - ics->nr_irqs =3D nr_irqs; - } -} - static void xics_kvm_set_nr_servers(XICSState *xics, uint32_t nr_servers, Error **errp) { @@ -389,7 +387,6 @@ static void xics_kvm_realize(DeviceState *dev, Error **= errp) { KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(dev); XICSState *xics =3D XICS_COMMON(dev); - ICSState *ics; int i, rc; Error *error =3D NULL; struct kvm_create_device xics_create_device =3D { @@ -441,14 +438,6 @@ static void xics_kvm_realize(DeviceState *dev, Error *= *errp) =20 xicskvm->kernel_xics_fd =3D xics_create_device.fd; =20 - QLIST_FOREACH(ics, &xics->ics, list) { - object_property_set_bool(OBJECT(ics), true, "realized", &error); - if (error) { - error_propagate(errp, error); - goto fail; - } - } - assert(xics->nr_servers); for (i =3D 0; i < xics->nr_servers; i++) { object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", @@ -472,17 +461,6 @@ fail: kvmppc_define_rtas_kernel_token(0, "ibm,int-off"); } =20 -static void xics_kvm_initfn(Object *obj) -{ - XICSState *xics =3D XICS_COMMON(obj); - ICSState *ics; - - ics =3D ICS_SIMPLE(object_new(TYPE_ICS_KVM)); - object_property_add_child(obj, "ics", OBJECT(ics), NULL); - ics->xics =3D xics; - QLIST_INSERT_HEAD(&xics->ics, ics, list); -} - static void xics_kvm_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -490,7 +468,6 @@ static void xics_kvm_class_init(ObjectClass *oc, void *= data) =20 dc->realize =3D xics_kvm_realize; xsc->cpu_setup =3D xics_kvm_cpu_setup; - xsc->set_nr_irqs =3D xics_kvm_set_nr_irqs; xsc->set_nr_servers =3D xics_kvm_set_nr_servers; } =20 @@ -499,7 +476,6 @@ static const TypeInfo xics_spapr_kvm_info =3D { .parent =3D TYPE_XICS_COMMON, .instance_size =3D sizeof(KVMXICSState), .class_init =3D xics_kvm_class_init, - .instance_init =3D xics_kvm_initfn, }; =20 static void xics_kvm_register_types(void) diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 2e3f1c5e95b2..03e42a866603 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -239,18 +239,6 @@ static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineS= tate *spapr, rtas_st(rets, 0, RTAS_OUT_SUCCESS); } =20 -static void xics_spapr_set_nr_irqs(XICSState *xics, uint32_t nr_irqs, - Error **errp) -{ - ICSState *ics =3D QLIST_FIRST(&xics->ics); - - /* This needs to be deprecated ... */ - xics->nr_irqs =3D nr_irqs; - if (ics) { - ics->nr_irqs =3D nr_irqs; - } -} - static void xics_spapr_set_nr_servers(XICSState *xics, uint32_t nr_servers, Error **errp) { @@ -260,7 +248,6 @@ static void xics_spapr_set_nr_servers(XICSState *xics, = uint32_t nr_servers, static void xics_spapr_realize(DeviceState *dev, Error **errp) { XICSState *xics =3D XICS_SPAPR(dev); - ICSState *ics; Error *error =3D NULL; int i; =20 @@ -282,14 +269,6 @@ static void xics_spapr_realize(DeviceState *dev, Error= **errp) spapr_register_hypercall(H_EOI, h_eoi); spapr_register_hypercall(H_IPOLL, h_ipoll); =20 - QLIST_FOREACH(ics, &xics->ics, list) { - object_property_set_bool(OBJECT(ics), true, "realized", &error); - if (error) { - error_propagate(errp, error); - return; - } - } - for (i =3D 0; i < xics->nr_servers; i++) { object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", &error); @@ -300,24 +279,12 @@ static void xics_spapr_realize(DeviceState *dev, Erro= r **errp) } } =20 -static void xics_spapr_initfn(Object *obj) -{ - XICSState *xics =3D XICS_SPAPR(obj); - ICSState *ics; - - ics =3D ICS_SIMPLE(object_new(TYPE_ICS_SIMPLE)); - object_property_add_child(obj, "ics", OBJECT(ics), NULL); - ics->xics =3D xics; - QLIST_INSERT_HEAD(&xics->ics, ics, list); -} - static void xics_spapr_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); XICSStateClass *xsc =3D XICS_SPAPR_CLASS(oc); =20 dc->realize =3D xics_spapr_realize; - xsc->set_nr_irqs =3D xics_spapr_set_nr_irqs; xsc->set_nr_servers =3D xics_spapr_set_nr_servers; } =20 @@ -327,7 +294,6 @@ static const TypeInfo xics_spapr_info =3D { .instance_size =3D sizeof(XICSState), .class_size =3D sizeof(XICSStateClass), .class_init =3D xics_spapr_class_init, - .instance_init =3D xics_spapr_initfn, }; =20 #define ICS_IRQ_FREE(ics, srcno) \ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index fa6a2947c791..93a57258efc6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -95,23 +95,42 @@ =20 #define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift)) =20 -static XICSState *try_create_xics(const char *type, int nr_servers, - int nr_irqs, Error **errp) -{ - Error *err =3D NULL; - DeviceState *dev; +static XICSState *try_create_xics(const char *type, const char *type_ics, + int nr_servers, int nr_irqs, Error **err= p) +{ + Error *err =3D NULL, *local_err =3D NULL; + XICSState *xics; + ICSState *ics =3D NULL; + + xics =3D XICS_COMMON(object_new(type)); + qdev_set_parent_bus(DEVICE(xics), sysbus_get_default()); + object_property_set_int(OBJECT(xics), nr_servers, "nr_servers", &err); + object_property_set_bool(OBJECT(xics), true, "realized", &local_err); + error_propagate(&err, local_err); + if (err) { + goto error; + } =20 - dev =3D DEVICE(object_new(type)); - qdev_prop_set_uint32(dev, "nr_servers", nr_servers); - qdev_prop_set_uint32(dev, "nr_irqs", nr_irqs); - qdev_set_parent_bus(dev, sysbus_get_default()); - object_property_set_bool(OBJECT(dev), true, "realized", &err); + ics =3D ICS_SIMPLE(object_new(type_ics)); + object_property_add_child(OBJECT(xics), "ics", OBJECT(ics), NULL); + object_property_set_int(OBJECT(ics), nr_irqs, "nr-irqs", &err); + object_property_add_const_link(OBJECT(ics), "xics", OBJECT(xics), NULL= ); + object_property_set_bool(OBJECT(ics), true, "realized", &local_err); + error_propagate(&err, local_err); if (err) { - error_propagate(errp, err); - object_unparent(OBJECT(dev)); - return NULL; + goto error; } - return XICS_COMMON(dev); + QLIST_INSERT_HEAD(&xics->ics, ics, list); + + return xics; + +error: + error_propagate(errp, err); + if (ics) { + object_unparent(OBJECT(ics)); + } + object_unparent(OBJECT(xics)); + return NULL; } =20 static XICSState *xics_system_init(MachineState *machine, @@ -123,8 +142,8 @@ static XICSState *xics_system_init(MachineState *machin= e, Error *err =3D NULL; =20 if (machine_kernel_irqchip_allowed(machine)) { - xics =3D try_create_xics(TYPE_XICS_SPAPR_KVM, nr_servers, nr_i= rqs, - &err); + xics =3D try_create_xics(TYPE_XICS_SPAPR_KVM, TYPE_ICS_KVM, + nr_servers, nr_irqs, &err); } if (machine_kernel_irqchip_required(machine) && !xics) { error_reportf_err(err, @@ -135,7 +154,8 @@ static XICSState *xics_system_init(MachineState *machin= e, } =20 if (!xics) { - xics =3D try_create_xics(TYPE_XICS_SPAPR, nr_servers, nr_irqs, err= p); + xics =3D try_create_xics(TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, nr_serv= ers, + nr_irqs, errp); } =20 return xics; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 1aefd3d52257..88621591d7d0 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -74,7 +74,6 @@ struct XICSStateClass { DeviceClass parent_class; =20 void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu); - void (*set_nr_irqs)(XICSState *icp, uint32_t nr_irqs, Error **errp); void (*set_nr_servers)(XICSState *icp, uint32_t nr_servers, Error **er= rp); }; =20 @@ -83,7 +82,6 @@ struct XICSState { DeviceState parent_obj; /*< public >*/ uint32_t nr_servers; - uint32_t nr_irqs; ICPState *ss; QLIST_HEAD(, ICSState) ics; }; --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487931921473186.10927506076155; Fri, 24 Feb 2017 02:25:21 -0800 (PST) Received: from localhost ([::1]:35943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chD3v-0002ib-9D for importer@patchew.org; Fri, 24 Feb 2017 05:25:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCxu-0005Il-9M for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCxs-0006G8-Lg for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:06 -0500 Received: from 7.mo5.mail-out.ovh.net ([178.32.124.100]:42777) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCxs-0006Eg-Co for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:04 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 4622BDCA30 for ; Fri, 24 Feb 2017 11:19:03 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id CF7802800BA; Fri, 24 Feb 2017 11:18:57 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:03 +0100 Message-Id: <1487931503-10607-5-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 618963473907813350 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.124.100 Subject: [Qemu-devel] [PATCH v3 04/24] ppc/xics: remove set_nr_servers() handler from XICSStateClass X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Today, the ICP (Interrupt Controller Presenter) objects are created by the 'nr_servers' property handler of the XICS object and a class handler. They are realized in the XICS object realize routine. Let's simplify the process by creating the ICP objects along with the XICS object at the machine level. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 74 +++++++++++++----------------------------------= ---- hw/intc/xics_kvm.c | 21 +-------------- hw/intc/xics_spapr.c | 26 ------------------ hw/ppc/spapr.c | 30 ++++++++++++++++----- include/hw/ppc/xics.h | 3 --- 5 files changed, 42 insertions(+), 112 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index e70d3b8b1095..9f22814815c9 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -151,67 +151,11 @@ static void xics_common_reset(DeviceState *d) } } =20 -void xics_set_nr_servers(XICSState *xics, uint32_t nr_servers, - const char *typename, Error **errp) -{ - int i; - - xics->nr_servers =3D nr_servers; - - xics->ss =3D g_malloc0(xics->nr_servers * sizeof(ICPState)); - for (i =3D 0; i < xics->nr_servers; i++) { - char name[32]; - ICPState *icp =3D &xics->ss[i]; - - object_initialize(icp, sizeof(*icp), typename); - snprintf(name, sizeof(name), "icp[%d]", i); - object_property_add_child(OBJECT(xics), name, OBJECT(icp), errp); - icp->xics =3D xics; - } -} - -static void xics_prop_get_nr_servers(Object *obj, Visitor *v, - const char *name, void *opaque, - Error **errp) -{ - XICSState *xics =3D XICS_COMMON(obj); - int64_t value =3D xics->nr_servers; - - visit_type_int(v, name, &value, errp); -} - -static void xics_prop_set_nr_servers(Object *obj, Visitor *v, - const char *name, void *opaque, - Error **errp) -{ - XICSState *xics =3D XICS_COMMON(obj); - XICSStateClass *xsc =3D XICS_COMMON_GET_CLASS(xics); - Error *error =3D NULL; - int64_t value; - - visit_type_int(v, name, &value, &error); - if (error) { - error_propagate(errp, error); - return; - } - if (xics->nr_servers) { - error_setg(errp, "Number of servers is already set to %u", - xics->nr_servers); - return; - } - - assert(xsc->set_nr_servers); - xsc->set_nr_servers(xics, value, errp); -} - static void xics_common_initfn(Object *obj) { XICSState *xics =3D XICS_COMMON(obj); =20 QLIST_INIT(&xics->ics); - object_property_add(obj, "nr_servers", "int", - xics_prop_get_nr_servers, xics_prop_set_nr_servers, - NULL, NULL, NULL); } =20 static void xics_common_class_init(ObjectClass *oc, void *data) @@ -450,12 +394,30 @@ static void icp_reset(DeviceState *dev) qemu_set_irq(icp->output, 0); } =20 +static void icp_realize(DeviceState *dev, Error **errp) +{ + ICPState *icp =3D ICP(dev); + Object *obj; + Error *err =3D NULL; + + obj =3D object_property_get_link(OBJECT(dev), "xics", &err); + if (!obj) { + error_setg(errp, "%s: required link 'xics' not found: %s", + __func__, error_get_pretty(err)); + return; + } + + icp->xics =3D XICS_COMMON(obj); +} + + static void icp_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->reset =3D icp_reset; dc->vmsd =3D &vmstate_icp_server; + dc->realize =3D icp_realize; } =20 static const TypeInfo icp_info =3D { diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 4a6c0522feb6..6cabc11f6be1 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -368,12 +368,6 @@ static void xics_kvm_cpu_setup(XICSState *xics, PowerP= CCPU *cpu) ss->cap_irq_xics_enabled =3D true; } =20 -static void xics_kvm_set_nr_servers(XICSState *xics, uint32_t nr_servers, - Error **errp) -{ - xics_set_nr_servers(xics, nr_servers, TYPE_KVM_ICP, errp); -} - static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr, uint32_t token, uint32_t nargs, target_ulong args, @@ -386,9 +380,7 @@ static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineSta= te *spapr, static void xics_kvm_realize(DeviceState *dev, Error **errp) { KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(dev); - XICSState *xics =3D XICS_COMMON(dev); - int i, rc; - Error *error =3D NULL; + int rc; struct kvm_create_device xics_create_device =3D { .type =3D KVM_DEV_TYPE_XICS, .flags =3D 0, @@ -438,16 +430,6 @@ static void xics_kvm_realize(DeviceState *dev, Error *= *errp) =20 xicskvm->kernel_xics_fd =3D xics_create_device.fd; =20 - assert(xics->nr_servers); - for (i =3D 0; i < xics->nr_servers; i++) { - object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", - &error); - if (error) { - error_propagate(errp, error); - goto fail; - } - } - kvm_kernel_irqchip =3D true; kvm_msi_via_irqfd_allowed =3D true; kvm_gsi_direct_mapping =3D true; @@ -468,7 +450,6 @@ static void xics_kvm_class_init(ObjectClass *oc, void *= data) =20 dc->realize =3D xics_kvm_realize; xsc->cpu_setup =3D xics_kvm_cpu_setup; - xsc->set_nr_servers =3D xics_kvm_set_nr_servers; } =20 static const TypeInfo xics_spapr_kvm_info =3D { diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 03e42a866603..859b5675e175 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -239,23 +239,8 @@ static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineS= tate *spapr, rtas_st(rets, 0, RTAS_OUT_SUCCESS); } =20 -static void xics_spapr_set_nr_servers(XICSState *xics, uint32_t nr_servers, - Error **errp) -{ - xics_set_nr_servers(xics, nr_servers, TYPE_ICP, errp); -} - static void xics_spapr_realize(DeviceState *dev, Error **errp) { - XICSState *xics =3D XICS_SPAPR(dev); - Error *error =3D NULL; - int i; - - if (!xics->nr_servers) { - error_setg(errp, "Number of servers needs to be greater 0"); - return; - } - /* Registration of global state belongs into realize */ spapr_rtas_register(RTAS_IBM_SET_XIVE, "ibm,set-xive", rtas_set_xive); spapr_rtas_register(RTAS_IBM_GET_XIVE, "ibm,get-xive", rtas_get_xive); @@ -268,24 +253,13 @@ static void xics_spapr_realize(DeviceState *dev, Erro= r **errp) spapr_register_hypercall(H_XIRR_X, h_xirr_x); spapr_register_hypercall(H_EOI, h_eoi); spapr_register_hypercall(H_IPOLL, h_ipoll); - - for (i =3D 0; i < xics->nr_servers; i++) { - object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized", - &error); - if (error) { - error_propagate(errp, error); - return; - } - } } =20 static void xics_spapr_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); - XICSStateClass *xsc =3D XICS_SPAPR_CLASS(oc); =20 dc->realize =3D xics_spapr_realize; - xsc->set_nr_servers =3D xics_spapr_set_nr_servers; } =20 static const TypeInfo xics_spapr_info =3D { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 93a57258efc6..1c6ab756a46e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -96,17 +96,17 @@ #define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift)) =20 static XICSState *try_create_xics(const char *type, const char *type_ics, - int nr_servers, int nr_irqs, Error **err= p) + const char *type_icp, int nr_servers, + int nr_irqs, Error **errp) { Error *err =3D NULL, *local_err =3D NULL; XICSState *xics; ICSState *ics =3D NULL; + int i; =20 xics =3D XICS_COMMON(object_new(type)); qdev_set_parent_bus(DEVICE(xics), sysbus_get_default()); - object_property_set_int(OBJECT(xics), nr_servers, "nr_servers", &err); - object_property_set_bool(OBJECT(xics), true, "realized", &local_err); - error_propagate(&err, local_err); + object_property_set_bool(OBJECT(xics), true, "realized", &err); if (err) { goto error; } @@ -122,6 +122,22 @@ static XICSState *try_create_xics(const char *type, co= nst char *type_ics, } QLIST_INSERT_HEAD(&xics->ics, ics, list); =20 + xics->ss =3D g_malloc0(nr_servers * sizeof(ICPState)); + xics->nr_servers =3D nr_servers; + + for (i =3D 0; i < nr_servers; i++) { + ICPState *icp =3D &xics->ss[i]; + + object_initialize(icp, sizeof(*icp), type_icp); + object_property_add_child(OBJECT(xics), "icp[*]", OBJECT(icp), NUL= L); + object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xics), = NULL); + object_property_set_bool(OBJECT(icp), true, "realized", &err); + if (err) { + goto error; + } + object_unref(OBJECT(icp)); + } + return xics; =20 error: @@ -143,7 +159,7 @@ static XICSState *xics_system_init(MachineState *machin= e, =20 if (machine_kernel_irqchip_allowed(machine)) { xics =3D try_create_xics(TYPE_XICS_SPAPR_KVM, TYPE_ICS_KVM, - nr_servers, nr_irqs, &err); + TYPE_KVM_ICP, nr_servers, nr_irqs, &err= ); } if (machine_kernel_irqchip_required(machine) && !xics) { error_reportf_err(err, @@ -154,8 +170,8 @@ static XICSState *xics_system_init(MachineState *machin= e, } =20 if (!xics) { - xics =3D try_create_xics(TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, nr_serv= ers, - nr_irqs, errp); + xics =3D try_create_xics(TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, TYPE_IC= P, + nr_servers, nr_irqs, errp); } =20 return xics; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 88621591d7d0..0ec585cc93ca 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -74,7 +74,6 @@ struct XICSStateClass { DeviceClass parent_class; =20 void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu); - void (*set_nr_servers)(XICSState *icp, uint32_t nr_servers, Error **er= rp); }; =20 struct XICSState { @@ -189,8 +188,6 @@ void spapr_dt_xics(XICSState *xics, void *fdt, uint32_t= phandle); =20 void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu); -void xics_set_nr_servers(XICSState *xics, uint32_t nr_servers, - const char *typename, Error **errp); =20 /* Internal XICS interfaces */ int xics_get_cpu_index_by_dt_id(int cpu_dt_id); --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932018003895.631445222055; Fri, 24 Feb 2017 02:26:58 -0800 (PST) Received: from localhost ([::1]:35955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chD5U-00047R-IP for importer@patchew.org; Fri, 24 Feb 2017 05:26:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCy4-0005R8-Bs for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCy0-0006QA-6w for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:16 -0500 Received: from 5.mo5.mail-out.ovh.net ([87.98.173.103]:43369) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCxz-0006OC-U7 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:12 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 8CA55DCA6A for ; Fri, 24 Feb 2017 11:19:10 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 4839C2800B9; Fri, 24 Feb 2017 11:19:03 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:04 +0100 Message-Id: <1487931503-10607-6-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 620933801166212070 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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: 87.98.173.103 Subject: [Qemu-devel] [PATCH v3 05/24] ppc/xics: store the ICS object under the sPAPR machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" A list of ICS objects was introduced under the XICS object for the PowerNV machine but, for the sPAPR machine, it brings extra complexity as there is only a single ICS. To simplify the code, let's add the ICS pointer under the sPAPR machine and try to reduce the use of this list where possible. Also, change the xics_spapr_*() routines to use an ICS object instead of an XICSState and change their name to reflect that these are specific to the sPAPR ICS object. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics_spapr.c | 22 +++++++++------------- hw/ppc/spapr.c | 29 ++++++++++++++++------------- hw/ppc/spapr_events.c | 4 ++-- hw/ppc/spapr_pci.c | 8 ++++---- hw/ppc/spapr_vio.c | 2 +- include/hw/ppc/spapr.h | 1 + include/hw/ppc/xics.h | 6 +++--- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 859b5675e175..1501e796e5e0 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -118,7 +118,7 @@ static void rtas_set_xive(PowerPCCPU *cpu, sPAPRMachine= State *spapr, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { - ICSState *ics =3D QLIST_FIRST(&spapr->xics->ics); + ICSState *ics =3D spapr->ics; uint32_t nr, srcno, server, priority; =20 if ((nargs !=3D 3) || (nret !=3D 1)) { @@ -151,7 +151,7 @@ static void rtas_get_xive(PowerPCCPU *cpu, sPAPRMachine= State *spapr, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { - ICSState *ics =3D QLIST_FIRST(&spapr->xics->ics); + ICSState *ics =3D spapr->ics; uint32_t nr, srcno; =20 if ((nargs !=3D 1) || (nret !=3D 3)) { @@ -181,7 +181,7 @@ static void rtas_int_off(PowerPCCPU *cpu, sPAPRMachineS= tate *spapr, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { - ICSState *ics =3D QLIST_FIRST(&spapr->xics->ics); + ICSState *ics =3D spapr->ics; uint32_t nr, srcno; =20 if ((nargs !=3D 1) || (nret !=3D 1)) { @@ -212,7 +212,7 @@ static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineSt= ate *spapr, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { - ICSState *ics =3D QLIST_FIRST(&spapr->xics->ics); + ICSState *ics =3D spapr->ics; uint32_t nr, srcno; =20 if ((nargs !=3D 1) || (nret !=3D 1)) { @@ -294,9 +294,8 @@ static int ics_find_free_block(ICSState *ics, int num, = int alignnum) return -1; } =20 -int xics_spapr_alloc(XICSState *xics, int irq_hint, bool lsi, Error **errp) +int spapr_ics_alloc(ICSState *ics, int irq_hint, bool lsi, Error **errp) { - ICSState *ics =3D QLIST_FIRST(&xics->ics); int irq; =20 if (!ics) { @@ -327,10 +326,9 @@ int xics_spapr_alloc(XICSState *xics, int irq_hint, bo= ol lsi, Error **errp) * Allocate block of consecutive IRQs, and return the number of the first = IRQ in * the block. If align=3D=3Dtrue, aligns the first IRQ number to num. */ -int xics_spapr_alloc_block(XICSState *xics, int num, bool lsi, bool align, - Error **errp) +int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi, + bool align, Error **errp) { - ICSState *ics =3D QLIST_FIRST(&xics->ics); int i, first =3D -1; =20 if (!ics) { @@ -380,11 +378,9 @@ static void ics_free(ICSState *ics, int srcno, int num) } } =20 -void xics_spapr_free(XICSState *xics, int irq, int num) +void spapr_ics_free(ICSState *ics, int irq, int num) { - ICSState *ics =3D xics_find_source(xics, irq); - - if (ics) { + if (ics_valid_irq(ics, irq)) { trace_xics_ics_free(0, irq, num); ics_free(ics, irq - ics->offset, num); } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 1c6ab756a46e..5d2527a0e160 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -95,13 +95,13 @@ =20 #define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift)) =20 -static XICSState *try_create_xics(const char *type, const char *type_ics, +static XICSState *try_create_xics(sPAPRMachineState *spapr, + const char *type, const char *type_ics, const char *type_icp, int nr_servers, int nr_irqs, Error **errp) { Error *err =3D NULL, *local_err =3D NULL; XICSState *xics; - ICSState *ics =3D NULL; int i; =20 xics =3D XICS_COMMON(object_new(type)); @@ -111,16 +111,17 @@ static XICSState *try_create_xics(const char *type, c= onst char *type_ics, goto error; } =20 - ics =3D ICS_SIMPLE(object_new(type_ics)); - object_property_add_child(OBJECT(xics), "ics", OBJECT(ics), NULL); - object_property_set_int(OBJECT(ics), nr_irqs, "nr-irqs", &err); - object_property_add_const_link(OBJECT(ics), "xics", OBJECT(xics), NULL= ); - object_property_set_bool(OBJECT(ics), true, "realized", &local_err); + spapr->ics =3D ICS_SIMPLE(object_new(type_ics)); + object_property_add_child(OBJECT(spapr), "ics", OBJECT(spapr->ics), NU= LL); + object_property_set_int(OBJECT(spapr->ics), nr_irqs, "nr-irqs", &err); + object_property_add_const_link(OBJECT(spapr->ics), "xics", OBJECT(xics= ), + NULL); + object_property_set_bool(OBJECT(spapr->ics), true, "realized", &local_= err); error_propagate(&err, local_err); if (err) { goto error; } - QLIST_INSERT_HEAD(&xics->ics, ics, list); + QLIST_INSERT_HEAD(&xics->ics, spapr->ics, list); =20 xics->ss =3D g_malloc0(nr_servers * sizeof(ICPState)); xics->nr_servers =3D nr_servers; @@ -142,8 +143,8 @@ static XICSState *try_create_xics(const char *type, con= st char *type_ics, =20 error: error_propagate(errp, err); - if (ics) { - object_unparent(OBJECT(ics)); + if (spapr->ics) { + object_unparent(OBJECT(spapr->ics)); } object_unparent(OBJECT(xics)); return NULL; @@ -158,7 +159,8 @@ static XICSState *xics_system_init(MachineState *machin= e, Error *err =3D NULL; =20 if (machine_kernel_irqchip_allowed(machine)) { - xics =3D try_create_xics(TYPE_XICS_SPAPR_KVM, TYPE_ICS_KVM, + xics =3D try_create_xics(SPAPR_MACHINE(machine), + TYPE_XICS_SPAPR_KVM, TYPE_ICS_KVM, TYPE_KVM_ICP, nr_servers, nr_irqs, &err= ); } if (machine_kernel_irqchip_required(machine) && !xics) { @@ -170,8 +172,9 @@ static XICSState *xics_system_init(MachineState *machin= e, } =20 if (!xics) { - xics =3D try_create_xics(TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, TYPE_IC= P, - nr_servers, nr_irqs, errp); + xics =3D try_create_xics(SPAPR_MACHINE(machine), + TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, + TYPE_ICP, nr_servers, nr_irqs, errp); } =20 return xics; diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index f85a9c32a7fc..38b4258a9be7 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -752,7 +752,7 @@ void spapr_events_init(sPAPRMachineState *spapr) spapr->event_sources =3D spapr_event_sources_new(); =20 spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_EPOW, - xics_spapr_alloc(spapr->xics, 0, false, + spapr_ics_alloc(spapr->ics, 0, false, &error_fatal)); =20 /* NOTE: if machine supports modern/dedicated hotplug event source, @@ -765,7 +765,7 @@ void spapr_events_init(sPAPRMachineState *spapr) */ if (spapr->use_hotplug_event_source) { spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_HOT= _PLUG, - xics_spapr_alloc(spapr->xics, 0, fals= e, + spapr_ics_alloc(spapr->ics, 0, false, &error_fatal)); } =20 diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 1c4fa8b0f606..3f580a68be8e 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -326,7 +326,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, return; } =20 - xics_spapr_free(spapr->xics, msi->first_irq, msi->num); + spapr_ics_free(spapr->ics, msi->first_irq, msi->num); if (msi_present(pdev)) { spapr_msi_setmsg(pdev, 0, false, 0, 0); } @@ -364,7 +364,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, } =20 /* Allocate MSIs */ - irq =3D xics_spapr_alloc_block(spapr->xics, req_num, false, + irq =3D spapr_ics_alloc_block(spapr->ics, req_num, false, ret_intr_type =3D=3D RTAS_TYPE_MSI, &err); if (err) { error_reportf_err(err, "Can't allocate MSIs for device %x: ", @@ -375,7 +375,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, =20 /* Release previous MSIs */ if (msi) { - xics_spapr_free(spapr->xics, msi->first_irq, msi->num); + spapr_ics_free(spapr->ics, msi->first_irq, msi->num); g_hash_table_remove(phb->msi, &config_addr); } =20 @@ -1747,7 +1747,7 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) uint32_t irq; Error *local_err =3D NULL; =20 - irq =3D xics_spapr_alloc_block(spapr->xics, 1, true, false, &local= _err); + irq =3D spapr_ics_alloc_block(spapr->ics, 1, true, false, &local_e= rr); if (local_err) { error_propagate(errp, local_err); error_prepend(errp, "can't allocate LSIs: "); diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 8bfc5f971f8e..a0ee4fd26586 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -454,7 +454,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev,= Error **errp) dev->qdev.id =3D id; } =20 - dev->irq =3D xics_spapr_alloc(spapr->xics, dev->irq, false, &local_err= ); + dev->irq =3D spapr_ics_alloc(spapr->ics, dev->irq, false, &local_err); if (local_err) { error_propagate(errp, local_err); return; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index f9b17d860a75..21e506b13cfa 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -59,6 +59,7 @@ struct sPAPRMachineState { QLIST_HEAD(, sPAPRPHBState) phbs; struct sPAPRNVRAM *nvram; XICSState *xics; + ICSState *ics; DeviceState *rtc; =20 void *htab; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 0ec585cc93ca..a36dae79cab5 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -180,10 +180,10 @@ struct ICSIRQState { #define XICS_IRQS_SPAPR 1024 =20 qemu_irq xics_get_qirq(XICSState *icp, int irq); -int xics_spapr_alloc(XICSState *icp, int irq_hint, bool lsi, Error **errp); -int xics_spapr_alloc_block(XICSState *icp, int num, bool lsi, bool align, +int spapr_ics_alloc(ICSState *ics, int irq_hint, bool lsi, Error **errp); +int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi, bool align, Error **errp); -void xics_spapr_free(XICSState *icp, int irq, int num); +void spapr_ics_free(ICSState *ics, int irq, int num); void spapr_dt_xics(XICSState *xics, void *fdt, uint32_t phandle); =20 void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932176727825.5592893379443; Fri, 24 Feb 2017 02:29:36 -0800 (PST) Received: from localhost ([::1]:35966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chD83-0007UP-De for importer@patchew.org; Fri, 24 Feb 2017 05:29:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCy8-0005U6-DM for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCy4-0006Vv-BK for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:20 -0500 Received: from mo5.mail-out.ovh.net ([178.32.228.5]:59801) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCy4-0006Tt-1z for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:16 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id B165EDCA6A for ; Fri, 24 Feb 2017 11:19:14 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 8E820280070; Fri, 24 Feb 2017 11:19:10 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:05 +0100 Message-Id: <1487931503-10607-7-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 622059698790435814 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.228.5 Subject: [Qemu-devel] [PATCH v3 06/24] ppc/xics: add an InterruptStatsProvider interface to ICS and ICP objects X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is, again, to reduce the use of the list of ICS objects. Let's make each individual ICS and ICP object an InterruptStatsProvider and remove this same interface from XICSState. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 76 +++++++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 9f22814815c9..b1294417a0ae 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -92,44 +92,44 @@ void xics_cpu_setup(XICSState *xics, PowerPCCPU *cpu) } } =20 -static void xics_common_pic_print_info(InterruptStatsProvider *obj, - Monitor *mon) +static void icp_pic_print_info(InterruptStatsProvider *obj, + Monitor *mon) { - XICSState *xics =3D XICS_COMMON(obj); - ICSState *ics; + ICPState *icp =3D ICP(obj); + int cpu_index =3D icp->cs ? icp->cs->cpu_index : -1; + + if (!icp->output) { + return; + } + monitor_printf(mon, "CPU %d XIRR=3D%08x (%p) PP=3D%02x MFRR=3D%02x\n", + cpu_index, icp->xirr, icp->xirr_owner, + icp->pending_priority, icp->mfrr); +} + +static void ics_simple_pic_print_info(InterruptStatsProvider *obj, + Monitor *mon) +{ + ICSState *ics =3D ICS_SIMPLE(obj); uint32_t i; =20 - for (i =3D 0; i < xics->nr_servers; i++) { - ICPState *icp =3D &xics->ss[i]; + monitor_printf(mon, "ICS %4x..%4x %p\n", + ics->offset, ics->offset + ics->nr_irqs - 1, ics); =20 - if (!icp->output) { - continue; - } - monitor_printf(mon, "CPU %d XIRR=3D%08x (%p) PP=3D%02x MFRR=3D%02x= \n", - i, icp->xirr, icp->xirr_owner, - icp->pending_priority, icp->mfrr); + if (!ics->irqs) { + return; } =20 - QLIST_FOREACH(ics, &xics->ics, list) { - monitor_printf(mon, "ICS %4x..%4x %p\n", - ics->offset, ics->offset + ics->nr_irqs - 1, ics); + for (i =3D 0; i < ics->nr_irqs; i++) { + ICSIRQState *irq =3D ics->irqs + i; =20 - if (!ics->irqs) { + if (!(irq->flags & XICS_FLAGS_IRQ_MASK)) { continue; } - - for (i =3D 0; i < ics->nr_irqs; i++) { - ICSIRQState *irq =3D ics->irqs + i; - - if (!(irq->flags & XICS_FLAGS_IRQ_MASK)) { - continue; - } - monitor_printf(mon, " %4x %s %02x %02x\n", - ics->offset + i, - (irq->flags & XICS_FLAGS_IRQ_LSI) ? - "LSI" : "MSI", - irq->priority, irq->status); - } + monitor_printf(mon, " %4x %s %02x %02x\n", + ics->offset + i, + (irq->flags & XICS_FLAGS_IRQ_LSI) ? + "LSI" : "MSI", + irq->priority, irq->status); } } =20 @@ -161,10 +161,8 @@ static void xics_common_initfn(Object *obj) static void xics_common_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); - InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(oc); =20 dc->reset =3D xics_common_reset; - ic->print_info =3D xics_common_pic_print_info; } =20 static const TypeInfo xics_common_info =3D { @@ -174,10 +172,6 @@ static const TypeInfo xics_common_info =3D { .class_size =3D sizeof(XICSStateClass), .instance_init =3D xics_common_initfn, .class_init =3D xics_common_class_init, - .interfaces =3D (InterfaceInfo[]) { - { TYPE_INTERRUPT_STATS_PROVIDER }, - { } - }, }; =20 /* @@ -414,10 +408,12 @@ static void icp_realize(DeviceState *dev, Error **err= p) static void icp_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(kla= ss); =20 dc->reset =3D icp_reset; dc->vmsd =3D &vmstate_icp_server; dc->realize =3D icp_realize; + ic->print_info =3D icp_pic_print_info; } =20 static const TypeInfo icp_info =3D { @@ -426,6 +422,10 @@ static const TypeInfo icp_info =3D { .instance_size =3D sizeof(ICPState), .class_init =3D icp_class_init, .class_size =3D sizeof(ICPStateClass), + .interfaces =3D (InterfaceInfo[]) { + { TYPE_INTERRUPT_STATS_PROVIDER }, + { } + }, }; =20 /* @@ -692,6 +692,7 @@ static void ics_simple_class_init(ObjectClass *klass, v= oid *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); ICSStateClass *isc =3D ICS_BASE_CLASS(klass); + InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(kla= ss); =20 dc->realize =3D ics_simple_realize; dc->props =3D ics_simple_properties; @@ -701,6 +702,7 @@ static void ics_simple_class_init(ObjectClass *klass, v= oid *data) isc->reject =3D ics_simple_reject; isc->resend =3D ics_simple_resend; isc->eoi =3D ics_simple_eoi; + ic->print_info =3D ics_simple_pic_print_info; } =20 static const TypeInfo ics_simple_info =3D { @@ -710,6 +712,10 @@ static const TypeInfo ics_simple_info =3D { .class_init =3D ics_simple_class_init, .class_size =3D sizeof(ICSStateClass), .instance_init =3D ics_simple_initfn, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_INTERRUPT_STATS_PROVIDER }, + { } + }, }; =20 static const TypeInfo ics_base_info =3D { --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14879323038851008.0827925773718; Fri, 24 Feb 2017 02:31:43 -0800 (PST) Received: from localhost ([::1]:35981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDA4-0000oC-I5 for importer@patchew.org; Fri, 24 Feb 2017 05:31:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyD-0005ZE-VA for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCy9-0006do-Uh for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:25 -0500 Received: from 6.mo5.mail-out.ovh.net ([178.32.119.138]:38938) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCy9-0006cF-PE for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:21 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 640A4DCAA0 for ; Fri, 24 Feb 2017 11:19:20 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id B54D92800CC; Fri, 24 Feb 2017 11:19:14 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:06 +0100 Message-Id: <1487931503-10607-8-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 623748548891610086 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.138 Subject: [Qemu-devel] [PATCH v3 07/24] ppc/xics: introduce a XICSFabric QOM interface to handle ICSs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This interface provides two simple handlers. One is to get an ICS (Interrupt Source Controller) object from an irq number and a second to resend the irqs when needed. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 7 +++++++ include/hw/ppc/xics.h | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index b1294417a0ae..ba800bacc9ac 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -726,6 +726,12 @@ static const TypeInfo ics_base_info =3D { .class_size =3D sizeof(ICSStateClass), }; =20 +static const TypeInfo xics_fabric_info =3D { + .name =3D TYPE_XICS_FABRIC, + .parent =3D TYPE_INTERFACE, + .class_size =3D sizeof(XICSFabricClass), +}; + /* * Exported functions */ @@ -766,6 +772,7 @@ static void xics_register_types(void) type_register_static(&ics_simple_info); type_register_static(&ics_base_info); type_register_static(&icp_info); + type_register_static(&xics_fabric_info); } =20 type_init(xics_register_types) diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index a36dae79cab5..58d1caa42ad3 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -177,6 +177,24 @@ struct ICSIRQState { uint8_t flags; }; =20 +typedef struct XICSFabric { + Object parent; +} XICSFabric; + +#define TYPE_XICS_FABRIC "xics-fabric" +#define XICS_FABRIC(obj) \ + OBJECT_CHECK(XICSFabric, (obj), TYPE_XICS_FABRIC) +#define XICS_FABRIC_CLASS(klass) \ + OBJECT_CLASS_CHECK(XICSFabricClass, (klass), TYPE_XICS_FABRIC) +#define XICS_FABRIC_GET_CLASS(obj) \ + OBJECT_GET_CLASS(XICSFabricClass, (obj), TYPE_XICS_FABRIC) + +typedef struct XICSFabricClass { + InterfaceClass parent; + ICSState *(*ics_get)(XICSFabric *xi, int irq); + void (*ics_resend)(XICSFabric *xi); +} XICSFabricClass; + #define XICS_IRQS_SPAPR 1024 =20 qemu_irq xics_get_qirq(XICSState *icp, int irq); --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487931975626500.0282154495069; Fri, 24 Feb 2017 02:26:15 -0800 (PST) Received: from localhost ([::1]:35953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chD4m-0003Ww-10 for importer@patchew.org; Fri, 24 Feb 2017 05:26:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyL-0005fc-F7 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyH-0006r7-E2 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:33 -0500 Received: from mo5.mail-out.ovh.net ([178.32.228.5]:45607) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyH-0006pQ-6t for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:29 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 38577DCA82 for ; Fri, 24 Feb 2017 11:19:28 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 68E2428007E; Fri, 24 Feb 2017 11:19:20 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:07 +0100 Message-Id: <1487931503-10607-9-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 626000351943494630 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.228.5 Subject: [Qemu-devel] [PATCH v3 08/24] ppc/xics: use the QOM interface under the sPAPR machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add 'ics_get' and 'ics_resend' handlers to the sPAPR machine. These are relatively simple for a single ICS. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 2 +- hw/ppc/spapr.c | 18 ++++++++++++++++++ include/hw/ppc/xics.h | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index ba800bacc9ac..d654f2103cce 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -193,7 +193,7 @@ static void ics_reject(ICSState *ics, uint32_t nr) } } =20 -static void ics_resend(ICSState *ics) +void ics_resend(ICSState *ics) { ICSStateClass *k =3D ICS_BASE_GET_CLASS(ics); =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5d2527a0e160..d4b97c81fa47 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2909,6 +2909,20 @@ static void spapr_phb_placement(sPAPRMachineState *s= papr, uint32_t index, *mmio64 =3D SPAPR_PCI_BASE + (index + 1) * SPAPR_PCI_MEM64_WIN_SIZE; } =20 +static ICSState *spapr_ics_get(XICSFabric *dev, int irq) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(dev); + + return ics_valid_irq(spapr->ics, irq) ? spapr->ics : NULL; +} + +static void spapr_ics_resend(XICSFabric *dev) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(dev); + + ics_resend(spapr->ics); +} + static void spapr_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -2917,6 +2931,7 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) NMIClass *nc =3D NMI_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); PPCVirtualHypervisorClass *vhc =3D PPC_VIRTUAL_HYPERVISOR_CLASS(oc); + XICSFabricClass *xic =3D XICS_FABRIC_CLASS(oc); =20 mc->desc =3D "pSeries Logical Partition (PAPR compliant)"; =20 @@ -2950,6 +2965,8 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) nc->nmi_monitor_handler =3D spapr_nmi; smc->phb_placement =3D spapr_phb_placement; vhc->hypercall =3D emulate_spapr_hypercall; + xic->ics_get =3D spapr_ics_get; + xic->ics_resend =3D spapr_ics_resend; } =20 static const TypeInfo spapr_machine_info =3D { @@ -2966,6 +2983,7 @@ static const TypeInfo spapr_machine_info =3D { { TYPE_NMI }, { TYPE_HOTPLUG_HANDLER }, { TYPE_PPC_VIRTUAL_HYPERVISOR }, + { TYPE_XICS_FABRIC }, { } }, }; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 58d1caa42ad3..446c10917291 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -222,5 +222,6 @@ void ics_simple_write_xive(ICSState *ics, int nr, int s= erver, void ics_set_irq_type(ICSState *ics, int srcno, bool lsi); =20 ICSState *xics_find_source(XICSState *icp, int irq); +void ics_resend(ICSState *ics); =20 #endif /* XICS_H */ --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932451833449.508760508726; Fri, 24 Feb 2017 02:34:11 -0800 (PST) Received: from localhost ([::1]:35989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDCU-0003bV-Hb for importer@patchew.org; Fri, 24 Feb 2017 05:34:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyT-0005mF-DF for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyP-000720-C1 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:41 -0500 Received: from 20.mo5.mail-out.ovh.net ([91.121.55.239]:57766) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyP-0006zd-52 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:37 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 5814FDCA96 for ; Fri, 24 Feb 2017 11:19:34 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 3BC2128007E; Fri, 24 Feb 2017 11:19:28 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:08 +0100 Message-Id: <1487931503-10607-10-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 627689199546436582 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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: 91.121.55.239 Subject: [Qemu-devel] [PATCH v3 09/24] ppc/xics: use the QOM interface to get irqs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 5 +++-- hw/ppc/spapr_events.c | 6 +++--- hw/ppc/spapr_pci.c | 2 +- include/hw/pci-host/spapr.h | 2 +- include/hw/ppc/spapr_vio.h | 2 +- include/hw/ppc/xics.h | 3 ++- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index d654f2103cce..fbd76b24f51c 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -747,9 +747,10 @@ ICSState *xics_find_source(XICSState *xics, int irq) return NULL; } =20 -qemu_irq xics_get_qirq(XICSState *xics, int irq) +qemu_irq xics_get_qirq(XICSFabric *xi, int irq) { - ICSState *ics =3D xics_find_source(xics, irq); + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); + ICSState *ics =3D xic->ics_get(xi, irq); =20 if (ics) { return ics->qirqs[irq - ics->offset]; diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 38b4258a9be7..24a5758e6243 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -481,7 +481,7 @@ static void spapr_powerdown_req(Notifier *n, void *opaq= ue) =20 rtas_event_log_queue(RTAS_LOG_TYPE_EPOW, new_epow, true); =20 - qemu_irq_pulse(xics_get_qirq(spapr->xics, + qemu_irq_pulse(xics_get_qirq(XICS_FABRIC(spapr), rtas_event_log_to_irq(spapr, RTAS_LOG_TYPE_EPOW)= )); } @@ -574,7 +574,7 @@ static void spapr_hotplug_req_event(uint8_t hp_id, uint= 8_t hp_action, =20 rtas_event_log_queue(RTAS_LOG_TYPE_HOTPLUG, new_hp, true); =20 - qemu_irq_pulse(xics_get_qirq(spapr->xics, + qemu_irq_pulse(xics_get_qirq(XICS_FABRIC(spapr), rtas_event_log_to_irq(spapr, RTAS_LOG_TYPE_HOTPL= UG))); } @@ -695,7 +695,7 @@ static void check_exception(PowerPCCPU *cpu, sPAPRMachi= neState *spapr, spapr_event_sources_get_source(spapr->event_sources, i); =20 g_assert(source->enabled); - qemu_irq_pulse(xics_get_qirq(spapr->xics, source->irq)); + qemu_irq_pulse(xics_get_qirq(XICS_FABRIC(spapr), source->irq)); } } =20 diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 3f580a68be8e..701eb3fec94e 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -737,7 +737,7 @@ static void spapr_msi_write(void *opaque, hwaddr addr, =20 trace_spapr_pci_msi_write(addr, data, irq); =20 - qemu_irq_pulse(xics_get_qirq(spapr->xics, irq)); + qemu_irq_pulse(xics_get_qirq(XICS_FABRIC(spapr), irq)); } =20 static const MemoryRegionOps spapr_msi_ops =3D { diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index 092294ed5a65..dfa76143f305 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -106,7 +106,7 @@ static inline qemu_irq spapr_phb_lsi_qirq(struct sPAPRP= HBState *phb, int pin) { sPAPRMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); =20 - return xics_get_qirq(spapr->xics, phb->lsi_table[pin].irq); + return xics_get_qirq(XICS_FABRIC(spapr), phb->lsi_table[pin].irq); } =20 PCIHostState *spapr_create_phb(sPAPRMachineState *spapr, int index); diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h index fc6f673ea086..2e9685a5d900 100644 --- a/include/hw/ppc/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h @@ -87,7 +87,7 @@ static inline qemu_irq spapr_vio_qirq(VIOsPAPRDevice *dev) { sPAPRMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); =20 - return xics_get_qirq(spapr->xics, dev->irq); + return xics_get_qirq(XICS_FABRIC(spapr), dev->irq); } =20 static inline bool spapr_vio_dma_valid(VIOsPAPRDevice *dev, uint64_t taddr, diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 446c10917291..8a367a27e04d 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -197,7 +197,8 @@ typedef struct XICSFabricClass { =20 #define XICS_IRQS_SPAPR 1024 =20 -qemu_irq xics_get_qirq(XICSState *icp, int irq); +qemu_irq xics_get_qirq(XICSFabric *xi, int irq); + int spapr_ics_alloc(ICSState *ics, int irq_hint, bool lsi, Error **errp); int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi, bool align, Error **errp); --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932720858550.4787582339878; Fri, 24 Feb 2017 02:38:40 -0800 (PST) Received: from localhost ([::1]:36017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDGp-0000CH-Ix for importer@patchew.org; Fri, 24 Feb 2017 05:38:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyW-0005ok-Od for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyS-00076T-Ob for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:44 -0500 Received: from 2.mo5.mail-out.ovh.net ([178.33.109.111]:52577) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyS-00074o-Iz for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:40 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 2D3E5DCA7C for ; Fri, 24 Feb 2017 11:19:39 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id BF1832800BA; Fri, 24 Feb 2017 11:19:34 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:09 +0100 Message-Id: <1487931503-10607-11-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 629096576801213414 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.33.109.111 Subject: [Qemu-devel] [PATCH v3 10/24] ppc/xics: use the QOM interface to resend irqs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index fbd76b24f51c..92bf44a1a82b 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -229,16 +229,15 @@ static void icp_check_ipi(ICPState *ss) qemu_irq_raise(ss->output); } =20 -static void icp_resend(ICPState *ss) +static void icp_resend(XICSFabric *xi, ICPState *ss) { - ICSState *ics; + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); =20 if (ss->mfrr < CPPR(ss)) { icp_check_ipi(ss); } - QLIST_FOREACH(ics, &ss->xics->ics, list) { - ics_resend(ics); - } + + xic->ics_resend(xi); } =20 void icp_set_cppr(ICPState *ss, uint8_t cppr) @@ -262,7 +261,7 @@ void icp_set_cppr(ICPState *ss, uint8_t cppr) } } else { if (!XISR(ss)) { - icp_resend(ss); + icp_resend(XICS_FABRIC(qdev_get_machine()), ss); } } } @@ -299,6 +298,8 @@ uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr) =20 void icp_eoi(ICPState *ss, uint32_t xirr) { + XICSFabric *xi =3D XICS_FABRIC(qdev_get_machine()); + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); ICSState *ics; uint32_t irq; =20 @@ -306,13 +307,13 @@ void icp_eoi(ICPState *ss, uint32_t xirr) ss->xirr =3D (ss->xirr & ~CPPR_MASK) | (xirr & CPPR_MASK); trace_xics_icp_eoi(ss->cs->cpu_index, xirr, ss->xirr); irq =3D xirr & XISR_MASK; - QLIST_FOREACH(ics, &ss->xics->ics, list) { - if (ics_valid_irq(ics, irq)) { - ics_eoi(ics, irq); - } + + ics =3D xic->ics_get(xi, irq); + if (ics) { + ics_eoi(ics, irq); } if (!XISR(ss)) { - icp_resend(ss); + icp_resend(xi, ss); } } =20 @@ -592,10 +593,11 @@ static void ics_simple_reset(DeviceState *dev) =20 static int ics_simple_post_load(ICSState *ics, int version_id) { + XICSFabric *xi =3D XICS_FABRIC(qdev_get_machine()); int i; =20 for (i =3D 0; i < ics->xics->nr_servers; i++) { - icp_resend(&ics->xics->ss[i]); + icp_resend(xi, &ics->xics->ss[i]); } =20 return 0; --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932228618478.54723916568423; Fri, 24 Feb 2017 02:30:28 -0800 (PST) Received: from localhost ([::1]:35973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chD8t-0008Bo-4G for importer@patchew.org; Fri, 24 Feb 2017 05:30:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyb-0005tS-N8 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyX-0007DD-LO for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:49 -0500 Received: from 15.mo5.mail-out.ovh.net ([178.33.107.29]:37057) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyX-0007Aw-Ea for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:45 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 533EDCFA7A for ; Fri, 24 Feb 2017 11:19:44 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 2C4DB2800BA; Fri, 24 Feb 2017 11:19:39 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:10 +0100 Message-Id: <1487931503-10607-12-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 630503949260262374 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.33.107.29 Subject: [Qemu-devel] [PATCH v3 11/24] ppc/xics: remove xics_find_source() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It is not used anymore now that we have the QOM interface for XICS. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 12 ------------ include/hw/ppc/xics.h | 1 - 2 files changed, 13 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 92bf44a1a82b..04138bea0abe 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -737,18 +737,6 @@ static const TypeInfo xics_fabric_info =3D { /* * Exported functions */ -ICSState *xics_find_source(XICSState *xics, int irq) -{ - ICSState *ics; - - QLIST_FOREACH(ics, &xics->ics, list) { - if (ics_valid_irq(ics, irq)) { - return ics; - } - } - return NULL; -} - qemu_irq xics_get_qirq(XICSFabric *xi, int irq) { XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 8a367a27e04d..aaf84b451d3f 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -222,7 +222,6 @@ void ics_simple_write_xive(ICSState *ics, int nr, int s= erver, =20 void ics_set_irq_type(ICSState *ics, int srcno, bool lsi); =20 -ICSState *xics_find_source(XICSState *icp, int irq); void ics_resend(ICSState *ics); =20 #endif /* XICS_H */ --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932614227660.99523580685; Fri, 24 Feb 2017 02:36:54 -0800 (PST) Received: from localhost ([::1]:36009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDF6-000653-Tn for importer@patchew.org; Fri, 24 Feb 2017 05:36:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyi-00061M-FZ for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCye-0007TD-EP for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:56 -0500 Received: from mo5.mail-out.ovh.net ([178.32.228.5]:35177) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCye-0007R4-9P for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:52 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 16B76DCABE for ; Fri, 24 Feb 2017 11:19:49 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 53DFE280097; Fri, 24 Feb 2017 11:19:44 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:11 +0100 Message-Id: <1487931503-10607-13-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 631911323711081446 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.228.5 Subject: [Qemu-devel] [PATCH v3 12/24] ppc/xics: register the reset handler of ICS objects X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The reset of the ICS objects is currently handled by XICS but this can be done for each individual ICS. This also reduces the use of the XICS list of ICS. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 5 ----- hw/ppc/spapr.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 04138bea0abe..0673253330d4 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -139,16 +139,11 @@ static void ics_simple_pic_print_info(InterruptStatsP= rovider *obj, static void xics_common_reset(DeviceState *d) { XICSState *xics =3D XICS_COMMON(d); - ICSState *ics; int i; =20 for (i =3D 0; i < xics->nr_servers; i++) { device_reset(DEVICE(&xics->ss[i])); } - - QLIST_FOREACH(ics, &xics->ics, list) { - device_reset(DEVICE(ics)); - } } =20 static void xics_common_initfn(Object *obj) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d4b97c81fa47..ed109bfb11fa 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -112,6 +112,7 @@ static XICSState *try_create_xics(sPAPRMachineState *sp= apr, } =20 spapr->ics =3D ICS_SIMPLE(object_new(type_ics)); + qdev_set_parent_bus(DEVICE(spapr->ics), sysbus_get_default()); object_property_add_child(OBJECT(spapr), "ics", OBJECT(spapr->ics), NU= LL); object_property_set_int(OBJECT(spapr->ics), nr_irqs, "nr-irqs", &err); object_property_add_const_link(OBJECT(spapr->ics), "xics", OBJECT(xics= ), --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932975160948.7101368215606; Fri, 24 Feb 2017 02:42:55 -0800 (PST) Received: from localhost ([::1]:36047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDKv-0004CD-W7 for importer@patchew.org; Fri, 24 Feb 2017 05:42:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyl-00063f-6M for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyh-0007ZG-3p for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:59 -0500 Received: from 3.mo5.mail-out.ovh.net ([46.105.40.108]:35823) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyg-0007Vb-Uh for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:55 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 96446DCA9C for ; Fri, 24 Feb 2017 11:19:53 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 7312F2800E2; Fri, 24 Feb 2017 11:19:49 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:12 +0100 Message-Id: <1487931503-10607-14-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 633037226301098982 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.40.108 Subject: [Qemu-devel] [PATCH v3 13/24] ppc/xics: remove the XICS list of ICS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is not used anymore. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 8 -------- hw/ppc/spapr.c | 1 - include/hw/ppc/xics.h | 2 -- 3 files changed, 11 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 0673253330d4..2dd0c3165609 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -146,13 +146,6 @@ static void xics_common_reset(DeviceState *d) } } =20 -static void xics_common_initfn(Object *obj) -{ - XICSState *xics =3D XICS_COMMON(obj); - - QLIST_INIT(&xics->ics); -} - static void xics_common_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -165,7 +158,6 @@ static const TypeInfo xics_common_info =3D { .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(XICSState), .class_size =3D sizeof(XICSStateClass), - .instance_init =3D xics_common_initfn, .class_init =3D xics_common_class_init, }; =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ed109bfb11fa..f2528255c9e9 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -122,7 +122,6 @@ static XICSState *try_create_xics(sPAPRMachineState *sp= apr, if (err) { goto error; } - QLIST_INSERT_HEAD(&xics->ics, spapr->ics, list); =20 xics->ss =3D g_malloc0(nr_servers * sizeof(ICPState)); xics->nr_servers =3D nr_servers; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index aaf84b451d3f..f333500b473d 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -82,7 +82,6 @@ struct XICSState { /*< public >*/ uint32_t nr_servers; ICPState *ss; - QLIST_HEAD(, ICSState) ics; }; =20 #define TYPE_ICP "icp" @@ -152,7 +151,6 @@ struct ICSState { qemu_irq *qirqs; ICSIRQState *irqs; XICSState *xics; - QLIST_ENTRY(ICSState) list; }; =20 static inline bool ics_valid_irq(ICSState *ics, uint32_t nr) --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487933233464378.28873745186286; Fri, 24 Feb 2017 02:47:13 -0800 (PST) Received: from localhost ([::1]:36075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDP5-00005C-6i for importer@patchew.org; Fri, 24 Feb 2017 05:47:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyp-00067A-Lu for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyl-0007i5-Li for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:03 -0500 Received: from 8.mo5.mail-out.ovh.net ([178.32.116.78]:58922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyl-0007gi-Eb for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:59 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 75AE0D9687 for ; Fri, 24 Feb 2017 11:19:58 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 97BA02800BA; Fri, 24 Feb 2017 11:19:53 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:13 +0100 Message-Id: <1487931503-10607-15-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 634444598401469414 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.116.78 Subject: [Qemu-devel] [PATCH v3 14/24] ppc/xics: extend the QOM interface to handle ICPs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Let's add two new handlers for ICPs. One is to get an ICP object from a server number and a second is to resend the irqs when needed. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 2 +- hw/ppc/spapr.c | 20 ++++++++++++++++++++ include/hw/ppc/xics.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 2dd0c3165609..05922a040fb5 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -216,7 +216,7 @@ static void icp_check_ipi(ICPState *ss) qemu_irq_raise(ss->output); } =20 -static void icp_resend(XICSFabric *xi, ICPState *ss) +void icp_resend(XICSFabric *xi, ICPState *ss) { XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f2528255c9e9..fa589d5d260c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2923,6 +2923,24 @@ static void spapr_ics_resend(XICSFabric *dev) ics_resend(spapr->ics); } =20 +static ICPState *spapr_icp_get(XICSFabric *xi, int server) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(xi); + + return (server < spapr->xics->nr_servers) ? &spapr->xics->ss[server] : + NULL; +} + +static void spapr_icp_resend(XICSFabric *xi) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(xi); + int i; + + for (i =3D 0; i < spapr->xics->nr_servers; i++) { + icp_resend(xi, &spapr->xics->ss[i]); + } +} + static void spapr_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -2967,6 +2985,8 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) vhc->hypercall =3D emulate_spapr_hypercall; xic->ics_get =3D spapr_ics_get; xic->ics_resend =3D spapr_ics_resend; + xic->icp_get =3D spapr_icp_get; + xic->icp_resend =3D spapr_icp_resend; } =20 static const TypeInfo spapr_machine_info =3D { diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index f333500b473d..814f7ebe2246 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -191,6 +191,8 @@ typedef struct XICSFabricClass { InterfaceClass parent; ICSState *(*ics_get)(XICSFabric *xi, int irq); void (*ics_resend)(XICSFabric *xi); + ICPState *(*icp_get)(XICSFabric *xi, int server); + void (*icp_resend)(XICSFabric *xi); } XICSFabricClass; =20 #define XICS_IRQS_SPAPR 1024 @@ -221,5 +223,6 @@ void ics_simple_write_xive(ICSState *ics, int nr, int s= erver, void ics_set_irq_type(ICSState *ics, int srcno, bool lsi); =20 void ics_resend(ICSState *ics); +void icp_resend(XICSFabric *xi, ICPState *ss); =20 #endif /* XICS_H */ --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 148793289042920.05147316448665; Fri, 24 Feb 2017 02:41:30 -0800 (PST) Received: from localhost ([::1]:36042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDJY-0002c8-NL for importer@patchew.org; Fri, 24 Feb 2017 05:41:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyw-0006Em-03 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyr-0007rQ-Uj for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:10 -0500 Received: from 15.mo5.mail-out.ovh.net ([178.33.107.29]:34016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyr-0007qA-OR for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:05 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id B05F9DCA3A for ; Fri, 24 Feb 2017 11:20:04 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 6A08428007E; Fri, 24 Feb 2017 11:19:58 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:14 +0100 Message-Id: <1487931503-10607-16-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 636133448494320614 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.33.107.29 Subject: [Qemu-devel] [PATCH v3 15/24] ppc/xics: simplify the cpu_setup() handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The cpu_setup() handler currently takes a 'XICSState *' argument to grab the kernel ICP file descriptor. This interface can be simplified by using the 'xics' backlink of the ICP object. This change is also required by subsequent patches which makes use of the QOM interface for XICS. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 5 +++-- hw/intc/xics_kvm.c | 11 +++-------- include/hw/ppc/xics.h | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 05922a040fb5..5e98d53ecc94 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -66,14 +66,15 @@ void xics_cpu_setup(XICSState *xics, PowerPCCPU *cpu) CPUState *cs =3D CPU(cpu); CPUPPCState *env =3D &cpu->env; ICPState *ss =3D &xics->ss[cs->cpu_index]; - XICSStateClass *info =3D XICS_COMMON_GET_CLASS(xics); + XICSStateClass *info; =20 assert(cs->cpu_index < xics->nr_servers); =20 ss->cs =3D cs; =20 + info =3D XICS_COMMON_GET_CLASS(ss->xics); if (info->cpu_setup) { - info->cpu_setup(xics, cpu); + info->cpu_setup(ss, cpu); } =20 switch (PPC_INPUT(env)) { diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 6cabc11f6be1..3941f31c5b3f 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -334,17 +334,12 @@ static const TypeInfo ics_kvm_info =3D { /* * XICS-KVM */ -static void xics_kvm_cpu_setup(XICSState *xics, PowerPCCPU *cpu) +static void xics_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu) { - CPUState *cs; - ICPState *ss; - KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(xics); + CPUState *cs =3D CPU(cpu); + KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(ss->xics); int ret; =20 - cs =3D CPU(cpu); - ss =3D &xics->ss[cs->cpu_index]; - - assert(cs->cpu_index < xics->nr_servers); if (xicskvm->kernel_xics_fd =3D=3D -1) { abort(); } diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 814f7ebe2246..3e7bee107da5 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -73,7 +73,7 @@ typedef struct ICSIRQState ICSIRQState; struct XICSStateClass { DeviceClass parent_class; =20 - void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu); + void (*cpu_setup)(ICPState *icp, PowerPCCPU *cpu); }; =20 struct XICSState { --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932502967982.3739305423405; Fri, 24 Feb 2017 02:35:02 -0800 (PST) Received: from localhost ([::1]:35995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDDI-0004SL-HF for importer@patchew.org; Fri, 24 Feb 2017 05:35:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCz0-0006KV-3v for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyx-00083y-VY for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:14 -0500 Received: from 15.mo5.mail-out.ovh.net ([178.33.107.29]:53256) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyx-00082Q-ML for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:11 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 8777BDCAB5 for ; Fri, 24 Feb 2017 11:20:10 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id B0AE828007E; Fri, 24 Feb 2017 11:20:04 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:15 +0100 Message-Id: <1487931503-10607-17-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 637822301445000166 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.33.107.29 Subject: [Qemu-devel] [PATCH v3 16/24] ppc/xics: use the QOM interface to grab an ICP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Also introduce a xics_icp_get() helper to simplify the changes. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 31 ++++++++++++++++++------------- hw/intc/xics_spapr.c | 17 +++++++++-------- hw/ppc/spapr_cpu_core.c | 4 ++-- include/hw/ppc/xics.h | 8 ++++---- 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 5e98d53ecc94..688802abd80e 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -49,26 +49,26 @@ int xics_get_cpu_index_by_dt_id(int cpu_dt_id) return -1; } =20 -void xics_cpu_destroy(XICSState *xics, PowerPCCPU *cpu) +void xics_cpu_destroy(XICSFabric *xi, PowerPCCPU *cpu) { CPUState *cs =3D CPU(cpu); - ICPState *ss =3D &xics->ss[cs->cpu_index]; + ICPState *ss =3D xics_icp_get(xi, cs->cpu_index); =20 - assert(cs->cpu_index < xics->nr_servers); + assert(ss); assert(cs =3D=3D ss->cs); =20 ss->output =3D NULL; ss->cs =3D NULL; } =20 -void xics_cpu_setup(XICSState *xics, PowerPCCPU *cpu) +void xics_cpu_setup(XICSFabric *xi, PowerPCCPU *cpu) { CPUState *cs =3D CPU(cpu); CPUPPCState *env =3D &cpu->env; - ICPState *ss =3D &xics->ss[cs->cpu_index]; + ICPState *ss =3D xics_icp_get(xi, cs->cpu_index); XICSStateClass *info; =20 - assert(cs->cpu_index < xics->nr_servers); + assert(ss); =20 ss->cs =3D cs; =20 @@ -307,8 +307,9 @@ void icp_eoi(ICPState *ss, uint32_t xirr) =20 static void icp_irq(ICSState *ics, int server, int nr, uint8_t priority) { - XICSState *xics =3D ics->xics; - ICPState *ss =3D xics->ss + server; + XICSFabric *xi =3D XICS_FABRIC(qdev_get_machine()); + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); + ICPState *ss =3D xic->icp_get(xi, server); =20 trace_xics_icp_irq(server, nr, priority); =20 @@ -582,12 +583,9 @@ static void ics_simple_reset(DeviceState *dev) static int ics_simple_post_load(ICSState *ics, int version_id) { XICSFabric *xi =3D XICS_FABRIC(qdev_get_machine()); - int i; - - for (i =3D 0; i < ics->xics->nr_servers; i++) { - icp_resend(xi, &ics->xics->ss[i]); - } + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); =20 + xic->icp_resend(xi); return 0; } =20 @@ -737,6 +735,13 @@ qemu_irq xics_get_qirq(XICSFabric *xi, int irq) return NULL; } =20 +ICPState *xics_icp_get(XICSFabric *xi, int server) +{ + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); + + return xic->icp_get(xi, server); +} + void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) { assert(!(ics->irqs[srcno].flags & XICS_FLAGS_IRQ_MASK)); diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 1501e796e5e0..bc62b0ccc254 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -44,7 +44,7 @@ static target_ulong h_cppr(PowerPCCPU *cpu, sPAPRMachineS= tate *spapr, target_ulong opcode, target_ulong *args) { CPUState *cs =3D CPU(cpu); - ICPState *icp =3D &spapr->xics->ss[cs->cpu_index]; + ICPState *icp =3D xics_icp_get(XICS_FABRIC(spapr), cs->cpu_index); target_ulong cppr =3D args[0]; =20 icp_set_cppr(icp, cppr); @@ -56,12 +56,13 @@ static target_ulong h_ipi(PowerPCCPU *cpu, sPAPRMachine= State *spapr, { target_ulong server =3D xics_get_cpu_index_by_dt_id(args[0]); target_ulong mfrr =3D args[1]; + ICPState *icp =3D xics_icp_get(XICS_FABRIC(spapr), server); =20 - if (server >=3D spapr->xics->nr_servers) { + if (!icp) { return H_PARAMETER; } =20 - icp_set_mfrr(spapr->xics->ss + server, mfrr); + icp_set_mfrr(icp, mfrr); return H_SUCCESS; } =20 @@ -69,7 +70,7 @@ static target_ulong h_xirr(PowerPCCPU *cpu, sPAPRMachineS= tate *spapr, target_ulong opcode, target_ulong *args) { CPUState *cs =3D CPU(cpu); - ICPState *icp =3D &spapr->xics->ss[cs->cpu_index]; + ICPState *icp =3D xics_icp_get(XICS_FABRIC(spapr), cs->cpu_index); uint32_t xirr =3D icp_accept(icp); =20 args[0] =3D xirr; @@ -80,7 +81,7 @@ static target_ulong h_xirr_x(PowerPCCPU *cpu, sPAPRMachin= eState *spapr, target_ulong opcode, target_ulong *args) { CPUState *cs =3D CPU(cpu); - ICPState *icp =3D &spapr->xics->ss[cs->cpu_index]; + ICPState *icp =3D xics_icp_get(XICS_FABRIC(spapr), cs->cpu_index); uint32_t xirr =3D icp_accept(icp); =20 args[0] =3D xirr; @@ -92,7 +93,7 @@ static target_ulong h_eoi(PowerPCCPU *cpu, sPAPRMachineSt= ate *spapr, target_ulong opcode, target_ulong *args) { CPUState *cs =3D CPU(cpu); - ICPState *icp =3D &spapr->xics->ss[cs->cpu_index]; + ICPState *icp =3D xics_icp_get(XICS_FABRIC(spapr), cs->cpu_index); target_ulong xirr =3D args[0]; =20 icp_eoi(icp, xirr); @@ -103,7 +104,7 @@ static target_ulong h_ipoll(PowerPCCPU *cpu, sPAPRMachi= neState *spapr, target_ulong opcode, target_ulong *args) { CPUState *cs =3D CPU(cpu); - ICPState *icp =3D &spapr->xics->ss[cs->cpu_index]; + ICPState *icp =3D xics_icp_get(XICS_FABRIC(spapr), cs->cpu_index); uint32_t mfrr; uint32_t xirr =3D icp_ipoll(icp, &mfrr); =20 @@ -134,7 +135,7 @@ static void rtas_set_xive(PowerPCCPU *cpu, sPAPRMachine= State *spapr, server =3D xics_get_cpu_index_by_dt_id(rtas_ld(args, 1)); priority =3D rtas_ld(args, 2); =20 - if (!ics_valid_irq(ics, nr) || (server >=3D ics->xics->nr_servers) + if (!ics_valid_irq(ics, nr) || !xics_icp_get(XICS_FABRIC(spapr), serve= r) || (priority > 0xff)) { rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR); return; diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 55cd0456ebe8..befe53a65863 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -42,7 +42,7 @@ static void spapr_cpu_destroy(PowerPCCPU *cpu) { sPAPRMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); =20 - xics_cpu_destroy(spapr->xics, cpu); + xics_cpu_destroy(XICS_FABRIC(spapr), cpu); qemu_unregister_reset(spapr_cpu_reset, cpu); } =20 @@ -76,7 +76,7 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, Powe= rPCCPU *cpu, cs->numa_node =3D i; } =20 - xics_cpu_setup(spapr->xics, cpu); + xics_cpu_setup(XICS_FABRIC(spapr), cpu); =20 qemu_register_reset(spapr_cpu_reset, cpu); spapr_cpu_reset(cpu); diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 3e7bee107da5..1961ee2a690f 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -197,16 +197,16 @@ typedef struct XICSFabricClass { =20 #define XICS_IRQS_SPAPR 1024 =20 -qemu_irq xics_get_qirq(XICSFabric *xi, int irq); - int spapr_ics_alloc(ICSState *ics, int irq_hint, bool lsi, Error **errp); int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi, bool align, Error **errp); void spapr_ics_free(ICSState *ics, int irq, int num); void spapr_dt_xics(XICSState *xics, void *fdt, uint32_t phandle); =20 -void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); -void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu); +qemu_irq xics_get_qirq(XICSFabric *xi, int irq); +ICPState *xics_icp_get(XICSFabric *xi, int server); +void xics_cpu_setup(XICSFabric *xi, PowerPCCPU *cpu); +void xics_cpu_destroy(XICSFabric *xi, PowerPCCPU *cpu); =20 /* Internal XICS interfaces */ int xics_get_cpu_index_by_dt_id(int cpu_dt_id); --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487933531679691.707869494381; Fri, 24 Feb 2017 02:52:11 -0800 (PST) Received: from localhost ([::1]:36104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDTu-00059c-Dw for importer@patchew.org; Fri, 24 Feb 2017 05:52:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCz6-0006Qd-Lf for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCz2-0008Ah-LC for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:20 -0500 Received: from 20.mo5.mail-out.ovh.net ([91.121.55.239]:34015) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCz2-00088f-Ft for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:16 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id F092DDCAC3 for ; Fri, 24 Feb 2017 11:20:14 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 892412800BA; Fri, 24 Feb 2017 11:20:10 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:16 +0100 Message-Id: <1487931503-10607-18-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 638948197228252134 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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: 91.121.55.239 Subject: [Qemu-devel] [PATCH v3 17/24] ppc/xics: simplify spapr_dt_xics() interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" spapr_dt_xics() only needs the number of servers to build the device tree nodes. Let's change the routine interface to reflect that. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics_spapr.c | 4 ++-- hw/ppc/spapr.c | 2 +- include/hw/ppc/xics.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index bc62b0ccc254..35045a20b860 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -387,10 +387,10 @@ void spapr_ics_free(ICSState *ics, int irq, int num) } } =20 -void spapr_dt_xics(XICSState *xics, void *fdt, uint32_t phandle) +void spapr_dt_xics(int nr_servers, void *fdt, uint32_t phandle) { uint32_t interrupt_server_ranges_prop[] =3D { - 0, cpu_to_be32(xics->nr_servers), + 0, cpu_to_be32(nr_servers), }; int node; =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index fa589d5d260c..82f6cfb21ece 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -964,7 +964,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); =20 /* /interrupt controller */ - spapr_dt_xics(spapr->xics, fdt, PHANDLE_XICP); + spapr_dt_xics(spapr->xics->nr_servers, fdt, PHANDLE_XICP); =20 ret =3D spapr_populate_memory(spapr, fdt); if (ret < 0) { diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 1961ee2a690f..879853cc69c2 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -201,7 +201,7 @@ int spapr_ics_alloc(ICSState *ics, int irq_hint, bool l= si, Error **errp); int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi, bool align, Error **errp); void spapr_ics_free(ICSState *ics, int irq, int num); -void spapr_dt_xics(XICSState *xics, void *fdt, uint32_t phandle); +void spapr_dt_xics(int nr_servers, void *fdt, uint32_t phandle); =20 qemu_irq xics_get_qirq(XICSFabric *xi, int irq); ICPState *xics_icp_get(XICSFabric *xi, int server); --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932033949311.4716016785469; Fri, 24 Feb 2017 02:27:13 -0800 (PST) Received: from localhost ([::1]:35956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chD5k-0004ML-O5 for importer@patchew.org; Fri, 24 Feb 2017 05:27:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCzD-0006Wk-Rs for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCz9-0008L6-Qu for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:27 -0500 Received: from 15.mo5.mail-out.ovh.net ([178.33.107.29]:55035) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCz9-0008Ju-LQ for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:23 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 9D239DCAE4 for ; Fri, 24 Feb 2017 11:20:19 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id E947C2800C5; Fri, 24 Feb 2017 11:20:14 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:17 +0100 Message-Id: <1487931503-10607-19-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 640355572187106278 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.33.107.29 Subject: [Qemu-devel] [PATCH v3 18/24] ppc/xics: register the reset handler of ICP objects X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The reset of the ICP objects is currently handled by XICS but this can be done for each individual ICP. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 18 ------------------ hw/ppc/spapr.c | 1 + 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 688802abd80e..30ddc54ce8e3 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -137,29 +137,11 @@ static void ics_simple_pic_print_info(InterruptStatsP= rovider *obj, /* * XICS Common class - parent for emulated XICS and KVM-XICS */ -static void xics_common_reset(DeviceState *d) -{ - XICSState *xics =3D XICS_COMMON(d); - int i; - - for (i =3D 0; i < xics->nr_servers; i++) { - device_reset(DEVICE(&xics->ss[i])); - } -} - -static void xics_common_class_init(ObjectClass *oc, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(oc); - - dc->reset =3D xics_common_reset; -} - static const TypeInfo xics_common_info =3D { .name =3D TYPE_XICS_COMMON, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(XICSState), .class_size =3D sizeof(XICSStateClass), - .class_init =3D xics_common_class_init, }; =20 /* diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 82f6cfb21ece..ae9a59b226c7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -130,6 +130,7 @@ static XICSState *try_create_xics(sPAPRMachineState *sp= apr, ICPState *icp =3D &xics->ss[i]; =20 object_initialize(icp, sizeof(*icp), type_icp); + qdev_set_parent_bus(DEVICE(icp), sysbus_get_default()); object_property_add_child(OBJECT(xics), "icp[*]", OBJECT(icp), NUL= L); object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xics), = NULL); object_property_set_bool(OBJECT(icp), true, "realized", &err); --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932291020887.7324151263103; Fri, 24 Feb 2017 02:31:31 -0800 (PST) Received: from localhost ([::1]:35980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chD9t-0000gM-Ho for importer@patchew.org; Fri, 24 Feb 2017 05:31:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCzF-0006YH-FD for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCzB-0008NP-DS for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:29 -0500 Received: from 17.mo5.mail-out.ovh.net ([46.105.56.132]:47112) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCzB-0008MA-7S for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:25 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 447F6DCACB for ; Fri, 24 Feb 2017 11:20:24 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id A7E04280091; Fri, 24 Feb 2017 11:20:19 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:18 +0100 Message-Id: <1487931503-10607-20-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 641762948095445990 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.132 Subject: [Qemu-devel] [PATCH v3 19/24] ppc/xics: move the ICP array under the sPAPR machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is the last step to remove the XICSState abstraction and have the machine hold all the objects related to interrupts : ICSs and ICPs. Signed-off-by: C=C3=A9dric Le Goater --- hw/ppc/spapr.c | 17 ++++++++--------- include/hw/ppc/spapr.h | 3 +++ include/hw/ppc/xics.h | 2 -- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ae9a59b226c7..032c8ab008d8 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -123,15 +123,15 @@ static XICSState *try_create_xics(sPAPRMachineState *= spapr, goto error; } =20 - xics->ss =3D g_malloc0(nr_servers * sizeof(ICPState)); - xics->nr_servers =3D nr_servers; + spapr->icps =3D g_malloc0(nr_servers * sizeof(ICPState)); + spapr->nr_servers =3D nr_servers; =20 for (i =3D 0; i < nr_servers; i++) { - ICPState *icp =3D &xics->ss[i]; + ICPState *icp =3D &spapr->icps[i]; =20 object_initialize(icp, sizeof(*icp), type_icp); qdev_set_parent_bus(DEVICE(icp), sysbus_get_default()); - object_property_add_child(OBJECT(xics), "icp[*]", OBJECT(icp), NUL= L); + object_property_add_child(OBJECT(spapr), "icp[*]", OBJECT(icp), NU= LL); object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xics), = NULL); object_property_set_bool(OBJECT(icp), true, "realized", &err); if (err) { @@ -965,7 +965,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); =20 /* /interrupt controller */ - spapr_dt_xics(spapr->xics->nr_servers, fdt, PHANDLE_XICP); + spapr_dt_xics(spapr->nr_servers, fdt, PHANDLE_XICP); =20 ret =3D spapr_populate_memory(spapr, fdt); if (ret < 0) { @@ -2928,8 +2928,7 @@ static ICPState *spapr_icp_get(XICSFabric *xi, int se= rver) { sPAPRMachineState *spapr =3D SPAPR_MACHINE(xi); =20 - return (server < spapr->xics->nr_servers) ? &spapr->xics->ss[server] : - NULL; + return (server < spapr->nr_servers) ? &spapr->icps[server] : NULL; } =20 static void spapr_icp_resend(XICSFabric *xi) @@ -2937,8 +2936,8 @@ static void spapr_icp_resend(XICSFabric *xi) sPAPRMachineState *spapr =3D SPAPR_MACHINE(xi); int i; =20 - for (i =3D 0; i < spapr->xics->nr_servers; i++) { - icp_resend(xi, &spapr->xics->ss[i]); + for (i =3D 0; i < spapr->nr_servers; i++) { + icp_resend(xi, &spapr->icps[i]); } } =20 diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 21e506b13cfa..f5bbb040f941 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -95,6 +95,9 @@ struct sPAPRMachineState { /*< public >*/ char *kvm_type; MemoryHotplugState hotplug_memory; + + uint32_t nr_servers; + ICPState *icps; }; =20 #define H_SUCCESS 0 diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 879853cc69c2..332a96b51d1c 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -80,8 +80,6 @@ struct XICSState { /*< private >*/ DeviceState parent_obj; /*< public >*/ - uint32_t nr_servers; - ICPState *ss; }; =20 #define TYPE_ICP "icp" --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487933180014317.8799604715715; Fri, 24 Feb 2017 02:46:20 -0800 (PST) Received: from localhost ([::1]:36073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDOE-0007sT-Ot for importer@patchew.org; Fri, 24 Feb 2017 05:46:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCzH-0006ad-VY for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCzG-0008St-M5 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:31 -0500 Received: from 17.mo5.mail-out.ovh.net ([46.105.56.132]:44020) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCzG-0008Ra-GF for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:30 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 76F18DCAC6 for ; Fri, 24 Feb 2017 11:20:29 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 443EA280091; Fri, 24 Feb 2017 11:20:24 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:19 +0100 Message-Id: <1487931503-10607-21-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 643170325157219302 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.132 Subject: [Qemu-devel] [PATCH v3 20/24] ppc/xics: move kernel_xics_fd out of KVMXICSState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The kernel ICP file descriptor is the only reason behind the KVMXICSState class and it's in the way of more cleanups. Let's make it a static for the moment and move forward. If this is problem, we could use an attribute under the sPAPR machine later on. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics_kvm.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 3941f31c5b3f..19c55fa74412 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -40,6 +40,8 @@ =20 #include =20 +static int kernel_xics_fd =3D -1; + typedef struct KVMXICSState { XICSState parent_obj; =20 @@ -145,7 +147,6 @@ static const TypeInfo icp_kvm_info =3D { */ static void ics_get_kvm_state(ICSState *ics) { - KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(ics->xics); uint64_t state; struct kvm_device_attr attr =3D { .flags =3D 0, @@ -160,7 +161,7 @@ static void ics_get_kvm_state(ICSState *ics) =20 attr.attr =3D i + ics->offset; =20 - ret =3D ioctl(xicskvm->kernel_xics_fd, KVM_GET_DEVICE_ATTR, &attr); + ret =3D ioctl(kernel_xics_fd, KVM_GET_DEVICE_ATTR, &attr); if (ret !=3D 0) { error_report("Unable to retrieve KVM interrupt controller stat= e" " for IRQ %d: %s", i + ics->offset, strerror(errno)); @@ -204,7 +205,6 @@ static void ics_get_kvm_state(ICSState *ics) =20 static int ics_set_kvm_state(ICSState *ics, int version_id) { - KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(ics->xics); uint64_t state; struct kvm_device_attr attr =3D { .flags =3D 0, @@ -238,7 +238,7 @@ static int ics_set_kvm_state(ICSState *ics, int version= _id) } } =20 - ret =3D ioctl(xicskvm->kernel_xics_fd, KVM_SET_DEVICE_ATTR, &attr); + ret =3D ioctl(kernel_xics_fd, KVM_SET_DEVICE_ATTR, &attr); if (ret !=3D 0) { error_report("Unable to restore KVM interrupt controller state" " for IRQs %d: %s", i + ics->offset, strerror(errno)); @@ -337,10 +337,9 @@ static const TypeInfo ics_kvm_info =3D { static void xics_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu) { CPUState *cs =3D CPU(cpu); - KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(ss->xics); int ret; =20 - if (xicskvm->kernel_xics_fd =3D=3D -1) { + if (kernel_xics_fd =3D=3D -1) { abort(); } =20 @@ -353,7 +352,7 @@ static void xics_kvm_cpu_setup(ICPState *ss, PowerPCCPU= *cpu) return; } =20 - ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, xicskvm->kernel_x= ics_fd, + ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, kernel_xics_fd, kvm_arch_vcpu_id(cs)); if (ret < 0) { error_report("Unable to connect CPU%ld to kernel XICS: %s", @@ -374,7 +373,6 @@ static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineSta= te *spapr, =20 static void xics_kvm_realize(DeviceState *dev, Error **errp) { - KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(dev); int rc; struct kvm_create_device xics_create_device =3D { .type =3D KVM_DEV_TYPE_XICS, @@ -423,7 +421,7 @@ static void xics_kvm_realize(DeviceState *dev, Error **= errp) goto fail; } =20 - xicskvm->kernel_xics_fd =3D xics_create_device.fd; + kernel_xics_fd =3D xics_create_device.fd; =20 kvm_kernel_irqchip =3D true; kvm_msi_via_irqfd_allowed =3D true; --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932573988431.77948601718356; Fri, 24 Feb 2017 02:36:13 -0800 (PST) Received: from localhost ([::1]:36007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDER-0005VF-FJ for importer@patchew.org; Fri, 24 Feb 2017 05:36:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCzQ-0006iZ-Kg for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCzM-0000Bu-Iq for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:40 -0500 Received: from mo5.mail-out.ovh.net ([178.32.228.5]:47997) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCzM-0000AT-Ck for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:36 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 6BD6BDCADC for ; Fri, 24 Feb 2017 11:20:35 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 8E4CD280091; Fri, 24 Feb 2017 11:20:29 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:20 +0100 Message-Id: <1487931503-10607-22-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 644859173435902950 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.228.5 Subject: [Qemu-devel] [PATCH v3 21/24] ppc/xics: move the cpu_setup() handler under the ICPState class X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The cpu_setup() handler is currently under the XICSState class but it really belongs under ICPState as it is setting up an individual vCPU. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 8 +++---- hw/intc/xics_kvm.c | 58 +++++++++++++++++++++++++----------------------= ---- include/hw/ppc/xics.h | 3 +-- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 30ddc54ce8e3..571063a67125 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -66,15 +66,15 @@ void xics_cpu_setup(XICSFabric *xi, PowerPCCPU *cpu) CPUState *cs =3D CPU(cpu); CPUPPCState *env =3D &cpu->env; ICPState *ss =3D xics_icp_get(xi, cs->cpu_index); - XICSStateClass *info; + ICPStateClass *icpc; =20 assert(ss); =20 ss->cs =3D cs; =20 - info =3D XICS_COMMON_GET_CLASS(ss->xics); - if (info->cpu_setup) { - info->cpu_setup(ss, cpu); + icpc =3D ICP_GET_CLASS(ss); + if (icpc->cpu_setup) { + icpc->cpu_setup(ss, cpu); } =20 switch (PPC_INPUT(env)) { diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 19c55fa74412..850777eab913 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -124,6 +124,34 @@ static void icp_kvm_reset(DeviceState *dev) icp_set_kvm_state(icp, 1); } =20 +static void icp_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu) +{ + CPUState *cs =3D CPU(cpu); + int ret; + + if (kernel_xics_fd =3D=3D -1) { + abort(); + } + + /* + * If we are reusing a parked vCPU fd corresponding to the CPU + * which was hot-removed earlier we don't have to renable + * KVM_CAP_IRQ_XICS capability again. + */ + if (ss->cap_irq_xics_enabled) { + return; + } + + ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, kernel_xics_fd, + kvm_arch_vcpu_id(cs)); + if (ret < 0) { + error_report("Unable to connect CPU%ld to kernel XICS: %s", + kvm_arch_vcpu_id(cs), strerror(errno)); + exit(1); + } + ss->cap_irq_xics_enabled =3D true; +} + static void icp_kvm_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -132,6 +160,7 @@ static void icp_kvm_class_init(ObjectClass *klass, void= *data) dc->reset =3D icp_kvm_reset; icpc->pre_save =3D icp_get_kvm_state; icpc->post_load =3D icp_set_kvm_state; + icpc->cpu_setup =3D icp_kvm_cpu_setup; } =20 static const TypeInfo icp_kvm_info =3D { @@ -334,33 +363,6 @@ static const TypeInfo ics_kvm_info =3D { /* * XICS-KVM */ -static void xics_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu) -{ - CPUState *cs =3D CPU(cpu); - int ret; - - if (kernel_xics_fd =3D=3D -1) { - abort(); - } - - /* - * If we are reusing a parked vCPU fd corresponding to the CPU - * which was hot-removed earlier we don't have to renable - * KVM_CAP_IRQ_XICS capability again. - */ - if (ss->cap_irq_xics_enabled) { - return; - } - - ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, kernel_xics_fd, - kvm_arch_vcpu_id(cs)); - if (ret < 0) { - error_report("Unable to connect CPU%ld to kernel XICS: %s", - kvm_arch_vcpu_id(cs), strerror(errno)); - exit(1); - } - ss->cap_irq_xics_enabled =3D true; -} =20 static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr, uint32_t token, @@ -439,10 +441,8 @@ fail: static void xics_kvm_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); - XICSStateClass *xsc =3D XICS_COMMON_CLASS(oc); =20 dc->realize =3D xics_kvm_realize; - xsc->cpu_setup =3D xics_kvm_cpu_setup; } =20 static const TypeInfo xics_spapr_kvm_info =3D { diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 332a96b51d1c..1ea8d8139678 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -72,8 +72,6 @@ typedef struct ICSIRQState ICSIRQState; =20 struct XICSStateClass { DeviceClass parent_class; - - void (*cpu_setup)(ICPState *icp, PowerPCCPU *cpu); }; =20 struct XICSState { @@ -98,6 +96,7 @@ struct ICPStateClass { =20 void (*pre_save)(ICPState *s); int (*post_load)(ICPState *s, int version_id); + void (*cpu_setup)(ICPState *icp, PowerPCCPU *cpu); }; =20 struct ICPState { --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487933464895311.7052862875528; Fri, 24 Feb 2017 02:51:04 -0800 (PST) Received: from localhost ([::1]:36101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDSp-0004Gx-DO for importer@patchew.org; Fri, 24 Feb 2017 05:51:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCza-0006qd-5I for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCzW-0000PQ-2O for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:50 -0500 Received: from 9.mo5.mail-out.ovh.net ([178.32.96.204]:45158) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCzV-0000K6-Rm for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:45 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 49ED8DCAC8 for ; Fri, 24 Feb 2017 11:20:42 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 6CE23280070; Fri, 24 Feb 2017 11:20:35 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:21 +0100 Message-Id: <1487931503-10607-23-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 646829499064159206 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.96.204 Subject: [Qemu-devel] [PATCH v3 22/24] ppc/xics: remove the 'xics' backlinks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" These are not used anymore. Do the cleanups Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 28 ---------------------------- hw/intc/xics_kvm.c | 10 ---------- hw/ppc/spapr.c | 3 --- include/hw/ppc/xics.h | 3 --- 4 files changed, 44 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 571063a67125..565b5ec0686a 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -360,23 +360,6 @@ static void icp_reset(DeviceState *dev) qemu_set_irq(icp->output, 0); } =20 -static void icp_realize(DeviceState *dev, Error **errp) -{ - ICPState *icp =3D ICP(dev); - Object *obj; - Error *err =3D NULL; - - obj =3D object_property_get_link(OBJECT(dev), "xics", &err); - if (!obj) { - error_setg(errp, "%s: required link 'xics' not found: %s", - __func__, error_get_pretty(err)); - return; - } - - icp->xics =3D XICS_COMMON(obj); -} - - static void icp_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -384,7 +367,6 @@ static void icp_class_init(ObjectClass *klass, void *da= ta) =20 dc->reset =3D icp_reset; dc->vmsd =3D &vmstate_icp_server; - dc->realize =3D icp_realize; ic->print_info =3D icp_pic_print_info; } =20 @@ -634,16 +616,6 @@ static void ics_simple_initfn(Object *obj) static void ics_simple_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS_SIMPLE(dev); - Object *obj; - Error *err =3D NULL; - - obj =3D object_property_get_link(OBJECT(dev), "xics", &err); - if (!obj) { - error_setg(errp, "%s: required link 'xics' not found: %s", - __func__, error_get_pretty(err)); - return; - } - ics->xics =3D XICS_COMMON(obj); =20 if (!ics->nr_irqs) { error_setg(errp, "Number of interrupts needs to be greater 0"); diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 850777eab913..7c1809873c29 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -323,16 +323,6 @@ static void ics_kvm_reset(DeviceState *dev) static void ics_kvm_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS_SIMPLE(dev); - Object *obj; - Error *err =3D NULL; - - obj =3D object_property_get_link(OBJECT(dev), "xics", &err); - if (!obj) { - error_setg(errp, "%s: required link 'xics' not found: %s", - __func__, error_get_pretty(err)); - return; - } - ics->xics =3D XICS_COMMON(obj); =20 if (!ics->nr_irqs) { error_setg(errp, "Number of interrupts needs to be greater 0"); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 032c8ab008d8..cfd0139dd418 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -115,8 +115,6 @@ static XICSState *try_create_xics(sPAPRMachineState *sp= apr, qdev_set_parent_bus(DEVICE(spapr->ics), sysbus_get_default()); object_property_add_child(OBJECT(spapr), "ics", OBJECT(spapr->ics), NU= LL); object_property_set_int(OBJECT(spapr->ics), nr_irqs, "nr-irqs", &err); - object_property_add_const_link(OBJECT(spapr->ics), "xics", OBJECT(xics= ), - NULL); object_property_set_bool(OBJECT(spapr->ics), true, "realized", &local_= err); error_propagate(&err, local_err); if (err) { @@ -132,7 +130,6 @@ static XICSState *try_create_xics(sPAPRMachineState *sp= apr, object_initialize(icp, sizeof(*icp), type_icp); qdev_set_parent_bus(DEVICE(icp), sysbus_get_default()); object_property_add_child(OBJECT(spapr), "icp[*]", OBJECT(icp), NU= LL); - object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xics), = NULL); object_property_set_bool(OBJECT(icp), true, "realized", &err); if (err) { goto error; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 1ea8d8139678..d1d110051c72 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -110,8 +110,6 @@ struct ICPState { uint8_t mfrr; qemu_irq output; bool cap_irq_xics_enabled; - - XICSState *xics; }; =20 #define TYPE_ICS_BASE "ics-base" @@ -147,7 +145,6 @@ struct ICSState { uint32_t offset; qemu_irq *qirqs; ICSIRQState *irqs; - XICSState *xics; }; =20 static inline bool ics_valid_irq(ICSState *ics, uint32_t nr) --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487932851711429.77146158732864; Fri, 24 Feb 2017 02:40:51 -0800 (PST) Received: from localhost ([::1]:36039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDIw-00024l-Al for importer@patchew.org; Fri, 24 Feb 2017 05:40:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCzd-0006u7-1r for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCzZ-0000Tf-0p for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:53 -0500 Received: from 16.mo5.mail-out.ovh.net ([87.98.174.144]:41579) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCzY-0000SH-Qz for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:48 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id CB3BFDCAAB for ; Fri, 24 Feb 2017 11:20:47 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 4D7D9280091; Fri, 24 Feb 2017 11:20:42 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:22 +0100 Message-Id: <1487931503-10607-24-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 648236873306508262 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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: 87.98.174.144 Subject: [Qemu-devel] [PATCH v3 23/24] ppc/xics: export the XICS init routines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There is nothing left related to the XICS object in the realize functions of the KVMXICSState and XICSState class. So adapt the interfaces to call these routines directly from the sPAPR machine init sequence. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics_kvm.c | 13 +++---------- hw/intc/xics_spapr.c | 11 ++--------- hw/ppc/spapr.c | 4 +++- include/hw/ppc/xics.h | 5 +++++ 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 7c1809873c29..4ea34ea6dac5 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -363,7 +363,7 @@ static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineSta= te *spapr, __func__); } =20 -static void xics_kvm_realize(DeviceState *dev, Error **errp) +int xics_kvm_init(sPAPRMachineState *spapr, Error **errp) { int rc; struct kvm_create_device xics_create_device =3D { @@ -419,27 +419,20 @@ static void xics_kvm_realize(DeviceState *dev, Error = **errp) kvm_msi_via_irqfd_allowed =3D true; kvm_gsi_direct_mapping =3D true; =20 - return; + return rc; =20 fail: kvmppc_define_rtas_kernel_token(0, "ibm,set-xive"); kvmppc_define_rtas_kernel_token(0, "ibm,get-xive"); kvmppc_define_rtas_kernel_token(0, "ibm,int-on"); kvmppc_define_rtas_kernel_token(0, "ibm,int-off"); -} - -static void xics_kvm_class_init(ObjectClass *oc, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(oc); - - dc->realize =3D xics_kvm_realize; + return -1; } =20 static const TypeInfo xics_spapr_kvm_info =3D { .name =3D TYPE_XICS_SPAPR_KVM, .parent =3D TYPE_XICS_COMMON, .instance_size =3D sizeof(KVMXICSState), - .class_init =3D xics_kvm_class_init, }; =20 static void xics_kvm_register_types(void) diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 35045a20b860..aaf6808cd220 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -240,7 +240,7 @@ static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineSt= ate *spapr, rtas_st(rets, 0, RTAS_OUT_SUCCESS); } =20 -static void xics_spapr_realize(DeviceState *dev, Error **errp) +int xics_spapr_init(sPAPRMachineState *spapr, Error **errp) { /* Registration of global state belongs into realize */ spapr_rtas_register(RTAS_IBM_SET_XIVE, "ibm,set-xive", rtas_set_xive); @@ -254,13 +254,7 @@ static void xics_spapr_realize(DeviceState *dev, Error= **errp) spapr_register_hypercall(H_XIRR_X, h_xirr_x); spapr_register_hypercall(H_EOI, h_eoi); spapr_register_hypercall(H_IPOLL, h_ipoll); -} - -static void xics_spapr_class_init(ObjectClass *oc, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(oc); - - dc->realize =3D xics_spapr_realize; + return 0; } =20 static const TypeInfo xics_spapr_info =3D { @@ -268,7 +262,6 @@ static const TypeInfo xics_spapr_info =3D { .parent =3D TYPE_XICS_COMMON, .instance_size =3D sizeof(XICSState), .class_size =3D sizeof(XICSStateClass), - .class_init =3D xics_spapr_class_init, }; =20 #define ICS_IRQ_FREE(ics, srcno) \ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index cfd0139dd418..0a730bd69862 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -156,7 +156,8 @@ static XICSState *xics_system_init(MachineState *machin= e, if (kvm_enabled()) { Error *err =3D NULL; =20 - if (machine_kernel_irqchip_allowed(machine)) { + if (machine_kernel_irqchip_allowed(machine) && + !xics_kvm_init(SPAPR_MACHINE(machine), errp)) { xics =3D try_create_xics(SPAPR_MACHINE(machine), TYPE_XICS_SPAPR_KVM, TYPE_ICS_KVM, TYPE_KVM_ICP, nr_servers, nr_irqs, &err= ); @@ -170,6 +171,7 @@ static XICSState *xics_system_init(MachineState *machin= e, } =20 if (!xics) { + xics_spapr_init(SPAPR_MACHINE(machine), errp); xics =3D try_create_xics(SPAPR_MACHINE(machine), TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, TYPE_ICP, nr_servers, nr_irqs, errp); diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index d1d110051c72..ac98d5448d19 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -219,4 +219,9 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool ls= i); void ics_resend(ICSState *ics); void icp_resend(XICSFabric *xi, ICPState *ss); =20 +typedef struct sPAPRMachineState sPAPRMachineState; + +int xics_kvm_init(sPAPRMachineState *spapr, Error **errp); +int xics_spapr_init(sPAPRMachineState *spapr, Error **errp); + #endif /* XICS_H */ --=20 2.7.4 From nobody Mon May 6 23:27:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487933711534741.9230832566385; Fri, 24 Feb 2017 02:55:11 -0800 (PST) Received: from localhost ([::1]:36124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDWo-00005Y-7r for importer@patchew.org; Fri, 24 Feb 2017 05:55:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCzi-0006ye-9c for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCze-0000aI-6Z for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:58 -0500 Received: from mo5.mail-out.ovh.net ([178.32.228.5]:50225) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCzd-0000ZN-Q3 for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:54 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id A7B3ADCAF1 for ; Fri, 24 Feb 2017 11:20:52 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id CBE9A28007C; Fri, 24 Feb 2017 11:20:47 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:23 +0100 Message-Id: <1487931503-10607-25-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 649644248439360486 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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.228.5 Subject: [Qemu-devel] [PATCH v3 24/24] ppc/xics: remove the XICSState classes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The XICSState classes are not used anymore. They have now been fully deprecated by the XICSFabric QOM interface. Do the cleanups. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 11 ----------- hw/intc/xics_kvm.c | 13 ------------- hw/intc/xics_spapr.c | 14 -------------- hw/ppc/spapr.c | 41 +++++++++++++++-------------------------- include/hw/ppc/spapr.h | 1 - include/hw/ppc/xics.h | 35 ----------------------------------- 6 files changed, 15 insertions(+), 100 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 565b5ec0686a..5c078ce6950e 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -135,16 +135,6 @@ static void ics_simple_pic_print_info(InterruptStatsPr= ovider *obj, } =20 /* - * XICS Common class - parent for emulated XICS and KVM-XICS - */ -static const TypeInfo xics_common_info =3D { - .name =3D TYPE_XICS_COMMON, - .parent =3D TYPE_DEVICE, - .instance_size =3D sizeof(XICSState), - .class_size =3D sizeof(XICSStateClass), -}; - -/* * ICP: Presentation layer */ =20 @@ -706,7 +696,6 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool ls= i) =20 static void xics_register_types(void) { - type_register_static(&xics_common_info); type_register_static(&ics_simple_info); type_register_static(&ics_base_info); type_register_static(&icp_info); diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 4ea34ea6dac5..15e3e338f39c 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -42,12 +42,6 @@ =20 static int kernel_xics_fd =3D -1; =20 -typedef struct KVMXICSState { - XICSState parent_obj; - - int kernel_xics_fd; -} KVMXICSState; - /* * ICP-KVM */ @@ -429,15 +423,8 @@ fail: return -1; } =20 -static const TypeInfo xics_spapr_kvm_info =3D { - .name =3D TYPE_XICS_SPAPR_KVM, - .parent =3D TYPE_XICS_COMMON, - .instance_size =3D sizeof(KVMXICSState), -}; - static void xics_kvm_register_types(void) { - type_register_static(&xics_spapr_kvm_info); type_register_static(&ics_kvm_info); type_register_static(&icp_kvm_info); } diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index aaf6808cd220..84d24b2837a7 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -257,13 +257,6 @@ int xics_spapr_init(sPAPRMachineState *spapr, Error **= errp) return 0; } =20 -static const TypeInfo xics_spapr_info =3D { - .name =3D TYPE_XICS_SPAPR, - .parent =3D TYPE_XICS_COMMON, - .instance_size =3D sizeof(XICSState), - .class_size =3D sizeof(XICSStateClass), -}; - #define ICS_IRQ_FREE(ics, srcno) \ (!((ics)->irqs[(srcno)].flags & (XICS_FLAGS_IRQ_MASK))) =20 @@ -400,10 +393,3 @@ void spapr_dt_xics(int nr_servers, void *fdt, uint32_t= phandle) _FDT(fdt_setprop_cell(fdt, node, "linux,phandle", phandle)); _FDT(fdt_setprop_cell(fdt, node, "phandle", phandle)); } - -static void xics_spapr_register_types(void) -{ - type_register_static(&xics_spapr_info); -} - -type_init(xics_spapr_register_types) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0a730bd69862..1e8e152c6f49 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -95,22 +95,13 @@ =20 #define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift)) =20 -static XICSState *try_create_xics(sPAPRMachineState *spapr, - const char *type, const char *type_ics, +static int try_create_xics(sPAPRMachineState *spapr, const char *type_ics, const char *type_icp, int nr_servers, int nr_irqs, Error **errp) { Error *err =3D NULL, *local_err =3D NULL; - XICSState *xics; int i; =20 - xics =3D XICS_COMMON(object_new(type)); - qdev_set_parent_bus(DEVICE(xics), sysbus_get_default()); - object_property_set_bool(OBJECT(xics), true, "realized", &err); - if (err) { - goto error; - } - spapr->ics =3D ICS_SIMPLE(object_new(type_ics)); qdev_set_parent_bus(DEVICE(spapr->ics), sysbus_get_default()); object_property_add_child(OBJECT(spapr), "ics", OBJECT(spapr->ics), NU= LL); @@ -137,32 +128,31 @@ static XICSState *try_create_xics(sPAPRMachineState *= spapr, object_unref(OBJECT(icp)); } =20 - return xics; + return 0; =20 error: error_propagate(errp, err); if (spapr->ics) { object_unparent(OBJECT(spapr->ics)); } - object_unparent(OBJECT(xics)); - return NULL; + return -1; } =20 -static XICSState *xics_system_init(MachineState *machine, - int nr_servers, int nr_irqs, Error **er= rp) +static int xics_system_init(MachineState *machine, + int nr_servers, int nr_irqs, Error **errp) { - XICSState *xics =3D NULL; + int rc =3D -1; =20 if (kvm_enabled()) { Error *err =3D NULL; =20 if (machine_kernel_irqchip_allowed(machine) && !xics_kvm_init(SPAPR_MACHINE(machine), errp)) { - xics =3D try_create_xics(SPAPR_MACHINE(machine), - TYPE_XICS_SPAPR_KVM, TYPE_ICS_KVM, + rc =3D try_create_xics(SPAPR_MACHINE(machine), + TYPE_ICS_KVM, TYPE_KVM_ICP, nr_servers, nr_irqs, &err= ); } - if (machine_kernel_irqchip_required(machine) && !xics) { + if (machine_kernel_irqchip_required(machine) && rc < 0) { error_reportf_err(err, "kernel_irqchip requested but unavailable: "= ); } else { @@ -170,14 +160,14 @@ static XICSState *xics_system_init(MachineState *mach= ine, } } =20 - if (!xics) { + if (rc < 0) { xics_spapr_init(SPAPR_MACHINE(machine), errp); - xics =3D try_create_xics(SPAPR_MACHINE(machine), - TYPE_XICS_SPAPR, TYPE_ICS_SIMPLE, + rc =3D try_create_xics(SPAPR_MACHINE(machine), + TYPE_ICS_SIMPLE, TYPE_ICP, nr_servers, nr_irqs, errp); } =20 - return xics; + return rc; } =20 static int spapr_fixup_cpu_smt_dt(void *fdt, int offset, PowerPCCPU *cpu, @@ -1939,9 +1929,8 @@ static void ppc_spapr_init(MachineState *machine) load_limit =3D MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; =20 /* Set up Interrupt Controller before we create the VCPUs */ - spapr->xics =3D xics_system_init(machine, - DIV_ROUND_UP(max_cpus * smt, smp_thread= s), - XICS_IRQS_SPAPR, &error_fatal); + xics_system_init(machine, DIV_ROUND_UP(max_cpus * smt, smp_threads), + XICS_IRQS_SPAPR, &error_fatal); =20 /* Set up containers for ibm,client-set-architecture negotiated option= s */ spapr->ov5 =3D spapr_ovec_new(); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index f5bbb040f941..cfd271129dd0 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -58,7 +58,6 @@ struct sPAPRMachineState { struct VIOsPAPRBus *vio_bus; QLIST_HEAD(, sPAPRPHBState) phbs; struct sPAPRNVRAM *nvram; - XICSState *xics; ICSState *ics; DeviceState *rtc; =20 diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index ac98d5448d19..d7f2ef143436 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -30,29 +30,6 @@ =20 #include "hw/sysbus.h" =20 -#define TYPE_XICS_COMMON "xics-common" -#define XICS_COMMON(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_COMMON) - -/* - * Retain xics as the type name to be compatible for migration. Rest all t= he - * functions, class and variables are renamed as xics_spapr. - */ -#define TYPE_XICS_SPAPR "xics" -#define XICS_SPAPR(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_SPAPR) - -#define TYPE_XICS_SPAPR_KVM "xics-spapr-kvm" -#define XICS_SPAPR_KVM(obj) \ - OBJECT_CHECK(KVMXICSState, (obj), TYPE_XICS_SPAPR_KVM) - -#define XICS_COMMON_CLASS(klass) \ - OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_COMMON) -#define XICS_SPAPR_CLASS(klass) \ - OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_SPAPR) -#define XICS_COMMON_GET_CLASS(obj) \ - OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_COMMON) -#define XICS_SPAPR_GET_CLASS(obj) \ - OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_SPAPR) - #define XICS_IPI 0x2 #define XICS_BUID 0x1 #define XICS_IRQ_BASE (XICS_BUID << 12) @@ -62,24 +39,12 @@ * (the kernel implementation supports more but we don't exploit * that yet) */ -typedef struct XICSStateClass XICSStateClass; -typedef struct XICSState XICSState; typedef struct ICPStateClass ICPStateClass; typedef struct ICPState ICPState; typedef struct ICSStateClass ICSStateClass; typedef struct ICSState ICSState; typedef struct ICSIRQState ICSIRQState; =20 -struct XICSStateClass { - DeviceClass parent_class; -}; - -struct XICSState { - /*< private >*/ - DeviceState parent_obj; - /*< public >*/ -}; - #define TYPE_ICP "icp" #define ICP(obj) OBJECT_CHECK(ICPState, (obj), TYPE_ICP) =20 --=20 2.7.4