From nobody Thu Nov 13 18:09:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581940666092620.5267228317857; Mon, 17 Feb 2020 03:57:46 -0800 (PST) Received: from localhost ([::1]:44274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3f20-0005ZZ-Kk for importer@patchew.org; Mon, 17 Feb 2020 06:57:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40779) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3eqa-0006qT-0M for qemu-devel@nongnu.org; Mon, 17 Feb 2020 06:45:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3eqY-0002YS-66 for qemu-devel@nongnu.org; Mon, 17 Feb 2020 06:45:55 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:54673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3eqW-0002W8-9e; Mon, 17 Feb 2020 06:45:52 -0500 Received: by mail-wm1-x330.google.com with SMTP id g1so16815320wmh.4; Mon, 17 Feb 2020 03:45:52 -0800 (PST) Received: from x1w.redhat.com (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id i2sm268149wmb.28.2020.02.17.03.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 03:45:49 -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 :mime-version:content-transfer-encoding; bh=ux9PEPOM3HzoCcwHXWuWj9LnAFV7GP+CVR1oHredxx0=; b=g1cvsPHCrbjUuWltWY6BJvvEc8Jvk8iKqrOFIq0zzbm6BxHNuKDSYEJbIs3r+WyuVD 9n3Exze4YkWDnSe23tZCWaFhPI/p6yc9/aDXqzEviNoXll/eByxZygBnq1wyGWaqq7an LFWKEK0RXpY/9IU+00JGDM1ExRZ6Pr6dAaa2LVbzKtrum/tYBSF1kUBnZhaku89z/gLD aN29QGWgkE7IkoP4X9LGsfrd05ipFzL6UIf4jqmb4A0nSOVcVxRhcfXuM5Qs5JnndWgv F8n0I+5v9wqC79tKwZ6DeSg21wi8DdGiMF5rRB/7kHwAKtF48CHq1YdBulQGlEV1CsK7 THxQ== 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=ux9PEPOM3HzoCcwHXWuWj9LnAFV7GP+CVR1oHredxx0=; b=LF2mFOaLjI4kYBd75pmUtYwVrzZgGt36lTuaREVHD1B0MJIwcChcb9wxtBxZcY2rRq lTKRDH6ATfklFl4Tpb3sNFHtWP+OrDkc4MA4FuAT0dsLnvlztL7GtGLXfgiNR+r1BC1x 0IyV09I//4kHNLVn5tW2au054g30NPFgbHnk/9lZWrwVSBLlqiWc0mOlWD3CJIekwG/x fzjnJW+Mu9hVVzBH9zUz8xlmL+absqR9q39LcgPfYmHTKDwImUHFSN2P6tJsO8gaoBfb 0h/9JgtFUWlIusZiS5MH6GMH6jgdSBuinVP9Q9Q1B9ufv5+pfZNDEPpAVlnLBDEO/ko3 jmlg== X-Gm-Message-State: APjAAAUrz8U4FiuOuaNAUQBh7Ze225wZs0tfRJpRuYSHgohnV0f0pnyQ M3pc7kgs3Ff3a6Lz1/vLepJIrq/CdIg= X-Google-Smtp-Source: APXvYqwAqrRqndyzvK7VgkkpCAOkaMS5qBNQuGvJBcCSN+9E4JokKs3/ICR5zzUWskwxwvHx8GxBKw== X-Received: by 2002:a1c:3d46:: with SMTP id k67mr22606979wma.171.1581939950423; Mon, 17 Feb 2020 03:45:50 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/13] hw/arm/bcm2836: Introduce the BCM2835 SoC Date: Mon, 17 Feb 2020 12:45:31 +0100 Message-Id: <20200217114533.17779-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200217114533.17779-1-f4bug@amsat.org> References: <20200217114533.17779-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Luc Michel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- include/hw/arm/bcm2836.h | 1 + hw/arm/bcm2836.c | 40 ++++++++++++++++++++++++++++++++++++++++ hw/arm/raspi.c | 2 ++ 3 files changed, 43 insertions(+) diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index acc75bf553..3d46469a73 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -24,6 +24,7 @@ * 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 2b6fe31139..bce5f8a866 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -103,6 +103,31 @@ static void bcm283x_common_realize(DeviceState *dev, E= rror **errp) bc->peri_base, 1); } =20 +static void bcm2835_realize(DeviceState *dev, Error **errp) +{ + BCM283XState *s =3D BCM283X(dev); + Error *err =3D NULL; + + bcm283x_common_realize(dev, &err); + if (err) { + error_propagate(errp, err); + return; + } + + object_property_set_bool(OBJECT(&s->cpu[0].core), true, + "realized", &err); + if (err) { + error_propagate(errp, err); + 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); @@ -184,6 +209,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); @@ -214,6 +250,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 fff501affb..3537a329ac 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.21.1