From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a05:6512:3aa:0:0:0:0 with SMTP id v10csp6332047lfp; Tue, 18 Feb 2020 09:06:17 -0800 (PST) X-Google-Smtp-Source: APXvYqySyuuFLe0MTrI1GgNMWNKo4KZOEY9oCE4WuXqr2V5WBBG0MANFbDwlAkw2klKY1gmpSh9F X-Received: by 2002:ac8:691a:: with SMTP id e26mr18325068qtr.287.1582045577146; Tue, 18 Feb 2020 09:06:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582045577; cv=none; d=google.com; s=arc-20160816; b=SN9T+bdkSUxHwmP3lS/pSFCiODSQjrXXeqPQlFejklDFDGKLlGiB6VlBV1aEQprR6y apDR1Qsgo7TK5dxlMWJwMbcDvfrpTR7hOImjSv9CufIWBTD77AqU6VV8fXpigl9/qrrl YzLuBB8l8JIBMmP4h3ul4YiiJ3TWKkyDtOU5IoMr7kNkNdQsoX47UvMZVizARfVhxPHe NDpCyR+WS9559mXJJ6zbRo60oVaJVDLcZJ3Leb8GHJgg3vzLUDM1ZLhVayBG3DMYsBxh TI6Eh9hx03bLnR3Tl7/w95F3t3trt85qLL4lGZUAlYlHZKOMY9xLBf4eZxCuyCFjXNHC kldQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:subject:to:from:date :dkim-signature; bh=myoy6JXUj+nllLguLBu0pbrMScpLHj+hvPz2cBoFfwQ=; b=eMen16wAf1Y5qxBd7xhI56usxB7liQmBGtA57FaZ8kG8pLvRfC5H5Bq0nvQsM14KcG iiaAQMSw0jvacdddHqq6c8WiLAT8eL8Nwe5vQBSsOl+ec70DX8EjeneJYbdpZXrBFCT2 HrR0H3C1dxe9NrW8L8H2IbZGxnN18YejX17bhcJQaAi0OJAR4gZET25J0s7FUAFicpD3 pYvVMshIVa2MiLhIBP0PCqGb9sxClV6mPt9ZiZDDlVP7iDq376UK4xKa8Pvz2EGqisAI fI/YUMB2LjoRRTSjU7BPF+2yA+S164zo4QvUpWOde++jFMp+inCFX2hqineaEBZJAUOn dg8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=UH7ko+f4; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u24si1997820qtb.270.2020.02.18.09.06.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Feb 2020 09:06:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=UH7ko+f4; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:38690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j46K8-0003B0-Gp for alex.bennee@linaro.org; Tue, 18 Feb 2020 12:06:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50200) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j46Id-0001N2-7X for qemu-devel@nongnu.org; Tue, 18 Feb 2020 12:04:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j46Ib-00006p-IR for qemu-devel@nongnu.org; Tue, 18 Feb 2020 12:04:43 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:53388 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j46Ib-00006E-BE for qemu-devel@nongnu.org; Tue, 18 Feb 2020 12:04:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582045480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=myoy6JXUj+nllLguLBu0pbrMScpLHj+hvPz2cBoFfwQ=; b=UH7ko+f4trgXbXGlV/GDio0sD41P5VLf00cMx7WQNQIOdQqfJPtlz3OfSTPNZVA6W69RKW O1DprDa5rsK0dEPyD4uwDrL/HlL9Bz9IfpwfYJqDL1QzX2zWwGFsvuexM2GTGHmqt/i1U2 QVRf8HGy3TVwflkClENYWAPFLwnHP1k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-239-kRxAve1uN0qQW492QmwBRg-1; Tue, 18 Feb 2020 12:04:34 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A2A68107ACC9; Tue, 18 Feb 2020 17:04:32 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64A4C90533; Tue, 18 Feb 2020 17:04:28 +0000 (UTC) Date: Tue, 18 Feb 2020 18:04:26 +0100 From: Igor Mammedov To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH v2 07/13] hw/arm/bcm2836: QOM'ify more by adding class_init() to each SoC type Message-ID: <20200218180426.008080b4@redhat.com> In-Reply-To: <20200217114533.17779-8-f4bug@amsat.org> References: <20200217114533.17779-1-f4bug@amsat.org> <20200217114533.17779-8-f4bug@amsat.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: kRxAve1uN0qQW492QmwBRg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-devel@nongnu.org, Andrew Baumann , qemu-arm@nongnu.org, Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , Luc Michel Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: 23TtG1zLsjko On Mon, 17 Feb 2020 12:45:27 +0100 Philippe Mathieu-Daud=C3=A9 wrote: > Remove usage of TypeInfo::class_data. Instead fill the fields in > the corresponding class_init(). >=20 > Cc: Igor Mammedov > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > hw/arm/bcm2836.c | 109 ++++++++++++++++++++++------------------------- > 1 file changed, 51 insertions(+), 58 deletions(-) >=20 > diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c > index 24109fef1d..683d04d6ea 100644 > --- a/hw/arm/bcm2836.c > +++ b/hw/arm/bcm2836.c > @@ -16,57 +16,30 @@ > #include "hw/arm/raspi_platform.h" > #include "hw/sysbus.h" > =20 > -typedef struct BCM283XInfo BCM283XInfo; > - > typedef struct BCM283XClass { > /*< private >*/ > DeviceClass parent_class; > /*< public >*/ > - const BCM283XInfo *info; > -} BCM283XClass; > - > -struct BCM283XInfo { > - const char *name; > const char *cpu_type; probably could be cleaned up by using machine->cpu_type/machine_class->defa= ult_cpu_type (no need to change this patch as it's separate issue) > hwaddr peri_base; /* Peripheral base address seen by the CPU */ > hwaddr ctrl_base; /* Interrupt controller and mailboxes etc. */ > int clusterid; > -}; > +} BCM283XClass; > =20 > #define BCM283X_CLASS(klass) \ > OBJECT_CLASS_CHECK(BCM283XClass, (klass), TYPE_BCM283X) > #define BCM283X_GET_CLASS(obj) \ > OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X) > =20 > -static const BCM283XInfo bcm283x_socs[] =3D { > - { > - .name =3D TYPE_BCM2836, > - .cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a7"), > - .peri_base =3D 0x3f000000, > - .ctrl_base =3D 0x40000000, > - .clusterid =3D 0xf, > - }, > -#ifdef TARGET_AARCH64 > - { > - .name =3D TYPE_BCM2837, > - .cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a53"), > - .peri_base =3D 0x3f000000, > - .ctrl_base =3D 0x40000000, > - .clusterid =3D 0x0, > - }, > -#endif > -}; > - > static void bcm2836_init(Object *obj) > { > BCM283XState *s =3D BCM283X(obj); > BCM283XClass *bc =3D BCM283X_GET_CLASS(obj); > - const BCM283XInfo *info =3D bc->info; > int n; > =20 > for (n =3D 0; n < BCM283X_NCPUS; n++) { > object_initialize_child(obj, "cpu[*]", &s->cpu[n].core, > - sizeof(s->cpu[n].core), info->cpu_type, > + sizeof(s->cpu[n].core), bc->cpu_type, > &error_abort, NULL); > } > =20 > @@ -85,7 +58,6 @@ static void bcm2836_realize(DeviceState *dev, Error **e= rrp) > { > BCM283XState *s =3D BCM283X(dev); > BCM283XClass *bc =3D BCM283X_GET_CLASS(dev); > - const BCM283XInfo *info =3D bc->info; > Object *obj; > Error *err =3D NULL; > int n; > @@ -119,7 +91,7 @@ static void bcm2836_realize(DeviceState *dev, Error **= errp) > } > =20 > sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->peripherals), 0, > - info->peri_base, 1); > + bc->peri_base, 1); > =20 > /* bcm2836 interrupt controller (and mailboxes, etc.) */ > object_property_set_bool(OBJECT(&s->control), true, "realized", &err= ); > @@ -128,7 +100,7 @@ static void bcm2836_realize(DeviceState *dev, Error *= *errp) > return; > } > =20 > - sysbus_mmio_map(SYS_BUS_DEVICE(&s->control), 0, info->ctrl_base); > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->control), 0, bc->ctrl_base); > =20 > sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 0, > qdev_get_gpio_in_named(DEVICE(&s->control), "gpu-irq", 0)); > @@ -137,11 +109,11 @@ static void bcm2836_realize(DeviceState *dev, Error= **errp) > =20 > for (n =3D 0; n < BCM283X_NCPUS; n++) { > /* TODO: this should be converted to a property of ARM_CPU */ > - s->cpu[n].core.mp_affinity =3D (info->clusterid << 8) | n; > + s->cpu[n].core.mp_affinity =3D (bc->clusterid << 8) | n; > =20 > /* set periphbase/CBAR value for CPU-local registers */ > object_property_set_int(OBJECT(&s->cpu[n].core), > - info->peri_base, > + bc->peri_base, > "reset-cbar", &err); > if (err) { > error_propagate(errp, err); > @@ -190,38 +162,59 @@ static Property bcm2836_props[] =3D { > static void bcm283x_class_init(ObjectClass *oc, void *data) > { > DeviceClass *dc =3D DEVICE_CLASS(oc); > - BCM283XClass *bc =3D BCM283X_CLASS(oc); > =20 > - bc->info =3D data; > - dc->realize =3D bcm2836_realize; > - device_class_set_props(dc, bcm2836_props); > /* Reason: Must be wired up in code (see raspi_init() function) */ > dc->user_creatable =3D false; > } > =20 > -static const TypeInfo bcm283x_type_info =3D { > - .name =3D TYPE_BCM283X, > - .parent =3D TYPE_DEVICE, > - .instance_size =3D sizeof(BCM283XState), > - .instance_init =3D bcm2836_init, > - .class_size =3D sizeof(BCM283XClass), > - .abstract =3D true, > +static void bcm2836_class_init(ObjectClass *oc, void *data) > +{ > + DeviceClass *dc =3D DEVICE_CLASS(oc); > + BCM283XClass *bc =3D BCM283X_CLASS(oc); > + > + bc->cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a7"); > + bc->peri_base =3D 0x3f000000; > + bc->ctrl_base =3D 0x40000000; > + bc->clusterid =3D 0xf; > + dc->realize =3D bcm2836_realize; > + device_class_set_props(dc, bcm2836_props); > }; > =20 > -static void bcm2836_register_types(void) > +#ifdef TARGET_AARCH64 > +static void bcm2837_class_init(ObjectClass *oc, void *data) > { > - int i; > + DeviceClass *dc =3D DEVICE_CLASS(oc); > + BCM283XClass *bc =3D BCM283X_CLASS(oc); > =20 > - type_register_static(&bcm283x_type_info); > - for (i =3D 0; i < ARRAY_SIZE(bcm283x_socs); i++) { > - TypeInfo ti =3D { > - .name =3D bcm283x_socs[i].name, > - .parent =3D TYPE_BCM283X, > - .class_init =3D bcm283x_class_init, > - .class_data =3D (void *) &bcm283x_socs[i], > - }; > - type_register(&ti); > + bc->cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a53"); > + bc->peri_base =3D 0x3f000000; > + bc->ctrl_base =3D 0x40000000; > + bc->clusterid =3D 0x0; > + dc->realize =3D bcm2836_realize; > + device_class_set_props(dc, bcm2836_props); both children do use the same values for almost all fields. I'd set in children class_init()s only cpu_type/clusterid and keep common bits in base class. > +}; > +#endif > + > +static const TypeInfo bcm283x_types[] =3D { > + { > + .name =3D TYPE_BCM2836, > + .parent =3D TYPE_BCM283X, > + .class_init =3D bcm2836_class_init, > +#ifdef TARGET_AARCH64 > + }, { > + .name =3D TYPE_BCM2837, > + .parent =3D TYPE_BCM283X, > + .class_init =3D bcm2837_class_init, > +#endif > + }, { > + .name =3D TYPE_BCM283X, > + .parent =3D TYPE_DEVICE, > + .instance_size =3D sizeof(BCM283XState), > + .instance_init =3D bcm2836_init, > + .class_size =3D sizeof(BCM283XClass), > + .class_init =3D bcm283x_class_init, > + .abstract =3D true, > } > -} > +}; > =20 > -type_init(bcm2836_register_types) > +DEFINE_TYPES(bcm283x_types)