From nobody Tue Feb 10 02:49:41 2026 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.zohomail.com; dkim=fail; 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 1518764679949198.45387050798308; Thu, 15 Feb 2018 23:04:39 -0800 (PST) Received: from localhost ([::1]:45304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ema4U-0004sB-Vr for importer@patchew.org; Fri, 16 Feb 2018 02:04:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ema2E-0003QS-HF for qemu-devel@nongnu.org; Fri, 16 Feb 2018 02:02:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ema2A-0007jh-Bk for qemu-devel@nongnu.org; Fri, 16 Feb 2018 02:02:18 -0500 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:35988) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ema2A-0007ik-4E for qemu-devel@nongnu.org; Fri, 16 Feb 2018 02:02:14 -0500 Received: by mail-lf0-x242.google.com with SMTP id t79so2762371lfe.3 for ; Thu, 15 Feb 2018 23:02:13 -0800 (PST) Received: from localhost.localdomain (81-175-247-183.bb.dnainternet.fi. [81.175.247.183]) by smtp.gmail.com with ESMTPSA id r9sm3365313ljc.18.2018.02.15.23.02.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2018 23:02:11 -0800 (PST) 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; bh=zvJ9O42ZOhpexSNaXoJavDhfQJ8HJlHVstswYBh0L7Q=; b=ZFlG4khJT+Q0TjIzUjO1h8BFTN0NHwGfrLG+ex9VF9l5Zizij0U7wK54MH4PRf3KiQ Wr8DrFZaSxjMWkqvwcvMHiUIpkfyVRNwWJx5tmZX5V8cKI3BbJ0gPmQzkStAjF+dIYSX jD658SE9v4yPX3kKw95F5k3uOedDLPwNCEibngdLDs+2xPgmGUqHK10HEvp5MiDJbdr8 cdicmhHX7QBO8Ckf/Xq8acVJI5LAoW2wE5lH/0XZz7Iyyx0GNMTFEFAOXtASWsgH6brE hIwd2c35WQ3YaIl7v1PmzJcNFbq1I1+koDYSkOqVF5/7M2Z191HUZuacNZya0OfZC+sv +FeA== 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; bh=zvJ9O42ZOhpexSNaXoJavDhfQJ8HJlHVstswYBh0L7Q=; b=LVA8lFS/yVm4KuQ6kznCM97TeJ+xRcjjEWdZlowR0WukmxVApoFlBT7NaqpoqO94s2 S+BW9SMIqnUjIvHQv21IQiUgV989o6pH3ZTNT7v9By2RuM48MFjG/KHaI+o5Gu4KkpNI TBA2FTQ6B4ncuEwfzylMW/oww+rtzHiFt1+MPKgqfcSQG0drIegkKU8yZZtAsVS+TAGx GmK0Pa2J/x+uQMKj722xuczzXWH/mbTdQhf6vxUQD+2nDyX3DJc5D+1XNvi1g9A50Jbj UK1pyWrmUaan0vR2iozZwzK2Kd7hB8VZVgyp2hWGkY6+47fVREcuaIQIjA6wQkgNXxom kNfQ== X-Gm-Message-State: APf1xPA2XEW0qUQ7B+6Cu8qz3rfz5cT2RLGnMWIcdVrZYy8SRpEhrFJn U/cBnUed20qO5TdgVdMvoLnZOtzp X-Google-Smtp-Source: AH8x225FWz9cqQMqHlXqjFMMIQwixIIy3vvdyoNKSStc+1nH2ptewJpq2MuPmBjDQNWSK73ERdjFiQ== X-Received: by 10.46.93.207 with SMTP id v76mr3590643lje.134.1518764532515; Thu, 15 Feb 2018 23:02:12 -0800 (PST) From: Pekka Enberg To: qemu-devel@nongnu.org Date: Fri, 16 Feb 2018 09:01:59 +0200 Message-Id: <20180216070201.4271-2-penberg@iki.fi> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180216070201.4271-1-penberg@iki.fi> References: <20180216070201.4271-1-penberg@iki.fi> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::242 Subject: [Qemu-devel] [PATCH v2 1/3] bcm2836: Make CPU type configurable 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: peter.maydell@linaro.org, Pekka Enberg Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch adds a "cpu-type" property to BCM2836 SoC in preparation for reusing the code for the Raspberry Pi 3, which has a different processor model. Signed-off-by: Pekka Enberg --- hw/arm/bcm2836.c | 17 +++++++++-------- hw/arm/raspi.c | 3 +++ include/hw/arm/bcm2836.h | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 8c43291112..40e8b25a46 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -26,14 +26,6 @@ static void bcm2836_init(Object *obj) { BCM2836State *s =3D BCM2836(obj); - int n; - - for (n =3D 0; n < BCM2836_NCPUS; n++) { - object_initialize(&s->cpus[n], sizeof(s->cpus[n]), - "cortex-a15-" TYPE_ARM_CPU); - object_property_add_child(obj, "cpu[*]", OBJECT(&s->cpus[n]), - &error_abort); - } =20 object_initialize(&s->control, sizeof(s->control), TYPE_BCM2836_CONTRO= L); object_property_add_child(obj, "control", OBJECT(&s->control), NULL); @@ -59,6 +51,14 @@ static void bcm2836_realize(DeviceState *dev, Error **er= rp) =20 /* common peripherals from bcm2835 */ =20 + obj =3D OBJECT(dev); + for (n =3D 0; n < BCM2836_NCPUS; n++) { + object_initialize(&s->cpus[n], sizeof(s->cpus[n]), + s->cpu_type); + object_property_add_child(obj, "cpu[*]", OBJECT(&s->cpus[n]), + &error_abort); + } + obj =3D object_property_get_link(OBJECT(dev), "ram", &err); if (obj =3D=3D NULL) { error_setg(errp, "%s: required ram link not found: %s", @@ -150,6 +150,7 @@ static void bcm2836_realize(DeviceState *dev, Error **e= rrp) } =20 static Property bcm2836_props[] =3D { + DEFINE_PROP_STRING("cpu-type", BCM2836State, cpu_type), DEFINE_PROP_UINT32("enabled-cpus", BCM2836State, enabled_cpus, BCM2836= _NCPUS), DEFINE_PROP_END_OF_LIST() }; diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index cd5fa8c3dc..c24a4a1b14 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -135,6 +135,8 @@ static void raspi2_init(MachineState *machine) /* Setup the SOC */ object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram), &error_abort); + object_property_set_str(OBJECT(&s->soc), machine->cpu_type, "cpu-type", + &error_abort); object_property_set_int(OBJECT(&s->soc), smp_cpus, "enabled-cpus", &error_abort); object_property_set_int(OBJECT(&s->soc), 0xa21041, "board-rev", @@ -166,6 +168,7 @@ static void raspi2_machine_init(MachineClass *mc) mc->no_parallel =3D 1; mc->no_floppy =3D 1; mc->no_cdrom =3D 1; + mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a15"); mc->max_cpus =3D BCM2836_NCPUS; mc->min_cpus =3D BCM2836_NCPUS; mc->default_cpus =3D BCM2836_NCPUS; diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index 76de1996af..4758b4ae54 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -25,6 +25,7 @@ typedef struct BCM2836State { DeviceState parent_obj; /*< public >*/ =20 + char *cpu_type; uint32_t enabled_cpus; =20 ARMCPU cpus[BCM2836_NCPUS]; --=20 2.14.3