Re: [PATCH 03/14] hw/arm/raspi: fix cprman base address

[Philippe Mathieu-Daudé]

On 9/25/20 12:17 PM, Luc Michel wrote:
> The cprman (clock controller) was mapped at the watchdog/power manager
> address. It was also split into two unimplemented peripherals (cm and
> a2w)

Please use CAPS: CPRMAN, CM, A2W.

> but this is really the same one, as shown by this extract of the
> Raspberry Pi 3 Linux device tree:
> 
>     watchdog@7e100000 {
>             compatible = "brcm,bcm2835-pm\0brcm,bcm2835-pm-wdt";
>             [...]
>             reg = <0x7e100000 0x114 0x7e00a000 0x24>;
>             [...]
>     };
> 
>     [...]
>     cprman@7e101000 {
>             compatible = "brcm,bcm2835-cprman";
>             [...]
>             reg = <0x7e101000 0x2000>;
>             [...]
>     };

I wouldn't take Linux and its device tree as a reference...

Also I'm having hard time accepting a 8KB MMIO block aligned
on a 4KB boundary... But accepting it greatly simplify the
model, so let's assume this is the case.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> 
> Signed-off-by: Luc Michel <luc@lmichel.fr>
> ---
>  include/hw/arm/bcm2835_peripherals.h | 2 +-
>  include/hw/arm/raspi_platform.h      | 5 ++---
>  hw/arm/bcm2835_peripherals.c         | 4 ++--
>  3 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/include/hw/arm/bcm2835_peripherals.h 
> b/include/hw/arm/bcm2835_peripherals.h
> index 13d7c4c553..199088425a 100644
> --- a/include/hw/arm/bcm2835_peripherals.h
> +++ b/include/hw/arm/bcm2835_peripherals.h
> @@ -44,12 +44,12 @@ struct BCM2835PeripheralState {
>      qemu_irq irq, fiq;
>  
>      BCM2835SystemTimerState systmr;
>      BCM2835MphiState mphi;
>      UnimplementedDeviceState armtmr;
> +    UnimplementedDeviceState powermgt;
>      UnimplementedDeviceState cprman;
> -    UnimplementedDeviceState a2w;
>      PL011State uart0;
>      BCM2835AuxState aux;
>      BCM2835FBState fb;
>      BCM2835DMAState dma;
>      BCM2835ICState ic;
> diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h
> index 61b04a1bd4..51a477cdc2 100644
> --- a/include/hw/arm/raspi_platform.h
> +++ b/include/hw/arm/raspi_platform.h
> @@ -34,13 +34,12 @@
>  #define ARMCTRL_OFFSET          (ARM_OFFSET + 0x000)
>  #define ARMCTRL_IC_OFFSET       (ARM_OFFSET + 0x200) /* Interrupt controller 
> */
>  #define ARMCTRL_TIMER0_1_OFFSET (ARM_OFFSET + 0x400) /* Timer 0 and 1 */
>  #define ARMCTRL_0_SBM_OFFSET    (ARM_OFFSET + 0x800) /* User 0 (ARM) 
> Semaphores
>                                                        * Doorbells & 
> Mailboxes */
> -#define CPRMAN_OFFSET           0x100000 /* Power Management, Watchdog */
> -#define CM_OFFSET               0x101000 /* Clock Management */
> -#define A2W_OFFSET              0x102000 /* Reset controller */
> +#define PM_OFFSET               0x100000 /* Power Management */
> +#define CPRMAN_OFFSET           0x101000 /* Clock Management */
>  #define AVS_OFFSET              0x103000 /* Audio Video Standard */
>  #define RNG_OFFSET              0x104000
>  #define GPIO_OFFSET             0x200000
>  #define UART0_OFFSET            0x201000
>  #define MMCI0_OFFSET            0x202000
> diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
> index a9d7f53f6e..f0802c91e0 100644
> --- a/hw/arm/bcm2835_peripherals.c
> +++ b/hw/arm/bcm2835_peripherals.c
> @@ -342,12 +342,12 @@ static void bcm2835_peripherals_realize(DeviceState 
> *dev, Error **errp)
>      sysbus_connect_irq(SYS_BUS_DEVICE(&s->dwc2), 0,
>          qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
>                                 INTERRUPT_USB));
>  
>      create_unimp(s, &s->armtmr, "bcm2835-sp804", ARMCTRL_TIMER0_1_OFFSET, 
> 0x40);
> -    create_unimp(s, &s->cprman, "bcm2835-cprman", CPRMAN_OFFSET, 0x1000);
> -    create_unimp(s, &s->a2w, "bcm2835-a2w", A2W_OFFSET, 0x1000);
> +    create_unimp(s, &s->powermgt, "bcm2835-powermgt", PM_OFFSET, 0x114);
> +    create_unimp(s, &s->cprman, "bcm2835-cprman", CPRMAN_OFFSET, 0x2000);
>      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);
>