From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603558896; cv=none; d=zohomail.com; s=zohoarc; b=NJbqDeLisIs+yi5cfrZLCYp9+lEiDuhI90uaPLIXxMXZkZhrG3lvEJmZuUifmBuK2xZHmbjqfPsv4ZT3L5h8Jbi/dI4KCMayopfGrkZRF1MwGJx2dfO1OujblnVKFAUmHQ9FkTpiooLbpPLt8XL7//3y9vp+AFpsHlylonCAhdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558896; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JltEwXbGzmO7Iz477A1CNJvyjNGP/jwshVCvgGssOxI=; b=Kjh+mvP6UAjKaPzxFsVsfVAKFlLtAdokvu1osqe9ftN32a8tYKMqKWNxJ47PE/75OdCbWmRt2TaKNDq6kGRJGEaK8Sx9LJSfln0hkkxZQcbvIBGfCa0FCx+gpDiATXKAxu43j6Sth6Lz6hnVr+iL09OLTp9IzVfH5HKfy7uMIsQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 1603558896940872.4888972264444; Sat, 24 Oct 2020 10:01:36 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id y12so6439025wrp.6 for ; Sat, 24 Oct 2020 10:01:36 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id q5sm13581801wrs.54.2020.10.24.10.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JltEwXbGzmO7Iz477A1CNJvyjNGP/jwshVCvgGssOxI=; b=GwzJh/5HvIMW1HN/x+/u1vbdXDls3UbtgIv9AuP4kGrCnbou9hLYR8d4YvmCJRYXpv VXP7PE7EPk38lVmbvSExFhND/2l6IxIxImJX4UKYH5iSCmcYhqxrWFG8hKMRVsr7Cuum odKSxvIQn7XP6tIlw2O9NQk86zzyIGGoqjfT5dTFWwNbXCp2alM3WHRhLL1TrUgISpAq DCSuV2yU42az2baWrrx1vfrrP4/TMwMueCBz16T8VsvAcJNXnU3a4qJ5+4AgYS9op3eb SixzTLQiev/1sRhMnYZHjZCqwZpLOaic1J7mqkIQtm7M45hDr2PtlavkyrmxNMn7ujLm 7XsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JltEwXbGzmO7Iz477A1CNJvyjNGP/jwshVCvgGssOxI=; b=pm5DXN8jSUHncwtiWJoU8hlu7z2mSl8fuQwtcV4oDkujrhIgjcxqkG3MJ04/dRNr3J lKPBi8tMsdqU1YPBIdCxD0x+Se7l21dIMoobHyNgEwzit1RV4dbv7zPwQkWGikaKAyn1 c23HiSf3mVnX64Ju4dK26DzjI2s/19Lwy4d9GycSvtyFMfgKyTugj+cvWSR2KtutJ2kN 3BDEYoCOomaNkHr+YBwCK+gXC9Vh+Itf74623Y/Y4wsgxMu3Z+7JHj+44Zft+SvSs7Tq m3FbQjRwLhJ/5SRRI0sudnPd/dvfi6wDArXvIS+bGAw09BxYIuNnlGdkJs7OKN1s4KoH PjYw== X-Gm-Message-State: AOAM5301XpV6sbfpetl/nvEV0FeNvkNapOkP4wZ5kaUgeWBv5PmMM1VP rX0R/w6iFgg8lNDgCHfsUlA= X-Google-Smtp-Source: ABdhPJxIMeyJQrJINxobfBB/6PSTQH2Jk+bKOwynBJmuLLuecA+/z95+RbCLVJM4h57tnZ42TJEEnA== X-Received: by 2002:a5d:66d2:: with SMTP id k18mr9226262wrw.229.1603558895163; Sat, 24 Oct 2020 10:01:35 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Luc Michel Subject: [PATCH v4 1/9] hw/arm/bcm2836: Restrict BCM283XInfo declaration to C source Date: Sat, 24 Oct 2020 19:01:19 +0200 Message-Id: <20201024170127.3592182-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) No code out of bcm2836.c uses (or requires) the BCM283XInfo declarations. Move it locally to the C source file. Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/bcm2836.h | 8 -------- hw/arm/bcm2836.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index 428c15d316e..43e9f8cd0ef 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -43,12 +43,4 @@ struct BCM283XState { BCM2835PeripheralState peripherals; }; =20 -typedef struct BCM283XInfo BCM283XInfo; - -struct BCM283XClass { - DeviceClass parent_class; - const BCM283XInfo *info; -}; - - #endif /* BCM2836_H */ diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index f15cc3b4053..e7cc2c930d9 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -17,6 +17,15 @@ #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; @@ -25,6 +34,11 @@ struct BCM283XInfo { int clusterid; }; =20 +#define BCM283X_CLASS(klass) \ + OBJECT_CLASS_CHECK(BCM283XClass, (klass), TYPE_BCM283X) +#define BCM283X_GET_CLASS(obj) \ + OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X) + static const BCM283XInfo bcm283x_socs[] =3D { { .name =3D TYPE_BCM2836, --=20 2.26.2 From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) client-ip=209.85.221.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1603558902; cv=none; d=zohomail.com; s=zohoarc; b=eRLgh9dQYvlBm6ClWXgY/CjsTQBCSN28vnxBGJc8Us+WOhkv349VmUj9BYIU/D2BiRZ3liTzIAIWUJx2l/4y1TG3uPWMWB4RgpTLMBJOZ3+Dp7JT09mxAepreieo+ykuty5G/MiS2H5NEQqC9xRQjKH0DJRkkeur3QxnWRQXyIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558902; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=stOTEgOsHIG6dN4Yvyqzv0io+9AejfdctLjiiWuokYQ=; b=QZrQNyLCLDLKFju8mRW3PmxwyYmHnMYv7SY+pkEBB9i7GdgJKWI0YPVCa3ZlMQjblpRUFfsOeZWY1HHyx2t/PNPhp3H5230dqmWclBeeXNwczhEu03LiXysTEG7oEQgYIm3/nZA80RIqSiomim+xXOCXNkj3gizWZ71g45t7jms= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.zohomail.com with SMTPS id 1603558901989319.00035805977245; Sat, 24 Oct 2020 10:01:41 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id n15so6483622wrq.2 for ; Sat, 24 Oct 2020 10:01:41 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id b190sm11282445wmd.35.2020.10.24.10.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=stOTEgOsHIG6dN4Yvyqzv0io+9AejfdctLjiiWuokYQ=; b=bLL2Ia7Q5Eru2gY7vfC+sRlqvnroLOPWXVQwVaZIhHqK0Ufj6SJdAxpRHKozXvbSPl bmBkZgf+zDgOU48bepIbU7XLuBxuIU0CJUt8AdEn5+tqpGYTb04cDdjW3rlTgSbjGrMb 64HN/KTQnq8Pzhx0UGDTQyapalqRruJTU3j1yZrStUjjUvQU/SdmZWYn+kqXznt3K2rr flPcCmdTMo8e8jIoptXa65n2vTJZ274odM7MZM2pEV8bE/y0ZcqJAqg4WSDJN9wjMzsS 5/K7bzehJBxWQYMSimjlPeX9AbZFdBzbHriLVHxowEanI2M4sfyUSlGC76y3h9qwuAHa 89CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=stOTEgOsHIG6dN4Yvyqzv0io+9AejfdctLjiiWuokYQ=; b=gN2OJ007xix0kiQzOkl7fLqokrVt3Tnn6j7xcVkEQXWVBX2whvkhjJHKXCiY6BYnPb fPsm28x04ifKcypQLswBMgStebJYCxYuLt0cKSRntAMFo4m/j5ACf1bSx+GKzw0rnqFb aMkXnMROpPYstgp0nJLJMOeynvoijynAn+fGn7ueo/Ur/W8ICjvEWLo87RpUoP7jDtr5 mg7VPywXocv2VPWpBoq0zO29+FtHfj33l336sPHo6ZPH3OMGRWuMjLBwdJqboTFlX6bT mwfvYLbK+rveKKW9ycSJGXd47r+B7c9WacNMpGZoYETjjXzKe7Jpf29z2xvYH/bknJoK 6Wdw== X-Gm-Message-State: AOAM530Hm3u+G4KHShZjf+BpKepGWxGU0Jow3ER1k0C0zEGkuYRzRswJ G3wzJ+HsxcXSrJead1ti5Ik= X-Google-Smtp-Source: ABdhPJwaYVxRpiBnTfPgtPJmvQnnewjIe6P0tdGIqxSoR2+CHgELj1J1TT2U5GfMUPD+6vVtqNiOSg== X-Received: by 2002:adf:e444:: with SMTP id t4mr9110398wrm.58.1603558899933; Sat, 24 Oct 2020 10:01:39 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Igor Mammedov Subject: [PATCH v4 2/9] hw/arm/bcm2836: QOM'ify more by adding class_init() to each SoC type Date: Sat, 24 Oct 2020 19:01:20 +0200 Message-Id: <20201024170127.3592182-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Remove usage of TypeInfo::class_data. Instead fill the fields in the corresponding class_init(). So far all children use the same values for almost all fields, but we are going to add the BCM2711/BCM2838 SoC for the raspi4 machine which use different fields. Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/bcm2836.c | 108 ++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 57 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index e7cc2c930d9..8f921d8e904 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -17,57 +17,31 @@ #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; 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, - info->cpu_type); + bc->cpu_type); } =20 object_initialize_child(obj, "control", &s->control, TYPE_BCM2836_CONT= ROL); @@ -84,7 +58,6 @@ static void bcm2836_realize(DeviceState *dev, Error **err= p) { BCM283XState *s =3D BCM283X(dev); BCM283XClass *bc =3D BCM283X_GET_CLASS(dev); - const BCM283XInfo *info =3D bc->info; Object *obj; int n; =20 @@ -102,14 +75,14 @@ static void bcm2836_realize(DeviceState *dev, Error **= errp) "sd-bus"); =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.) */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->control), 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)); @@ -118,11 +91,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 */ if (!object_property_set_int(OBJECT(&s->cpu[n].core), "reset-cbar", - info->peri_base, errp)) { + bc->peri_base, errp)) { return; } =20 @@ -165,38 +138,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); +}; +#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) --=20 2.26.2 From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) client-ip=209.85.128.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603558906; cv=none; d=zohomail.com; s=zohoarc; b=Jfy/T5qUY9CYJuia6DrPgYMoR0xZCwp5L9JoLdhJx6R341hQW97gvJxxYe4X+Q0yAVtQUp4pF5tKZH5QAh5mcz0o+9XPVlhpjbEZYQ35Tecb16/ozxQ2BrjC6IedZGDGX06RyizdGUPI8umUKaO5EQ+X/PidepctbbaaV9P1ry8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558906; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wZ942IpuEYn6heYqqSxOTzqAXYjCwIpQoTDS92tNWTM=; b=hizVj7+FkHcnZ8n0OKv+ePYdIJr7NEAVfFWQFSPl1jjHrZQOChH6AgV2IIehAzBCJ5epePacqME+SU6bMkha+ZlTPBTKSDhLgS8C69tpOBID1UjXLZSh3WDfvFaZNf4BXdUmItFzOqQ9JaAiNB2/vwQf9D+g1zSv198H5VYD+Hw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.zohomail.com with SMTPS id 1603558906768597.2089466174034; Sat, 24 Oct 2020 10:01:46 -0700 (PDT) Received: by mail-wm1-f67.google.com with SMTP id k21so3063350wmi.1 for ; Sat, 24 Oct 2020 10:01:46 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id v123sm10402821wme.7.2020.10.24.10.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wZ942IpuEYn6heYqqSxOTzqAXYjCwIpQoTDS92tNWTM=; b=NqH0bWuQhI18QiShv3wL2R6Dpbn83TbrxO/qmpEgHoUWeP25wRnQILwUMS8SwdCBDf TxdbRfByVlDAua3pZXZ13OGFvNo1kjpXMHaSu8q0PWAKKGQWbRyznc3w5k/YkZfMOcua 80nAFNDdUOyO6sYIClieI/9cWs/t6OGcbhT9d7x5+n6zTl9D32fJbn6uAGJ5Nnl6nWb4 +rAX+9NvfCcHwj/FKqebYr8wl8/IuMeX4D4n5oHG0U3uDwzlKLF+LaOrXz2f/4PJreXV tNKrmGJz/MQFZvjlh2pOCsnKtRo5X33MPDzhHchRqJxZQYIx7VyWLoAjKwChkjlgPFX3 vqpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wZ942IpuEYn6heYqqSxOTzqAXYjCwIpQoTDS92tNWTM=; b=Sq3vy9OuaiJkeZmQs0Ha3wlSlw6sk0eM0gGcwcI1OntAo4FgBBd9TsbSbienAMWjqm EkMQSXSE6qDrKzkCGagdW1E8btrOuETHNtjwj6UVfk9npMeOkk4xrc6PV5YJboo9SvU8 +/s7JVQ3fzl6stdNBgRu9UnDTbb1Q88Gfxo1WmtzN10FW8C/2SyqZ0ydKPggrELFZDcd UIUqyxKeiqjERHA0Mc2Y+RZlKKwPriYdYtzVTOuNB6lJTgMxcV+2QuAqSSUZNUHjzrYa Aa57DHVj6owcj+dgRReKRgByXNuHD3hh9L5q6xFsD1hW5pCTPB/ItKXKrH0a4CdBZUIn VvEQ== X-Gm-Message-State: AOAM530Up1xx3ZNrLuioACY1+LMmitnnvCgJHfzkY6Md0jCnBjvKuCwz 6ksLnViAw/2UW66Wbvf0vs4= X-Google-Smtp-Source: ABdhPJxJOVJlM32RKwxJxbAwnZIIBq2AFJWfbxmOo7dD5/7HdjCBpg7yD/I9gtICjvvGjevtxfgTCw== X-Received: by 2002:a1c:2b83:: with SMTP id r125mr7737637wmr.168.1603558904865; Sat, 24 Oct 2020 10:01:44 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Luc Michel Subject: [PATCH v4 3/9] hw/arm/bcm2836: Introduce BCM283XClass::core_count Date: Sat, 24 Oct 2020 19:01:21 +0200 Message-Id: <20201024170127.3592182-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The BCM2835 has only one core. Introduce the core_count field to be able to use values different than BCM283X_NCPUS (4). Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/bcm2836.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 8f921d8e904..c5d46a8e805 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -23,6 +23,7 @@ typedef struct BCM283XClass { /*< public >*/ const char *name; const char *cpu_type; + unsigned core_count; hwaddr peri_base; /* Peripheral base address seen by the CPU */ hwaddr ctrl_base; /* Interrupt controller and mailboxes etc. */ int clusterid; @@ -39,7 +40,7 @@ static void bcm2836_init(Object *obj) BCM283XClass *bc =3D BCM283X_GET_CLASS(obj); int n; =20 - for (n =3D 0; n < BCM283X_NCPUS; n++) { + for (n =3D 0; n < bc->core_count; n++) { object_initialize_child(obj, "cpu[*]", &s->cpu[n].core, bc->cpu_type); } @@ -149,6 +150,7 @@ static void bcm2836_class_init(ObjectClass *oc, void *d= ata) BCM283XClass *bc =3D BCM283X_CLASS(oc); =20 bc->cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a7"); + bc->core_count =3D BCM283X_NCPUS; bc->peri_base =3D 0x3f000000; bc->ctrl_base =3D 0x40000000; bc->clusterid =3D 0xf; @@ -163,6 +165,7 @@ static void bcm2837_class_init(ObjectClass *oc, void *d= ata) BCM283XClass *bc =3D BCM283X_CLASS(oc); =20 bc->cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a53"); + bc->core_count =3D BCM283X_NCPUS; bc->peri_base =3D 0x3f000000; bc->ctrl_base =3D 0x40000000; bc->clusterid =3D 0x0; --=20 2.26.2 From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603558911; cv=none; d=zohomail.com; s=zohoarc; b=gP73hXVC0+XFx8Z3ZkPZn06oblD4CxGsC+3+qaK5c47qjDnAc+2MhA0mtK2rqm7JWL7ZXB1m5gPrdmx2niw6DIvuyxXFHvf2qaycFCpJT7zaJ7xQcEc8+AQfNbgIKXQw1PjGFouqPawbteZ5i8AHq0fbxk7leC3ThOETcLYYYqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558911; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QcjhrFqjAYV+Q6plgNPayGWcmQofCNspcYhj6aIa8BM=; b=meneG29onYkMP6YP/32EJEC1/3V6AqD/4wNupc0xr0C9NSageiGp6V4VzFmWafdJNdSmHtsW9lOeFnpDfWib0duhdkBaJL7L18ZuboESx3ckQEIBiyUbVV/wSvtWgEvkHgqg5g/TPvbdE+nIpBYPcWsYjiWXL8GMhcJwuJcj2PE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 160355891188727.778059751106866; Sat, 24 Oct 2020 10:01:51 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id d3so6257620wma.4 for ; Sat, 24 Oct 2020 10:01:51 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id q10sm11731467wrp.83.2020.10.24.10.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QcjhrFqjAYV+Q6plgNPayGWcmQofCNspcYhj6aIa8BM=; b=ZYIYVkMPDbrK5keb3cAlcb2nrf8PEhG+RWSc4N19AiROSwErtJ+cDpLSG5rxjUbgzQ zNHn7aaZ6gLvRzRAnkrGA6pj/Yo9ur4vpTuPBusFgifaR8hDgxegfwUa0i9qgfBepQLB y/zkE1qLkye4LNqYm4OTRgo+EppwAJfMUFz6ZyHT0Av38xkY/hjhaGHD1R8d08IVjgsQ 4v/DeORVuZj8WCdBJ6aS+CBQRFcab8jOM9JRyj4cX0KdVSu7z3Cw9p0vqQtumYzjMPMm uGWLeDfwxa1ORns/55MG15eLfrNCviN08+Hsl/fEx2QZWEXA9taW8Ra8OYYVg+16X6G5 2Hyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QcjhrFqjAYV+Q6plgNPayGWcmQofCNspcYhj6aIa8BM=; b=ANjzGh095AHk+B+pX++WjpicAEDtnQrRF3tslVO4rPSixb6jS5EHHbRxNbER3R1Zsz +9nJR3EV/3kgtrFp01vqXyVK53OizZ1PTXbadiB/t9qq0xjanfYC8JM4r6kCVGXkh6oV xQImWnhV/gLzDnvBv38b5gS/D86mn9TVvKvZkG/nGZN/HtgHfHmvSqKk+kQQBFiJU2/t +FYMNYNQjw2Q4zGIAlu6+sm3neiOHx0zErvl8FJlKLZoje/XmlBYiEKnGwcmLdgd3RNI m7eUCMKKkQLaKQsyMJTYJ70uoHfxVMVWr+4qSCYyiSyHY86RUVgHDGL7ThgUNWw0G8LI jr3w== X-Gm-Message-State: AOAM532enuBlcgPewIsdw2KykNDXF6Oo9XSCMHC1S0NWDMoXdgZPLSch rRkjLj6TH+ESqimObRkdqq4= X-Google-Smtp-Source: ABdhPJx+hOScypxq0WuRV1XVGUczg6p4q2W+wFRkO+dAbZBIqDe/wEYprnskLqC8ZCy4tGxSIXkNxA== X-Received: by 2002:a1c:9d54:: with SMTP id g81mr2961258wme.102.1603558909834; Sat, 24 Oct 2020 10:01:49 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Luc Michel Subject: [PATCH v4 4/9] hw/arm/bcm2836: Only provide "enabled-cpus" property to multicore SoCs Date: Sat, 24 Oct 2020 19:01:22 +0200 Message-Id: <20201024170127.3592182-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) It makes no sense to set enabled-cpus=3D0 on single core SoCs. Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/bcm2836.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index c5d46a8e805..fcb2c9c3e73 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -34,6 +34,9 @@ typedef struct BCM283XClass { #define BCM283X_GET_CLASS(obj) \ OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X) =20 +static Property bcm2836_enabled_cores_property =3D + DEFINE_PROP_UINT32("enabled-cpus", BCM283XState, enabled_cpus, 0); + static void bcm2836_init(Object *obj) { BCM283XState *s =3D BCM283X(obj); @@ -44,6 +47,10 @@ static void bcm2836_init(Object *obj) object_initialize_child(obj, "cpu[*]", &s->cpu[n].core, bc->cpu_type); } + if (bc->core_count > 1) { + qdev_property_add_static(DEVICE(obj), &bcm2836_enabled_cores_prope= rty); + qdev_prop_set_uint32(DEVICE(obj), "enabled-cpus", bc->core_count); + } =20 object_initialize_child(obj, "control", &s->control, TYPE_BCM2836_CONT= ROL); =20 @@ -130,12 +137,6 @@ static void bcm2836_realize(DeviceState *dev, Error **= errp) } } =20 -static Property bcm2836_props[] =3D { - DEFINE_PROP_UINT32("enabled-cpus", BCM283XState, enabled_cpus, - BCM283X_NCPUS), - DEFINE_PROP_END_OF_LIST() -}; - static void bcm283x_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -155,7 +156,6 @@ static void bcm2836_class_init(ObjectClass *oc, void *d= ata) bc->ctrl_base =3D 0x40000000; bc->clusterid =3D 0xf; dc->realize =3D bcm2836_realize; - device_class_set_props(dc, bcm2836_props); }; =20 #ifdef TARGET_AARCH64 @@ -170,7 +170,6 @@ static void bcm2837_class_init(ObjectClass *oc, void *d= ata) bc->ctrl_base =3D 0x40000000; bc->clusterid =3D 0x0; dc->realize =3D bcm2836_realize; - device_class_set_props(dc, bcm2836_props); }; #endif =20 --=20 2.26.2 From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603558917; cv=none; d=zohomail.com; s=zohoarc; b=N99mn27EH005sB/bPqswugcFDdTf2JHyTunDcngVcbd14OX6FXGHmXn4RrVrArlID9ZYCpHFyjBwanJSeci+z+Ry6/U3sQK6R7SsEWMsYz2r0y0lpBPTDgfeL2BWoKpJluddZEpHC7i6iZdjyjR5oH8IgKCokRlxgH9euWz0ra0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558917; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HrxoAnGYxfMe8eF6utEpYOM4v9LoQV8M0tbNnH02kgc=; b=KhrCWazm49kyDiYeF6FQ6mCwzGcyKwOCe2VBl3zOv4w5IdoiMfOzxZ/X20ywpU0W5OyxyQpRaYUG5kAFEv03lgno5wH7JbtN18BsAnQn0FyJ+sZpovPrj93h/afB37LyY3R9Cx3YgPU0FZbhT8yApTqy0xNdV00eiBwRnJoXkyw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1603558917518882.4920670735856; Sat, 24 Oct 2020 10:01:57 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id l15so6257342wmi.3 for ; Sat, 24 Oct 2020 10:01:55 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id d20sm12841463wra.38.2020.10.24.10.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HrxoAnGYxfMe8eF6utEpYOM4v9LoQV8M0tbNnH02kgc=; b=pG2qumaFcPgcRMjGI7ng8iRKO0J/Q9OUcVuBqPz/FABe2Xi1HBu3/LVR0FRKTHTbZw Z5XZ+/6GKznT0JCOnE9shwHK0LYkXVkfF2q1m3Ob45vf4T7JuCZw66bnSnlcap2uULsT xi49eFtbVFUghJvPbGX+HBskHrwtlVT/e7jTnyVCrZQ8kgMNeFlfxkB1e16pn2zheo0+ XCwFSGyh2cEN+AsF3wq7pr9J2cRynMrjMDJZ1TC0O6ZlNZIntwGO5SflPNRd05p3tbBJ 2OG5tMFkvi8WmbqvSDqK5FHhFMmPxtx4w1UOFBJRfD1CLHBfrNASws8D3sPlSRFIqTT0 CeMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HrxoAnGYxfMe8eF6utEpYOM4v9LoQV8M0tbNnH02kgc=; b=R89fh45G4ccnfihJixQbbUz/Fais3bybdJDcCHJ1TL/BIYAFFHF+vqVC9D1bONUx5Y j/L9rM2AdApqZCuUa684R1DYFIvgPFPfWQoWwl2c/Oh7wuCleRgVLDFOGTTLjpn7k5WU HLMGZFbYbGpcRdFFKrt5OVLVKUTo9oUei4uVPj0aYnE65b11us6VISYATpHTkOjut94E QCvrkUBcK/sRiQ4Ny9Js5ViGbzBMQKzOepYu6NOhbIQmYCo4Jyzwe96FqWrFXeZdInEU 5dwDcAoDA42WJo4l45Sa1ffefE2SaH9G8+i6xYOzoTbowMKuS5GCAWTR1Zg4tH8sLxeh kz3Q== X-Gm-Message-State: AOAM533/u1M3/7HtqwwziLO1WJ5yGxIHhgVQ66cXnd0RGF1IAViUjrR8 n7FG2dpEf2mnIJ0MLORFcpMu2RZH/hI= X-Google-Smtp-Source: ABdhPJyUYC4hyaqDEJ0lrbr93QaI3r2fo5I75Z1Z/1o4AgX6EcAWSuRAiXpC53uG81+k+92CznjdWw== X-Received: by 2002:a7b:cc92:: with SMTP id p18mr7869466wma.116.1603558914732; Sat, 24 Oct 2020 10:01:54 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Luc Michel Subject: [PATCH v4 5/9] hw/arm/bcm2836: Split out common realize() code Date: Sat, 24 Oct 2020 19:01:23 +0200 Message-Id: <20201024170127.3592182-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The realize() function is clearly composed of two parts, each described by a comment: void realize() { /* common peripherals from bcm2835 */ ... /* bcm2836 interrupt controller (and mailboxes, etc.) */ ... } Split the two part, so we can reuse the common part with other SoCs from this family. Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/bcm2836.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index fcb2c9c3e73..7d975cf2f53 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -52,7 +52,10 @@ static void bcm2836_init(Object *obj) qdev_prop_set_uint32(DEVICE(obj), "enabled-cpus", bc->core_count); } =20 - object_initialize_child(obj, "control", &s->control, TYPE_BCM2836_CONT= ROL); + if (bc->ctrl_base) { + object_initialize_child(obj, "control", &s->control, + TYPE_BCM2836_CONTROL); + } =20 object_initialize_child(obj, "peripherals", &s->peripherals, TYPE_BCM2835_PERIPHERALS); @@ -62,12 +65,11 @@ static void bcm2836_init(Object *obj) "vcram-size"); } =20 -static void bcm2836_realize(DeviceState *dev, Error **errp) +static bool bcm283x_common_realize(DeviceState *dev, Error **errp) { BCM283XState *s =3D BCM283X(dev); BCM283XClass *bc =3D BCM283X_GET_CLASS(dev); Object *obj; - int n; =20 /* common peripherals from bcm2835 */ =20 @@ -76,7 +78,7 @@ static void bcm2836_realize(DeviceState *dev, Error **err= p) object_property_add_const_link(OBJECT(&s->peripherals), "ram", obj); =20 if (!sysbus_realize(SYS_BUS_DEVICE(&s->peripherals), errp)) { - return; + return false; } =20 object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->peripherals), @@ -84,6 +86,18 @@ static void bcm2836_realize(DeviceState *dev, Error **er= rp) =20 sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->peripherals), 0, bc->peri_base, 1); + return true; +} + +static void bcm2836_realize(DeviceState *dev, Error **errp) +{ + BCM283XState *s =3D BCM283X(dev); + BCM283XClass *bc =3D BCM283X_GET_CLASS(dev); + int n; + + if (!bcm283x_common_realize(dev, errp)) { + return; + } =20 /* bcm2836 interrupt controller (and mailboxes, etc.) */ if (!sysbus_realize(SYS_BUS_DEVICE(&s->control), errp)) { --=20 2.26.2 From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603558921; cv=none; d=zohomail.com; s=zohoarc; b=PqoLaiH6pQqhWuid1t/T1d/zCO15n/6OI74/N3aovg3YKmysK+QpPQONYkr+NVWNHvWGYSqx7JfAV7vEXmCNw6uGJl41SRP5mVm5yMM/3PPXZmF9DmAqTJyceaARObtyaMiAZHSZSQ7nN9Ju/4wED0ykibTUDeuh2v9JsdSCE7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558921; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jViLzsnHUVqtQxwtvYdFxDUn3i00wRweHY3mgJ2gUEU=; b=I9YQnIsTopGMkWZpIHgqteigrLrUAphox2iv0kX99MDJrV2KqEM/FF1KjnOfva0CB7AJfBEn+d/JFE9DceVPrAdibKqz/3fxp+kWHCAKut7XYOKOgv8aeN3m/Eon5PvQaysWWrlr5DNJ2gndXdpLrLo/qkr0E5JMLgauHS2tvgQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1603558921541601.9835188664982; Sat, 24 Oct 2020 10:02:01 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id t9so6432343wrq.11 for ; Sat, 24 Oct 2020 10:02:00 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id f139sm11676791wme.47.2020.10.24.10.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:01:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jViLzsnHUVqtQxwtvYdFxDUn3i00wRweHY3mgJ2gUEU=; b=VeP+A1Tmec+wj1jeXHD8Sf3QTn1W0VCUwazXf6q2qSVuJR4Wl1oBmykHvjagxEMcoK ZuizRKOZpC4e3j+B/T/zxzzEVBtwzqWN7/JoDd4IBTcsluRDfuVEOjT0dVQXGHRiQdpU Te9WZx9Hjwm588b1eqUD1aeH9oRml55gAoEXjS6bXq4wwZeVE8klZjH4bnzoftfxOhCR 74410V0X5925V6WEYB9zhCN15JBGOjtIzZT8f9osyCV8W3c0niCqhzV5DvJUuNEwrvik 1y8DtU7ii+ru+BRmTLhVNG0QHYmtFwanDrQ522y8BOPdS7KDPqKXfQKxZCMVK6h4Ihbq Zfgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jViLzsnHUVqtQxwtvYdFxDUn3i00wRweHY3mgJ2gUEU=; b=pRiIHyt7JIeDXOIJT5txUnI+P0idjnJ5mzvA28CwLzDGiakNcoKOuLlp4d8oU4fUMy g4FvKXv9afVUcnV8f9qYledhLqJOr+xvxpKqoFuwtSAlkgsiFu3j1Y/pJyL+FhfSnbCD mroEZlIHI79Va9G0GQiS6XHg4k6ohaAXjxceNsRYKiH1nkgyTWjk7ZDYYaDDOzvOzoce +ZR1MArSvuhEEsA+DBIC3jz6SceewXxH8+FGA063Ick1aY4oeOYWP7y5mf5Cy+QVArUE 0AXYPY09qHyL/T/h1zXuIexBQRGz7mOqGBUP2ROTqp8/z/89+ZZ7Xac6Y4XvahN8rhax 9scw== X-Gm-Message-State: AOAM532dTeLDQXtaAcxCqzs6AmsSrH/t/8oI7GYMW2/RyPQJd2Yf+/Ro FiSmQF/SX2TTMj7FSC2hTDg= X-Google-Smtp-Source: ABdhPJwUfS7EtPTDObc08QkDNCR3T7rdUagO1GzKTKt3SyXJTKKH50KwvSldtYfy5UG1wEixde2Fsg== X-Received: by 2002:a5d:6cae:: with SMTP id a14mr8898011wra.187.1603558919740; Sat, 24 Oct 2020 10:01:59 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Luc Michel Subject: [PATCH v4 6/9] hw/arm/bcm2836: Introduce the BCM2835 SoC Date: Sat, 24 Oct 2020 19:01:24 +0200 Message-Id: <20201024170127.3592182-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/bcm2836.h | 1 + hw/arm/bcm2836.c | 34 ++++++++++++++++++++++++++++++++++ hw/arm/raspi.c | 2 ++ 3 files changed, 37 insertions(+) diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index 43e9f8cd0ef..6f90cabfa3a 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -26,6 +26,7 @@ OBJECT_DECLARE_TYPE(BCM283XState, BCM283XClass, BCM283X) * them, code using these devices should always handle them via the * BCM283x base class, so they have no BCM2836(obj) etc macros. */ +#define TYPE_BCM2835 "bcm2835" #define TYPE_BCM2836 "bcm2836" #define TYPE_BCM2837 "bcm2837" =20 diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 7d975cf2f53..de7ade2878e 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -89,6 +89,25 @@ static bool bcm283x_common_realize(DeviceState *dev, Err= or **errp) return true; } =20 +static void bcm2835_realize(DeviceState *dev, Error **errp) +{ + BCM283XState *s =3D BCM283X(dev); + + if (!bcm283x_common_realize(dev, errp)) { + return; + } + + if (!qdev_realize(DEVICE(&s->cpu[0].core), NULL, errp)) { + return; + } + + /* Connect irq/fiq outputs from the interrupt controller. */ + sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 0, + qdev_get_gpio_in(DEVICE(&s->cpu[0].core), ARM_CPU_IRQ)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 1, + qdev_get_gpio_in(DEVICE(&s->cpu[0].core), ARM_CPU_FIQ)); +} + static void bcm2836_realize(DeviceState *dev, Error **errp) { BCM283XState *s =3D BCM283X(dev); @@ -159,6 +178,17 @@ static void bcm283x_class_init(ObjectClass *oc, void *= data) dc->user_creatable =3D false; } =20 +static void bcm2835_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("arm1176"); + bc->core_count =3D 1; + bc->peri_base =3D 0x20000000; + dc->realize =3D bcm2835_realize; +}; + static void bcm2836_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -189,6 +219,10 @@ static void bcm2837_class_init(ObjectClass *oc, void *= data) =20 static const TypeInfo bcm283x_types[] =3D { { + .name =3D TYPE_BCM2835, + .parent =3D TYPE_BCM283X, + .class_init =3D bcm2835_class_init, + }, { .name =3D TYPE_BCM2836, .parent =3D TYPE_BCM283X, .class_init =3D bcm2836_class_init, diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index b5b30f0f38f..30fafa59ecb 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -70,6 +70,7 @@ FIELD(REV_CODE, MEMORY_SIZE, 20, 3); FIELD(REV_CODE, STYLE, 23, 1); =20 typedef enum RaspiProcessorId { + PROCESSOR_ID_BCM2835 =3D 0, PROCESSOR_ID_BCM2836 =3D 1, PROCESSOR_ID_BCM2837 =3D 2, } RaspiProcessorId; @@ -78,6 +79,7 @@ static const struct { const char *type; int cores_count; } soc_property[] =3D { + [PROCESSOR_ID_BCM2835] =3D {TYPE_BCM2835, 1}, [PROCESSOR_ID_BCM2836] =3D {TYPE_BCM2836, BCM283X_NCPUS}, [PROCESSOR_ID_BCM2837] =3D {TYPE_BCM2837, BCM283X_NCPUS}, }; --=20 2.26.2 From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603558927; cv=none; d=zohomail.com; s=zohoarc; b=R8wsftT/GCOJTVugSuA4cjbqK5Bgxb47JC+RpY5zGdedNf9DkbcOUWV8gKODqHXZZVERIpS4mEzHcQDJzAUfWRzMWsPMEcbbrIcvMxMmNdUVDrfEonLRHpR2IlKHpEEWUnU7KD9FpykB+6mov1F3jXmPSAcgatamz1L32KTVMqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558927; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m75cLTEX515fIbNdb79QZlfceNwgYpGASQPS+c8k3IM=; b=h8qiw/C9UkH3NZEq2BEqiyzcGgi9cxxS0fq0yr9s+BjsC0Y0UsA+/wKltrd3vFvJMALRRD/ix1GxoXig7n5FeAJOg42sWH3ra+nM9xzP+tgDQ60krZAQ7JUYoq9Aijg+4bI60O59z82SkEw8pyJDXA5djTu+aqXyDFUpipKzGOE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1603558927142998.301152301676; Sat, 24 Oct 2020 10:02:07 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id y12so6440053wrp.6 for ; Sat, 24 Oct 2020 10:02:06 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id u202sm12808190wmu.23.2020.10.24.10.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m75cLTEX515fIbNdb79QZlfceNwgYpGASQPS+c8k3IM=; b=XKyBC7RECN1jZrtxNWM0gwVfdMbuYo9nOgsytRJmXLv51FKuI5jFY1ncmmCEDR0ZDt DOIEHhnRB41ubHiygsBZ91/jN/RhwrXpzYBnocWtVQIFhcQqezpZjdEbLyM6wCFI+KzI BSzcXqaeW7IHudQf17AeZFymA1icRFC3/QZXRLruXsOChb0eenqvLBOb8jK34ybKcy6Q Zo/nZchBqXxwOnJyi3/V3R+Dqi83+u1ip73spexDp/87RQ+EASAjR9LFxOJdtkw0zQk0 1CJPm3Moy8fCk2DHaWNrOI4UCg4djydzHbJHQnvMRbpfuuUf0YTBUynWTw5RlIEXcxT2 5yJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=m75cLTEX515fIbNdb79QZlfceNwgYpGASQPS+c8k3IM=; b=rE/Rq6FkpJK8t5QXz/bOQigxAphPyWax+C2BFpPpPqPii2gES7bEQJhmQ77cJdOpZ+ JhWg3uYqUdBwkXY1rGvRnntUmsTz4At6Q4rlbo+HHUiBuIEU4vPd8W8KMzrpT9Gj9aWO Edb9ZX7PvvAjbWcwsBzZsJBUHl4KyXMM0boDYZIIEj1kex+NvgPCyYufPmKimS0FT4o1 KXLp2uKrUE6vTlwIFA+NLCHgwF+7k3Ub+Th2ulurz7ARXuCV6qplcrgaNSX36yK0Y27u OpFbWPGDBGMYSLGf+xk2vo6fxX27b7Zu1sSlHs4zeavwdSzw5NyOOZulz4R478dsouK3 xsrg== X-Gm-Message-State: AOAM530A0FQpW7ZQErydB9qAub0kLQIUCYfn1pLgOKzXSny9zkDraQE+ pspxOMqvQ9vRN/0CWO/9yok= X-Google-Smtp-Source: ABdhPJxthUAS7L7EYGYmQSBTTnrv/L64pg1SDcZhqscnTlRRb5OVLmPgEXOwlNVjm1jBDEZ+VaMUJg== X-Received: by 2002:adf:f6cc:: with SMTP id y12mr8566792wrp.107.1603558925151; Sat, 24 Oct 2020 10:02:05 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Igor Mammedov Subject: [PATCH v4 7/9] hw/arm/raspi: Add the Raspberry Pi A+ machine Date: Sat, 24 Oct 2020 19:01:25 +0200 Message-Id: <20201024170127.3592182-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The Pi A is almost the first machine released. It uses a BCM2835 SoC which includes a ARMv6Z core. Example booting the machine using content from [*] (we use the device tree from the B model): $ qemu-system-arm -M raspi1ap -serial stdio \ -kernel raspberrypi/firmware/boot/kernel.img \ -dtb raspberrypi/firmware/boot/bcm2708-rpi-b-plus.dtb \ -append 'earlycon=3Dpl011,0x20201000 console=3DttyAMA0' [ 0.000000] Booting Linux on physical CPU 0x0 [ 0.000000] Linux version 4.19.118+ (dom@buildbot) (gcc version 4.9.3 = (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1311 Mon Apr 27 14:16:15 B= ST 2020 [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revision 7 (ARM= v7), cr=3D00c5387d [ 0.000000] CPU: VIPT aliasing data cache, unknown instruction cache [ 0.000000] OF: fdt: Machine model: Raspberry Pi Model B+ ... [*] http://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-firmware/= raspberrypi-kernel_1.20200512-2_armhf.deb Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/raspi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 30fafa59ecb..79fdd354603 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -319,6 +319,15 @@ static void raspi_machine_class_common_init(MachineCla= ss *mc, mc->default_ram_id =3D "ram"; }; =20 +static void raspi1ap_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); + + rmc->board_rev =3D 0x900021; /* Revision 1.1 */ + raspi_machine_class_common_init(mc, rmc->board_rev); +}; + static void raspi2b_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -343,6 +352,10 @@ static void raspi3b_machine_class_init(ObjectClass *oc= , void *data) =20 static const TypeInfo raspi_machine_types[] =3D { { + .name =3D MACHINE_TYPE_NAME("raspi1ap"), + .parent =3D TYPE_RASPI_MACHINE, + .class_init =3D raspi1ap_machine_class_init, + }, { .name =3D MACHINE_TYPE_NAME("raspi2b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, --=20 2.26.2 From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603558931; cv=none; d=zohomail.com; s=zohoarc; b=HDxkEhQj4qAyHIL/VRsn1PkJnKRYkTHbIpLGoaeY8fhUjTCq7gTl6CvHcJptuf0Bpj/az04yyfIHmVbgNvIIrZQKTPkNPNNq0H/e+LgReUYCEVrjm8wMBIZS0VQTkk9yLLGZuoJtgjOe2q0N13fyr/pc9j/Jc59orEnaLOFhgms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558931; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cuBUbDkqPu7YN9qL1F67Qvxpg+vH+NzaO82nHRsjbP8=; b=QcIjFlYIn8LuWUSEDDXL7pXGoZxy8Ijo2ndjMwVEQJiMs6UorcKwkFVmpeHNCAKhZmcN0TCHwTthIGz9ayrDvwCMLGKVcPebkQK2i0/H73UzSBb57jlKreMh4xjlWFVUCDL1jqE4NIaoeTxqW+MnQyxccEXYhoMxPCHsz7IcD3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1603558931644680.7002185889451; Sat, 24 Oct 2020 10:02:11 -0700 (PDT) Received: by mail-wm1-f54.google.com with SMTP id d78so5703899wmd.3 for ; Sat, 24 Oct 2020 10:02:11 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id g5sm10992116wmi.4.2020.10.24.10.02.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:02:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cuBUbDkqPu7YN9qL1F67Qvxpg+vH+NzaO82nHRsjbP8=; b=TfGvL36iVj4ewkGzPw2CN8ilyExWJPmYDd/PL5yYUsBzMoToxRVUfsRr8x58AG/HmJ UfrhOUM8wCOhp++v0nzVlBWD8E/qf6uWQ5Rm8iW054GrFKffeH7yx/i89hZYHk2C4Gfl rd4CPkux6Y12CmLyGGj8RUxzyQ15u81pnTzp0D4G2uOiJYuzIOivsDNvXfyJq2kqcmX2 +fz1esr1Bq8D6OA+nhTO+ZXgtlvQXb37SYQyYGlHbkIzekCmDfpioKJ8CS4Uxzy5Tars /s4jj2AQLqgyAC/b8lKsrBTB97MfcldSpOOyynt5JBzhqyPKKsozvvEYJkE/rXBZRp8J C46w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cuBUbDkqPu7YN9qL1F67Qvxpg+vH+NzaO82nHRsjbP8=; b=gsPp9JbRbIMCFerMBGUNK0IK91n7Ifh2LArNcVpVYF/XFT6dUA4zr10jaVqe9TVeGH vfhKLLlH2xNGwmASHVBMQ9W1t9OW0NztkrxzwdvWyLtE/jPiGuU6VsDWtjiPiMKeKBWR mgcMyZAERvdpNOc+LBncpA8OpoaEJ1P9xWhAZVOhtMSbWe+OxCTi1VO5BJ/WnY9u+4P0 Ss0nsMuSJ0TxRQ5RpNOYBZTlU6zETE/C93Nd0OoKPs95TGoGw/1N4638E19uwhLodqkD wHneGI1x9p1m58jQ9BaLy1gjRzqp8aW44kPfwxX262CkfbdWt8bFA5MkLsUeS5ju/fv0 QS/Q== X-Gm-Message-State: AOAM532DCTrWtTN/Iyolq0lLHmmV3WJ3WzyarelhfuAjX05HI2yxz7As hn7fpBLqxOb4TZ/eRIbIOng= X-Google-Smtp-Source: ABdhPJzrL2c75JeM9cRYXh4tnVGy8vjyqr9C4MfgdyxE7clIMigSZjLzXAvti5Qgy3WwxTfmZqfj1w== X-Received: by 2002:a1c:3243:: with SMTP id y64mr7692111wmy.175.1603558929862; Sat, 24 Oct 2020 10:02:09 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Luc Michel , Igor Mammedov Subject: [PATCH v4 8/9] hw/arm/raspi: Add the Raspberry Pi Zero machine Date: Sat, 24 Oct 2020 19:01:26 +0200 Message-Id: <20201024170127.3592182-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Similarly to the Pi A, the Pi Zero uses a BCM2835 SoC (ARMv6Z core). The only difference between the revision 1.2 and 1.3 is the latter exposes a CSI camera connector. As we do not implement the Unicam peripheral, there is no point in exposing a camera connector :) Therefore we choose to model the 1.2 revision. Example booting the machine using content from [*]: $ qemu-system-arm -M raspi0 -serial stdio \ -kernel raspberrypi/firmware/boot/kernel.img \ -dtb raspberrypi/firmware/boot/bcm2708-rpi-zero.dtb \ -append 'printk.time=3D0 earlycon=3Dpl011,0x20201000 console=3DttyAMA= 0' [ 0.000000] Booting Linux on physical CPU 0x0 [ 0.000000] Linux version 4.19.118+ (dom@buildbot) (gcc version 4.9.3 = (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1311 Mon Apr 27 14:16:15 B= ST 2020 [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revision 7 (ARM= v7), cr=3D00c5387d [ 0.000000] CPU: VIPT aliasing data cache, unknown instruction cache [ 0.000000] OF: fdt: Machine model: Raspberry Pi Zero ... [*] http://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-firmware/= raspberrypi-kernel_1.20200512-2_armhf.deb Reviewed-by: Luc Michel Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/raspi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 79fdd354603..0f5ea7e99b5 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -319,6 +319,15 @@ static void raspi_machine_class_common_init(MachineCla= ss *mc, mc->default_ram_id =3D "ram"; }; =20 +static void raspi0_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); + + rmc->board_rev =3D 0x920092; /* Revision 1.2 */ + raspi_machine_class_common_init(mc, rmc->board_rev); +}; + static void raspi1ap_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -352,6 +361,10 @@ static void raspi3b_machine_class_init(ObjectClass *oc= , void *data) =20 static const TypeInfo raspi_machine_types[] =3D { { + .name =3D MACHINE_TYPE_NAME("raspi0"), + .parent =3D TYPE_RASPI_MACHINE, + .class_init =3D raspi0_machine_class_init, + }, { .name =3D MACHINE_TYPE_NAME("raspi1ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi1ap_machine_class_init, --=20 2.26.2 From nobody Mon Feb 9 07:25:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603558936; cv=none; d=zohomail.com; s=zohoarc; b=aDrgcsKRLKt2bslTwyjervQCD4sJ6xp2SjDp57cNIhliteL8qq+Mv+6i50/mVTdPArXLfxI1+w+DziR6qaqpPhenNKqG88lP98oQgk883wY7Yt6uAUd13RtUDn6aa63FnI2/Q6Bvv2DmgcM6GQbnKkSZ8yLgUn3a9yT9qTVGas8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603558936; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8qNKLMCAe31Z+xJ2CKSlTQb107TK4jz5Yz6AAjaC7vk=; b=EypwatnoLPvAVRjkQK6kJ6SYPyhecZ/Fi/XEgpUOa4++nXTN3Y+gKmNl90sQMpis7FbuLgZ16InRMz+Y+LdW9WFozXZVx8YKoenhZBElwXesMjqut6JiwwCSyHnMAzQndP6jBk6uT4nqbjPDS4BMoBUCkdlUIH43R0BZwCz3heo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 1603558936554269.602960393139; Sat, 24 Oct 2020 10:02:16 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id e2so6268364wme.1 for ; Sat, 24 Oct 2020 10:02:15 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id r128sm12051439wma.20.2020.10.24.10.02.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 10:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8qNKLMCAe31Z+xJ2CKSlTQb107TK4jz5Yz6AAjaC7vk=; b=aPV++E4WW8vxrkMXlbOXxcXQt8cAexhFcCZckQEFGmK+tNVxy40RisMzv0LfYJ+YeB 3Uvjs2tRP3b9n3dJZ/uX6P7bCYKZf2iRaCIJ1vMktDRgJe33iSDB3ae0YEQ4R5pVAWEr ljjhE0N5SPGny6VA7Z2JU0Dp3l8elLVy7BGtlcN4TASjBNQ3rxmPgbnmTR7vgD4ckEOm JbaxQwcDPhkKEyzKcE/PxPPeP0CykkFKGlv6mpw6clkLDclsYxP3ZwY4tcn2PgiRtUTG rjiVnxVgOh+4mBKbvoWu1uS2vuCC0KF0lma9cn1FeS4oSf0dkXiQPGeFTrN9jDMlHTUD LuTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8qNKLMCAe31Z+xJ2CKSlTQb107TK4jz5Yz6AAjaC7vk=; b=THytWyb8UZ8SYgpT5YLS4edWQGVyXLtw8qvldDNIOhbDR0TWrB5Zre2zRpS0i4hdQs d7UXxWJHGP/1DXu9IedmcbRrc9Lp3xRxdsbZTiRTNReV/Ep+Srz+ggP+ZPOA+ouOwgNr oyQNx8ruqWEMul9cIDuWo5PaLYADOoqIkwJYBsjltuAukgHz/cssaerVI4p8SI6/oFic 3gys+2DuO1sdT0Tpqzs4c5TrBxE06l/OaphTG5X3La4oGhnaxQU1jifCXyOS+RAHRrRz 5L5DJTuhwNoYYfgpqp/dlSzqowvHWrJxLsYGr+fSaJSvENUtLXa3l60CtwDLIwjAYgrJ MWhQ== X-Gm-Message-State: AOAM533lX9K8SW0JvT24n8myqiC2+SNgR0cEvC/vVjzIanW0js7sMbKS 4QwtrxQnrAvHoztaaGYGVY0cgVkZ10I= X-Google-Smtp-Source: ABdhPJxH8VTicm0tIM1H4VzSLWpOyY00ARUFDZ/3/2UnNGPg8gfiFh4iwJs+Ta+FfzCkZd6Sbd1SJA== X-Received: by 2002:a1c:2ece:: with SMTP id u197mr7903545wmu.58.1603558934595; Sat, 24 Oct 2020 10:02:14 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, Luc Michel , Igor Mammedov Subject: [PATCH v4 9/9] hw/arm/raspi: Add the Raspberry Pi 3 model A+ Date: Sat, 24 Oct 2020 19:01:27 +0200 Message-Id: <20201024170127.3592182-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201024170127.3592182-1-f4bug@amsat.org> References: <20201024170127.3592182-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The Pi 3A+ is a stripped down version of the 3B: - 512 MiB of RAM instead of 1 GiB - no on-board ethernet chipset Add it as it is a closer match to what we model. Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/raspi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 0f5ea7e99b5..990509d3852 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -348,6 +348,15 @@ static void raspi2b_machine_class_init(ObjectClass *oc= , void *data) }; =20 #ifdef TARGET_AARCH64 +static void raspi3ap_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); + + rmc->board_rev =3D 0x9020e0; /* Revision 1.0 */ + raspi_machine_class_common_init(mc, rmc->board_rev); +}; + static void raspi3b_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -373,6 +382,10 @@ static const TypeInfo raspi_machine_types[] =3D { .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, #ifdef TARGET_AARCH64 + }, { + .name =3D MACHINE_TYPE_NAME("raspi3ap"), + .parent =3D TYPE_RASPI_MACHINE, + .class_init =3D raspi3ap_machine_class_init, }, { .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, --=20 2.26.2