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_INVALID,DKIM_SIGNED, 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 E170DC10F14 for ; Tue, 8 Oct 2019 10:41:56 +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 ACAD0206C2 for ; Tue, 8 Oct 2019 10:41:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RBJPTfBz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACAD0206C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHmwF-0007MJ-RU for qemu-devel@archiver.kernel.org; Tue, 08 Oct 2019 06:41:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45292) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHmvE-0006n1-N3 for qemu-devel@nongnu.org; Tue, 08 Oct 2019 06:40:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHmvC-0007op-UG for qemu-devel@nongnu.org; Tue, 08 Oct 2019 06:40:52 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:45526) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iHmvC-0007oJ-MG for qemu-devel@nongnu.org; Tue, 08 Oct 2019 06:40:50 -0400 Received: by mail-wr1-x441.google.com with SMTP id r5so18730374wrm.12 for ; Tue, 08 Oct 2019 03:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=WbFsSvc0NAUK+fRE+IqQo9Dznp6ZarEkKytE8tBXVWs=; b=RBJPTfBzr5S3sXuSyTN6nXee9hxGqOJBhvc/0nri5uOgN0ZeprOS6XCp9J/b57NvnN SUSCh2OKtyjNMkOw4xTbHwA2qk/b+gubV3wA+Rh+ReZe+1j017c7KfNDZC3ZvnA/2s3k tenvO2TXuJIey/ff3DJBazX+UDSpYB8WT0f5OZ+LZ6nlAPhOUGg2ZLB28IkQ84tRd9z9 Wqvs2yTLXavGaOmCpm2O389Nw99pQMmQC+FMupnPISSUEhCoPcaPU4tDAc4ihl1KroUn R83x+G1yC1yk7Kchv7VAy7OtW3sIwXTjducPkTOGD8iCrtfz+fHqEdZwV8idNEkFfuTq bVGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=WbFsSvc0NAUK+fRE+IqQo9Dznp6ZarEkKytE8tBXVWs=; b=V45oCQnjcNH9BG4t8+/yFiqwm+NCimMg+2X8rXpzu2wGkxh2Fj4XnbYhhq72Cab1N4 BssFt7sq/T0xjjnYKjI+V73/E8dx61Zu+RRhxCuTyQJj4/fWH8mBiNQ/U0q0XKEmcYse zXBk+/Ex687reLi9ttXx+EbFYRZHa4XstLdvrGfVhalinUAIdX/j04gTjUjzca7ptmuq TBSmuhGHS5aNeqt74mTQorSyrihKC+Z5zEQJ2npgHLP3IjMbrryq/emoyAU2DMKiBnT+ FOZTgFQ4KtPt3NKx72vHbcJ/KqrFiu0viFLeKxQzhXXTX4UyP1FWeqo7XWYKE9dG5Mpm paFA== X-Gm-Message-State: APjAAAW6DpRWHGf4QwVpYDoqH61pO5yeheI5cefoU14/HzSgNQ2VKNiv HvZajo3TezYSnRHDwN6O4QSaZA== X-Google-Smtp-Source: APXvYqy8ZVHYTwE0sqYipL98ubf1BQq5XkP92M+S5R2W/0jGV3DTDqwbnE4mCgE1LMO0e8CsQbOERw== X-Received: by 2002:adf:ef0d:: with SMTP id e13mr27643262wro.300.1570531248945; Tue, 08 Oct 2019 03:40:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e15sm21735113wrt.94.2019.10.08.03.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2019 03:40:47 -0700 (PDT) Received: from zen (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1ED4F1FF87; Tue, 8 Oct 2019 11:40:47 +0100 (BST) References: <20190926173428.10713-1-f4bug@amsat.org> <20190926173428.10713-5-f4bug@amsat.org> User-agent: mu4e 1.3.5; emacs 27.0.50 From: Alex =?utf-8?Q?Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: Re: [PATCH 04/19] hw/arm/bcm2835: Rename some definitions In-reply-to: <20190926173428.10713-5-f4bug@amsat.org> Date: Tue, 08 Oct 2019 11:40:47 +0100 Message-ID: <871rvnjz9s.fsf@linaro.org> MIME-Version: 1.0 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::441 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 , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Andrew Baumann , Esteban Bosse , Cleber Rosa , qemu-arm@nongnu.org, Clement Deschamps , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Laurent Bonnans , Cheng Xiang , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Pekka Enberg , Guenter Roeck , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Philippe Mathieu-Daud=C3=A9 writes: > The UART1 is part of the AUX peripheral, > the PCM_CLOCK (yet unimplemented) is part of the CPRMAN. > > Reviewed-by: Peter Maydell > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > I dunno if this is OK to do that since the header has: > > * These definitions are derived from those in Raspbian Linux at > * arch/arm/mach-{bcm2708,bcm2709}/include/mach/platform.h > * where they carry the following notice: FWIW these seem to have moved about. I couldn't find stuff in the upstream Linux tree but in the raspbian kernel tree there is stuff in: include/linux/platform_data but I couldn't find the exact place for these definitions. However I wouldn't worry too much if they did come from a distributed kernel they should be GPLv2. Reviewed-by: Alex Benn=C3=A9e > * > * Copyright (C) 2010 Broadcom > --- > hw/arm/bcm2835_peripherals.c | 7 ++++--- > hw/arm/bcm2836.c | 2 +- > include/hw/arm/raspi_platform.h | 16 +++++++--------- > 3 files changed, 12 insertions(+), 13 deletions(-) > > diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c > index 8984e2e91f..1bd2ff41d5 100644 > --- a/hw/arm/bcm2835_peripherals.c > +++ b/hw/arm/bcm2835_peripherals.c > @@ -165,7 +165,8 @@ static void bcm2835_peripherals_realize(DeviceState *= dev, Error **errp) > sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->uart0), 0)); > sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart0), 0, > qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, > - INTERRUPT_UART)); > + INTERRUPT_UART0)); > + > /* AUX / UART1 */ > qdev_prop_set_chr(DEVICE(&s->aux), "chardev", serial_hd(1)); > > @@ -175,7 +176,7 @@ static void bcm2835_peripherals_realize(DeviceState *= dev, Error **errp) > return; > } > > - memory_region_add_subregion(&s->peri_mr, UART1_OFFSET, > + memory_region_add_subregion(&s->peri_mr, AUX_OFFSET, > sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->aux), 0)); > sysbus_connect_irq(SYS_BUS_DEVICE(&s->aux), 0, > qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, > @@ -268,7 +269,7 @@ static void bcm2835_peripherals_realize(DeviceState *= dev, Error **errp) > return; > } > > - memory_region_add_subregion(&s->peri_mr, EMMC_OFFSET, > + memory_region_add_subregion(&s->peri_mr, EMMC1_OFFSET, > sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->sdhci), 0)); > sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0, > qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, > diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c > index 493a913f89..723aef6bf5 100644 > --- a/hw/arm/bcm2836.c > +++ b/hw/arm/bcm2836.c > @@ -126,7 +126,7 @@ static void bcm2836_realize(DeviceState *dev, Error *= *errp) > > /* set periphbase/CBAR value for CPU-local registers */ > object_property_set_int(OBJECT(&s->cpus[n]), > - BCM2836_PERI_BASE + MCORE_OFFSET, > + BCM2836_PERI_BASE + MSYNC_OFFSET, > "reset-cbar", &err); > if (err) { > error_propagate(errp, err); > diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platf= orm.h > index 10083d33df..66969fac5d 100644 > --- a/include/hw/arm/raspi_platform.h > +++ b/include/hw/arm/raspi_platform.h > @@ -25,8 +25,7 @@ > #ifndef HW_ARM_RASPI_PLATFORM_H > #define HW_ARM_RASPI_PLATFORM_H > > -#define MCORE_OFFSET 0x0000 /* Fake frame buffer device > - * (the multicore sync block) */ > +#define MSYNC_OFFSET 0x0000 /* Multicore Sync Block */ > #define IC0_OFFSET 0x2000 > #define ST_OFFSET 0x3000 /* System Timer */ > #define MPHI_OFFSET 0x6000 /* Message-based Parallel Host = Intf. */ > @@ -37,9 +36,8 @@ > #define ARMCTRL_TIMER0_1_OFFSET (ARM_OFFSET + 0x400) /* Timer 0 and 1 */ > #define ARMCTRL_0_SBM_OFFSET (ARM_OFFSET + 0x800) /* User 0 (ARM) Sem= aphores > * Doorbells & Mail= boxes */ > -#define PM_OFFSET 0x100000 /* Power Management, Reset cont= roller > - * and Watchdog registers */ > -#define PCM_CLOCK_OFFSET 0x101098 > +#define CPRMAN_OFFSET 0x100000 /* Power Management, Watchdog */ > +#define CM_OFFSET 0x101000 /* Clock Management */ > #define RNG_OFFSET 0x104000 > #define GPIO_OFFSET 0x200000 > #define UART0_OFFSET 0x201000 > @@ -47,11 +45,11 @@ > #define I2S_OFFSET 0x203000 > #define SPI0_OFFSET 0x204000 > #define BSC0_OFFSET 0x205000 /* BSC0 I2C/TWI */ > -#define UART1_OFFSET 0x215000 > -#define EMMC_OFFSET 0x300000 > +#define AUX_OFFSET 0x215000 /* AUX: UART1/SPI1/SPI2 */ > +#define EMMC1_OFFSET 0x300000 > #define SMI_OFFSET 0x600000 > #define BSC1_OFFSET 0x804000 /* BSC1 I2C/TWI */ > -#define USB_OFFSET 0x980000 /* DTC_OTG USB controller */ > +#define USB_OTG_OFFSET 0x980000 /* DTC_OTG USB controller */ > #define DMA15_OFFSET 0xE05000 /* DMA controller, channel 15 */ > > /* GPU interrupts */ > @@ -112,7 +110,7 @@ > #define INTERRUPT_SPI 54 > #define INTERRUPT_I2SPCM 55 > #define INTERRUPT_SDIO 56 > -#define INTERRUPT_UART 57 > +#define INTERRUPT_UART0 57 > #define INTERRUPT_SLIMBUS 58 > #define INTERRUPT_VEC 59 > #define INTERRUPT_CPG 60 -- Alex Benn=C3=A9e