From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 566B9C4360C for ; Fri, 27 Sep 2019 21:55:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1DBE521655 for ; Fri, 27 Sep 2019 21:55:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CwpddiAZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DBE521655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDyDG-0002px-S3 for qemu-devel@archiver.kernel.org; Fri, 27 Sep 2019 17:55:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35335) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDy5G-0005f8-N2 for qemu-devel@nongnu.org; Fri, 27 Sep 2019 17:47:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDy5E-00036C-ER for qemu-devel@nongnu.org; Fri, 27 Sep 2019 17:47:26 -0400 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:42063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDy5E-00034I-1a; Fri, 27 Sep 2019 17:47:24 -0400 Received: by mail-lj1-x244.google.com with SMTP id y23so3857682lje.9; Fri, 27 Sep 2019 14:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=gZm/cGdN6NtX9OnpN2LDBg9xpgIfENUyaeC5s57UkXM=; b=CwpddiAZtULfFkHxomR3HJJI8Dyzi8Vbt70GtluvjA8I16rlhVagrGjUxR7OflQ2yT Vg1Dafp9WrWdoI5me3usmktPsS6whB/Txyoe+KRX9lcQdHUeT/UsM71ecWmEmFZRv/df PEdxCx3d4L78ndfXeECHy5NO9nItjYfCkOrCUExogijNwRhr0DpGR+UveSLUHi1rsNLo SwttzIbKtm0AAGMabqIHhANlE5Udf/MBAlKuTvNfSAfVZJh+0LJGEjCmDIMpjrr9BILb 9QVu1YIZNpRWbIwengeKyXVCjYEEksyxzKHldU+l2Gv/Kdb50a4L4/IxEiT0+0LkRyDk FDvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=gZm/cGdN6NtX9OnpN2LDBg9xpgIfENUyaeC5s57UkXM=; b=MXNbOrpcrMddUlpS4JhZ8n331z2WGxW787pPAC2Z9E7YKRzfMrCXR6qSzYMYaAPHwS GODIU2rY7S/Ihe02ZzLh/7gG5FZKV+bM99EfYd2RtdpbOu6ud2JHRWyb2K1Ptl1Omxlu WkQob/Nm3yp0KX3CUSrJmprZ4ChkIvE1Bkd4BfDRxd89uVESTcbe8jr59zHUqGc9Fvef uiETA/7MhMuerjoR1FytrIlJFYlo8YfkGh95GHq3UUXRglhDytTq2mcgHQFLHYN7dtmE B27aJ3aN4OorixvIMsdiVrKdsNFjJee/v7LeBFgWNH9F4KRbCyYcbernPx2wVY4vw40f kxZg== X-Gm-Message-State: APjAAAV45ODFzMGHBqUTUfKFJy+GKT9t8MIynBSVf7lsPlb59tMWDjC0 WOTuB0KYdWK2pPTzA7jkHgFTK8oD6mNwnX/Tc2c= X-Google-Smtp-Source: APXvYqxm1Zm8cCdmLBbmrIUpgyU+FlW9wGGD6wWo0cQyTyFojmkQMTUuL0j74uavurYCVRblG8oI0BVhn4cuUbpedkQ= X-Received: by 2002:a2e:8084:: with SMTP id i4mr4498283ljg.119.1569620842656; Fri, 27 Sep 2019 14:47:22 -0700 (PDT) MIME-Version: 1.0 References: <20190926173428.10713-1-f4bug@amsat.org> <20190926173428.10713-6-f4bug@amsat.org> In-Reply-To: <20190926173428.10713-6-f4bug@amsat.org> From: Alistair Francis Date: Fri, 27 Sep 2019 14:42:33 -0700 Message-ID: Subject: Re: [PATCH 05/19] hw/arm/bcm2835: Add various unimplemented peripherals To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= 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::244 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?Zolt=C3=A1n_Baldaszti?= , Paolo Bonzini , Alistair Francis , "qemu-devel@nongnu.org Developers" , Andrew Baumann , Esteban Bosse , Cleber Rosa , qemu-arm , Clement Deschamps , =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= , Laurent Bonnans , Cheng Xiang , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Pekka Enberg , Guenter Roeck , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Sep 26, 2019 at 10:44 AM Philippe Mathieu-Daud=C3=A9 wrote: > > Base addresses and sizes taken from the "BCM2835 ARM Peripherals" > datasheet from February 06 2012: > https://www.raspberrypi.org/app/uploads/2012/02/BCM2835-ARM-Peripherals.p= df > > Reviewed-by: Peter Maydell > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > hw/arm/bcm2835_peripherals.c | 31 ++++++++++++++++++++++++++++ > include/hw/arm/bcm2835_peripherals.h | 15 ++++++++++++++ > include/hw/arm/raspi_platform.h | 8 +++++++ > 3 files changed, 54 insertions(+) > > diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c > index 1bd2ff41d5..fdcf616c56 100644 > --- a/hw/arm/bcm2835_peripherals.c > +++ b/hw/arm/bcm2835_peripherals.c > @@ -22,6 +22,20 @@ > /* Capabilities for SD controller: no DMA, high-speed, default clocks et= c. */ > #define BCM2835_SDHC_CAPAREG 0x52134b4 > > +static void create_unimp(BCM2835PeripheralState *ps, > + UnimplementedDeviceState *uds, > + const char *name, hwaddr ofs, hwaddr size) > +{ > + sysbus_init_child_obj(OBJECT(ps), name, uds, > + sizeof(UnimplementedDeviceState), > + TYPE_UNIMPLEMENTED_DEVICE); > + qdev_prop_set_string(DEVICE(uds), "name", name); > + qdev_prop_set_uint64(DEVICE(uds), "size", size); > + object_property_set_bool(OBJECT(uds), true, "realized", &error_fatal= ); > + memory_region_add_subregion_overlap(&ps->peri_mr, ofs, > + sysbus_mmio_get_region(SYS_BUS_DEVICE(uds), 0), -100= 0); Why not just use create_unimplemented_device() and not bother saving the UnimplementedDeviceState members in the struct? Alistair > +} > + > static void bcm2835_peripherals_init(Object *obj) > { > BCM2835PeripheralState *s =3D BCM2835_PERIPHERALS(obj); > @@ -323,6 +337,23 @@ static void bcm2835_peripherals_realize(DeviceState = *dev, Error **errp) > error_propagate(errp, err); > return; > } > + > + create_unimp(s, &s->armtmr, "bcm2835-sp804", ARMCTRL_TIMER0_1_OFFSET= , 0x40); > + create_unimp(s, &s->systmr, "bcm2835-systimer", ST_OFFSET, 0x20); > + create_unimp(s, &s->cprman, "bcm2835-cprman", CPRMAN_OFFSET, 0x1000)= ; > + create_unimp(s, &s->a2w, "bcm2835-a2w", A2W_OFFSET, 0x1000); > + create_unimp(s, &s->i2s, "bcm2835-i2s", I2S_OFFSET, 0x100); > + create_unimp(s, &s->smi, "bcm2835-smi", SMI_OFFSET, 0x100); > + create_unimp(s, &s->spi[0], "bcm2835-spi0", SPI0_OFFSET, 0x20); > + create_unimp(s, &s->bscsl, "bcm2835-spis", BSC_SL_OFFSET, 0x100); > + create_unimp(s, &s->i2c[0], "bcm2835-i2c0", BSC0_OFFSET, 0x20); > + create_unimp(s, &s->i2c[1], "bcm2835-i2c1", BSC1_OFFSET, 0x20); > + create_unimp(s, &s->i2c[2], "bcm2835-i2c2", BSC2_OFFSET, 0x20); > + create_unimp(s, &s->otp, "bcm2835-otp", OTP_OFFSET, 0x80); > + create_unimp(s, &s->dbus, "bcm2835-dbus", DBUS_OFFSET, 0x8000); > + create_unimp(s, &s->ave0, "bcm2835-ave0", AVE0_OFFSET, 0x8000); > + create_unimp(s, &s->dwc2, "dwc-usb2", USB_OTG_OFFSET, 0x1000); > + create_unimp(s, &s->sdramc, "bcm2835-sdramc", SDRAMC_OFFSET, 0x100); > } > > static void bcm2835_peripherals_class_init(ObjectClass *oc, void *data) > diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm283= 5_peripherals.h > index 6b17f6a382..62a4c7b559 100644 > --- a/include/hw/arm/bcm2835_peripherals.h > +++ b/include/hw/arm/bcm2835_peripherals.h > @@ -23,6 +23,7 @@ > #include "hw/sd/sdhci.h" > #include "hw/sd/bcm2835_sdhost.h" > #include "hw/gpio/bcm2835_gpio.h" > +#include "hw/misc/unimp.h" > > #define TYPE_BCM2835_PERIPHERALS "bcm2835-peripherals" > #define BCM2835_PERIPHERALS(obj) \ > @@ -37,6 +38,10 @@ typedef struct BCM2835PeripheralState { > MemoryRegion ram_alias[4]; > qemu_irq irq, fiq; > > + UnimplementedDeviceState systmr; > + UnimplementedDeviceState armtmr; > + UnimplementedDeviceState cprman; > + UnimplementedDeviceState a2w; > PL011State uart0; > BCM2835AuxState aux; > BCM2835FBState fb; > @@ -48,6 +53,16 @@ typedef struct BCM2835PeripheralState { > SDHCIState sdhci; > BCM2835SDHostState sdhost; > BCM2835GpioState gpio; > + UnimplementedDeviceState i2s; > + UnimplementedDeviceState spi[1]; > + UnimplementedDeviceState i2c[3]; > + UnimplementedDeviceState otp; > + UnimplementedDeviceState dbus; > + UnimplementedDeviceState ave0; > + UnimplementedDeviceState bscsl; > + UnimplementedDeviceState smi; > + UnimplementedDeviceState dwc2; > + UnimplementedDeviceState sdramc; > } BCM2835PeripheralState; > > #endif /* BCM2835_PERIPHERALS_H */ > diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platf= orm.h > index 66969fac5d..cdcbca943f 100644 > --- a/include/hw/arm/raspi_platform.h > +++ b/include/hw/arm/raspi_platform.h > @@ -38,6 +38,8 @@ > * Doorbells & Mail= boxes */ > #define CPRMAN_OFFSET 0x100000 /* Power Management, Watchdog *= / > #define CM_OFFSET 0x101000 /* Clock Management */ > +#define A2W_OFFSET 0x102000 /* Reset controller */ > +#define AVS_OFFSET 0x103000 /* Audio Video Standard */ > #define RNG_OFFSET 0x104000 > #define GPIO_OFFSET 0x200000 > #define UART0_OFFSET 0x201000 > @@ -45,11 +47,17 @@ > #define I2S_OFFSET 0x203000 > #define SPI0_OFFSET 0x204000 > #define BSC0_OFFSET 0x205000 /* BSC0 I2C/TWI */ > +#define OTP_OFFSET 0x20f000 > +#define BSC_SL_OFFSET 0x214000 /* SPI slave */ > #define AUX_OFFSET 0x215000 /* AUX: UART1/SPI1/SPI2 */ > #define EMMC1_OFFSET 0x300000 > #define SMI_OFFSET 0x600000 > #define BSC1_OFFSET 0x804000 /* BSC1 I2C/TWI */ > +#define BSC2_OFFSET 0x805000 /* BSC2 I2C/TWI */ > +#define DBUS_OFFSET 0x900000 > +#define AVE0_OFFSET 0x910000 > #define USB_OTG_OFFSET 0x980000 /* DTC_OTG USB controller */ > +#define SDRAMC_OFFSET 0xe00000 > #define DMA15_OFFSET 0xE05000 /* DMA controller, channel 15 *= / > > /* GPU interrupts */ > -- > 2.20.1 > >