| Message ID | 20230311144111.30468-4-strahinja.p.jankovic@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Basic Allwinner WDT emulation | expand |
Hi, On 11/3/23 15:41, Strahinja Jankovic wrote: > This patch adds WDT to Allwinner-H3 and Orangepi-PC. > WDT is added as an overlay to the Timer module memory area. > > Signed-off-by: Strahinja Jankovic <strahinja.p.jankovic@gmail.com> > --- > docs/system/arm/orangepi.rst | 1 + > hw/arm/Kconfig | 1 + > hw/arm/allwinner-h3.c | 8 ++++++++ > include/hw/arm/allwinner-h3.h | 5 ++++- > 4 files changed, 14 insertions(+), 1 deletion(-) > diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c > index 69d0ad6f50..f05afddf7e 100644 > --- a/hw/arm/allwinner-h3.c > +++ b/hw/arm/allwinner-h3.c > @@ -49,6 +49,7 @@ const hwaddr allwinner_h3_memmap[] = { > [AW_H3_DEV_OHCI3] = 0x01c1d400, > [AW_H3_DEV_CCU] = 0x01c20000, > [AW_H3_DEV_PIT] = 0x01c20c00, > + [AW_H3_DEV_WDT] = 0x01c20ca0, > [AW_H3_DEV_UART0] = 0x01c28000, > [AW_H3_DEV_UART1] = 0x01c28400, > [AW_H3_DEV_UART2] = 0x01c28800, > @@ -234,6 +235,8 @@ static void allwinner_h3_init(Object *obj) > object_initialize_child(obj, "twi1", &s->i2c1, TYPE_AW_I2C_SUN6I); > object_initialize_child(obj, "twi2", &s->i2c2, TYPE_AW_I2C_SUN6I); > object_initialize_child(obj, "r_twi", &s->r_twi, TYPE_AW_I2C_SUN6I); > + > + object_initialize_child(obj, "wdt", &s->wdt, TYPE_AW_WDT_SUN6I); > } > > static void allwinner_h3_realize(DeviceState *dev, Error **errp) > @@ -453,6 +456,11 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) > sysbus_connect_irq(SYS_BUS_DEVICE(&s->r_twi), 0, > qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_R_TWI)); > > + /* WDT */ > + sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_fatal); > + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->wdt), 0, > + s->memmap[AW_H3_DEV_WDT], 1); Why do you need to overlap?
Hi, On Mon, Mar 13, 2023 at 8:53 AM Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > Hi, > > On 11/3/23 15:41, Strahinja Jankovic wrote: > > This patch adds WDT to Allwinner-H3 and Orangepi-PC. > > WDT is added as an overlay to the Timer module memory area. > > > > Signed-off-by: Strahinja Jankovic <strahinja.p.jankovic@gmail.com> > > --- > > docs/system/arm/orangepi.rst | 1 + > > hw/arm/Kconfig | 1 + > > hw/arm/allwinner-h3.c | 8 ++++++++ > > include/hw/arm/allwinner-h3.h | 5 ++++- > > 4 files changed, 14 insertions(+), 1 deletion(-) > > > > diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c > > index 69d0ad6f50..f05afddf7e 100644 > > --- a/hw/arm/allwinner-h3.c > > +++ b/hw/arm/allwinner-h3.c > > @@ -49,6 +49,7 @@ const hwaddr allwinner_h3_memmap[] = { > > [AW_H3_DEV_OHCI3] = 0x01c1d400, > > [AW_H3_DEV_CCU] = 0x01c20000, > > [AW_H3_DEV_PIT] = 0x01c20c00, > > + [AW_H3_DEV_WDT] = 0x01c20ca0, > > [AW_H3_DEV_UART0] = 0x01c28000, > > [AW_H3_DEV_UART1] = 0x01c28400, > > [AW_H3_DEV_UART2] = 0x01c28800, > > @@ -234,6 +235,8 @@ static void allwinner_h3_init(Object *obj) > > object_initialize_child(obj, "twi1", &s->i2c1, TYPE_AW_I2C_SUN6I); > > object_initialize_child(obj, "twi2", &s->i2c2, TYPE_AW_I2C_SUN6I); > > object_initialize_child(obj, "r_twi", &s->r_twi, TYPE_AW_I2C_SUN6I); > > + > > + object_initialize_child(obj, "wdt", &s->wdt, TYPE_AW_WDT_SUN6I); > > } > > > > static void allwinner_h3_realize(DeviceState *dev, Error **errp) > > @@ -453,6 +456,11 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) > > sysbus_connect_irq(SYS_BUS_DEVICE(&s->r_twi), 0, > > qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_R_TWI)); > > > > + /* WDT */ > > + sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_fatal); > > + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->wdt), 0, > > + s->memmap[AW_H3_DEV_WDT], 1); > > Why do you need to overlap? > The WDT is part of the Timer component and it lies in the part of memory already initialized by the AW_H3_DEV_PIT. I saw the overlay approach used for RTC in Allwinner A10 (same issue, in A10 both RTC and WDT are part of Timer), so I just reused it. If there is a better way to handle it, I can update the implementation. Best regards, Strahinja
On Sat, Mar 11, 2023 at 3:42 PM Strahinja Jankovic < strahinjapjankovic@gmail.com> wrote: > This patch adds WDT to Allwinner-H3 and Orangepi-PC. > WDT is added as an overlay to the Timer module memory area. > > Signed-off-by: Strahinja Jankovic <strahinja.p.jankovic@gmail.com> > Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com> > --- > docs/system/arm/orangepi.rst | 1 + > hw/arm/Kconfig | 1 + > hw/arm/allwinner-h3.c | 8 ++++++++ > include/hw/arm/allwinner-h3.h | 5 ++++- > 4 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/docs/system/arm/orangepi.rst b/docs/system/arm/orangepi.rst > index e5973600a1..9afa54213b 100644 > --- a/docs/system/arm/orangepi.rst > +++ b/docs/system/arm/orangepi.rst > @@ -26,6 +26,7 @@ The Orange Pi PC machine supports the following devices: > * System Control module > * Security Identifier device > * TWI (I2C) > + * Watchdog timer > > Limitations > """"""""""" > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index ec15248536..7d916f5450 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -337,6 +337,7 @@ config ALLWINNER_H3 > select ALLWINNER_A10_PIT > select ALLWINNER_SUN8I_EMAC > select ALLWINNER_I2C > + select ALLWINNER_WDT > select SERIAL > select ARM_TIMER > select ARM_GIC > diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c > index 69d0ad6f50..f05afddf7e 100644 > --- a/hw/arm/allwinner-h3.c > +++ b/hw/arm/allwinner-h3.c > @@ -49,6 +49,7 @@ const hwaddr allwinner_h3_memmap[] = { > [AW_H3_DEV_OHCI3] = 0x01c1d400, > [AW_H3_DEV_CCU] = 0x01c20000, > [AW_H3_DEV_PIT] = 0x01c20c00, > + [AW_H3_DEV_WDT] = 0x01c20ca0, > [AW_H3_DEV_UART0] = 0x01c28000, > [AW_H3_DEV_UART1] = 0x01c28400, > [AW_H3_DEV_UART2] = 0x01c28800, > @@ -234,6 +235,8 @@ static void allwinner_h3_init(Object *obj) > object_initialize_child(obj, "twi1", &s->i2c1, TYPE_AW_I2C_SUN6I); > object_initialize_child(obj, "twi2", &s->i2c2, TYPE_AW_I2C_SUN6I); > object_initialize_child(obj, "r_twi", &s->r_twi, TYPE_AW_I2C_SUN6I); > + > + object_initialize_child(obj, "wdt", &s->wdt, TYPE_AW_WDT_SUN6I); > } > > static void allwinner_h3_realize(DeviceState *dev, Error **errp) > @@ -453,6 +456,11 @@ static void allwinner_h3_realize(DeviceState *dev, > Error **errp) > sysbus_connect_irq(SYS_BUS_DEVICE(&s->r_twi), 0, > qdev_get_gpio_in(DEVICE(&s->gic), > AW_H3_GIC_SPI_R_TWI)); > > + /* WDT */ > + sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_fatal); > + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->wdt), 0, > + s->memmap[AW_H3_DEV_WDT], 1); > + > /* Unimplemented devices */ > for (i = 0; i < ARRAY_SIZE(unimplemented); i++) { > create_unimplemented_device(unimplemented[i].device_name, > diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h > index 59e0f822d2..f15d6d7cc7 100644 > --- a/include/hw/arm/allwinner-h3.h > +++ b/include/hw/arm/allwinner-h3.h > @@ -48,6 +48,7 @@ > #include "hw/net/allwinner-sun8i-emac.h" > #include "hw/rtc/allwinner-rtc.h" > #include "hw/i2c/allwinner-i2c.h" > +#include "hw/watchdog/allwinner-wdt.h" > #include "target/arm/cpu.h" > #include "sysemu/block-backend.h" > > @@ -96,7 +97,8 @@ enum { > AW_H3_DEV_RTC, > AW_H3_DEV_CPUCFG, > AW_H3_DEV_R_TWI, > - AW_H3_DEV_SDRAM > + AW_H3_DEV_SDRAM, > + AW_H3_DEV_WDT > }; > > /** Total number of CPU cores in the H3 SoC */ > @@ -141,6 +143,7 @@ struct AwH3State { > AWI2CState r_twi; > AwSun8iEmacState emac; > AwRtcState rtc; > + AwWdtState wdt; > GICState gic; > MemoryRegion sram_a1; > MemoryRegion sram_a2; > -- > 2.30.2 > >
diff --git a/docs/system/arm/orangepi.rst b/docs/system/arm/orangepi.rst index e5973600a1..9afa54213b 100644 --- a/docs/system/arm/orangepi.rst +++ b/docs/system/arm/orangepi.rst @@ -26,6 +26,7 @@ The Orange Pi PC machine supports the following devices: * System Control module * Security Identifier device * TWI (I2C) + * Watchdog timer Limitations """"""""""" diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ec15248536..7d916f5450 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -337,6 +337,7 @@ config ALLWINNER_H3 select ALLWINNER_A10_PIT select ALLWINNER_SUN8I_EMAC select ALLWINNER_I2C + select ALLWINNER_WDT select SERIAL select ARM_TIMER select ARM_GIC diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 69d0ad6f50..f05afddf7e 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -49,6 +49,7 @@ const hwaddr allwinner_h3_memmap[] = { [AW_H3_DEV_OHCI3] = 0x01c1d400, [AW_H3_DEV_CCU] = 0x01c20000, [AW_H3_DEV_PIT] = 0x01c20c00, + [AW_H3_DEV_WDT] = 0x01c20ca0, [AW_H3_DEV_UART0] = 0x01c28000, [AW_H3_DEV_UART1] = 0x01c28400, [AW_H3_DEV_UART2] = 0x01c28800, @@ -234,6 +235,8 @@ static void allwinner_h3_init(Object *obj) object_initialize_child(obj, "twi1", &s->i2c1, TYPE_AW_I2C_SUN6I); object_initialize_child(obj, "twi2", &s->i2c2, TYPE_AW_I2C_SUN6I); object_initialize_child(obj, "r_twi", &s->r_twi, TYPE_AW_I2C_SUN6I); + + object_initialize_child(obj, "wdt", &s->wdt, TYPE_AW_WDT_SUN6I); } static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -453,6 +456,11 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->r_twi), 0, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_R_TWI)); + /* WDT */ + sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_fatal); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->wdt), 0, + s->memmap[AW_H3_DEV_WDT], 1); + /* Unimplemented devices */ for (i = 0; i < ARRAY_SIZE(unimplemented); i++) { create_unimplemented_device(unimplemented[i].device_name, diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 59e0f822d2..f15d6d7cc7 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -48,6 +48,7 @@ #include "hw/net/allwinner-sun8i-emac.h" #include "hw/rtc/allwinner-rtc.h" #include "hw/i2c/allwinner-i2c.h" +#include "hw/watchdog/allwinner-wdt.h" #include "target/arm/cpu.h" #include "sysemu/block-backend.h" @@ -96,7 +97,8 @@ enum { AW_H3_DEV_RTC, AW_H3_DEV_CPUCFG, AW_H3_DEV_R_TWI, - AW_H3_DEV_SDRAM + AW_H3_DEV_SDRAM, + AW_H3_DEV_WDT }; /** Total number of CPU cores in the H3 SoC */ @@ -141,6 +143,7 @@ struct AwH3State { AWI2CState r_twi; AwSun8iEmacState emac; AwRtcState rtc; + AwWdtState wdt; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2;
This patch adds WDT to Allwinner-H3 and Orangepi-PC. WDT is added as an overlay to the Timer module memory area. Signed-off-by: Strahinja Jankovic <strahinja.p.jankovic@gmail.com> --- docs/system/arm/orangepi.rst | 1 + hw/arm/Kconfig | 1 + hw/arm/allwinner-h3.c | 8 ++++++++ include/hw/arm/allwinner-h3.h | 5 ++++- 4 files changed, 14 insertions(+), 1 deletion(-)