diff mbox series

[7/7] aspeed: Link SCU to the watchdog

Message ID 20180807075757.7242-8-joel@jms.id.au
State New
Headers show
Series arm: aspeed: Extend SDRAM controller | expand

Commit Message

Joel Stanley Aug. 7, 2018, 7:57 a.m. UTC 
The ast2500 uses the watchdog to reset the SDRAM controller. This
operation is usually performed by u-boot's memory training procedure,
and it is enabled by setting a bit in the SCU and then causing the
watchdog to expire. Therefore, we need the watchdog to be able to
acess the SCU's register space.

This does not cause a system reset, but only resets the SDRAM
controller.

Signed-off-by: Joel Stanley <joel@jms.id.au>

---
 hw/arm/aspeed_soc.c              |  2 ++
 hw/watchdog/wdt_aspeed.c         | 20 ++++++++++++++++++++
 include/hw/watchdog/wdt_aspeed.h |  1 +
 3 files changed, 23 insertions(+)

-- 
2.17.1

Comments

Cédric Le Goater Aug. 7, 2018, 12:23 p.m. UTC | #1 
On 08/07/2018 09:57 AM, Joel Stanley wrote:
> The ast2500 uses the watchdog to reset the SDRAM controller. This

> operation is usually performed by u-boot's memory training procedure,

> and it is enabled by setting a bit in the SCU and then causing the

> watchdog to expire. Therefore, we need the watchdog to be able to

> acess the SCU's register space.


... access ...

> This does not cause a system reset, but only resets the SDRAM

> controller.


Well, it does nothing below :) 

I think we should call device_reset() on all the devices that have their 
reset bit enabled in the SCU System Reset Control Register and in the  
Reset Mask Register of the watchdog being used.


Watchdog Reset Mask Register bits :

31:26 Reserved
   25 Enable reset Misc. SOC controller (WDT, RTC, Timer, UART, SRAM)
   24 Enable reset SPI controller
   23 Enable reset X-DMA controller
   22 Enable reset MCTP controller
   21 Enable reset GPIO controller
   20 Enable reset ADC controller
   19 Enable reset JTAG master controller
   18 Enable reset PECI controller
   17 Enable reset PWM controller
   16 Enable reset CRT mode 2D engine
   15 Enable reset MIC controller
   14 Enable reset SD/SDIO controller
   13 Enable reset LPC controller
   12 Enable reset HAC engine
   11 Enable reset Video engine
   10 Enable reset USB1.1 HID/USB2.0 Host EHCI2 controller
    9 Enable reset USB1.1 Host controller
    8 Enable reset USB2.0 Host/Hub controller
    7 Enable reset Graphics CRT controller
    6 Enable reset MAC#2 controller
    5 Enable reset MAC#1 controller
    4 Enable reset I2C controller
    3 Enable reset AHB bridges
    2 Enable reset SDRAM controller
    1 Enable reset Coprocessor
    0 Enable reset ARM

Default value is 0x23FFFF3 which means reset all devices a part from :

   SPI controller
   X-DMA controller
   MCTP controller
   AHB bridges
   SDRAM controller

SCU System Reset Control Register ( has a different layout :/)
  
   25 Reset X-DMA controller
   24 Reset MCTP controller
   23 Reset ADC controller
   22 Reset JTAG Master controller
   21 Reserved
   20 PEWAKE# pin output enable control
   19 PEWAKE# pin output value
   18 Reset MIC controller
   17 Reserved, must keep at value ”1”
   16 Reset SD/SDIO card controller
   15 Reset USB1.1 Host controller
   14 Reset USB2.0 Hub/Host controller
   13 Reset CRT controller
   12 Reset MAC#2 controller
   11 Reset MAC#1 controller
   10 Reset PECI controller
    9 Reset PWM controller
    8 Disable PCI bus controller and VGA controller
    7 Reset 2D engine
    6 Reset Video engine
    5 Reset LPC controller
    4 Reset HAC engine
    3 Reset USB1.1 HID controller
    2 Reset I2C/SMBus controller
    1 Reset AHB bridges
    0 Enable reset SDRAM controller when full chip Watchdog reset occur

Default value is 0xFFCFFEDC which means reset all devices a part from :

    5 Reset LPC controller
    1 Reset AHB bridges
    0 Enable reset SDRAM controller


> Signed-off-by: Joel Stanley <joel@jms.id.au>

> ---

>  hw/arm/aspeed_soc.c              |  2 ++

>  hw/watchdog/wdt_aspeed.c         | 20 ++++++++++++++++++++

>  include/hw/watchdog/wdt_aspeed.h |  1 +

>  3 files changed, 23 insertions(+)

> 

> diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c

> index a27233d4876b..2cbacb4430bb 100644

> --- a/hw/arm/aspeed_soc.c

> +++ b/hw/arm/aspeed_soc.c

> @@ -164,6 +164,8 @@ static void aspeed_soc_init(Object *obj)

>          qdev_set_parent_bus(DEVICE(&s->wdt[i]), sysbus_get_default());

>          qdev_prop_set_uint32(DEVICE(&s->wdt[i]), "silicon-rev",

>                                      sc->info->silicon_rev);

> +        object_property_add_const_link(OBJECT(&s->wdt[i]), "scu",

> +                                       OBJECT(&s->scu), &error_abort);

>      }

>  

>      object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);

> diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c

> index 95f6ad186d72..f5cb30c0b584 100644

> --- a/hw/watchdog/wdt_aspeed.c

> +++ b/hw/watchdog/wdt_aspeed.c

> @@ -43,6 +43,9 @@

>  

>  #define WDT_RESTART_MAGIC               0x4755

>  

> +#define SCU_RESET_CONTROL1              (0x04 / 4)


Too bad that the Aspeed SCU registers are already defined in the .c file.  

> +#define    SCU_RESET_SDRAM              BIT(0)

> +

>  static bool aspeed_wdt_is_enabled(const AspeedWDTState *s)

>  {

>      return s->regs[WDT_CTRL] & WDT_CTRL_ENABLE;

> @@ -221,6 +224,13 @@ static void aspeed_wdt_timer_expired(void *dev)

>  {

>      AspeedWDTState *s = ASPEED_WDT(dev);

>  

> +    /* Do not reset on SDRAM controller reset */

> +    if (s->scu->regs[SCU_RESET_CONTROL1] & SCU_RESET_SDRAM) {

> +        timer_del(s->timer);

> +        s->regs[WDT_CTRL] = 0;

> +        return;

> +    }

> +

>      qemu_log_mask(CPU_LOG_RESET, "Watchdog timer expired.\n");

>      watchdog_perform_action();

>      timer_del(s->timer);

> @@ -232,6 +242,16 @@ static void aspeed_wdt_realize(DeviceState *dev, Error **errp)

>  {

>      SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

>      AspeedWDTState *s = ASPEED_WDT(dev);

> +    Error *err = NULL;

> +    Object *obj;

> +

> +    obj = object_property_get_link(OBJECT(dev), "scu", &err);

> +    if (!obj) {

> +        error_propagate(errp, err);

> +        error_prepend(errp, "required link 'scu' not found: ");

> +        return;

> +    }

> +    s->scu = ASPEED_SCU(obj);

>  

>      if (!is_supported_silicon_rev(s->silicon_rev)) {

>          error_setg(errp, "Unknown silicon revision: 0x%" PRIx32,

> diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_aspeed.h

> index 7de3e5c224fb..cc734bd7ae7b 100644

> --- a/include/hw/watchdog/wdt_aspeed.h

> +++ b/include/hw/watchdog/wdt_aspeed.h

> @@ -26,6 +26,7 @@ typedef struct AspeedWDTState {

>      MemoryRegion iomem;

>      uint32_t regs[ASPEED_WDT_REGS_MAX];

>  

> +    AspeedSCUState *scu;

>      uint32_t pclk_freq;

>      uint32_t silicon_rev;

>      uint32_t ext_pulse_width_mask;

>
diff mbox series

Patch

diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index a27233d4876b..2cbacb4430bb 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -164,6 +164,8 @@  static void aspeed_soc_init(Object *obj)
         qdev_set_parent_bus(DEVICE(&s->wdt[i]), sysbus_get_default());
         qdev_prop_set_uint32(DEVICE(&s->wdt[i]), "silicon-rev",
                                     sc->info->silicon_rev);
+        object_property_add_const_link(OBJECT(&s->wdt[i]), "scu",
+                                       OBJECT(&s->scu), &error_abort);
     }
 
     object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);
diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
index 95f6ad186d72..f5cb30c0b584 100644
--- a/hw/watchdog/wdt_aspeed.c
+++ b/hw/watchdog/wdt_aspeed.c
@@ -43,6 +43,9 @@ 
 
 #define WDT_RESTART_MAGIC               0x4755
 
+#define SCU_RESET_CONTROL1              (0x04 / 4)
+#define    SCU_RESET_SDRAM              BIT(0)
+
 static bool aspeed_wdt_is_enabled(const AspeedWDTState *s)
 {
     return s->regs[WDT_CTRL] & WDT_CTRL_ENABLE;
@@ -221,6 +224,13 @@  static void aspeed_wdt_timer_expired(void *dev)
 {
     AspeedWDTState *s = ASPEED_WDT(dev);
 
+    /* Do not reset on SDRAM controller reset */
+    if (s->scu->regs[SCU_RESET_CONTROL1] & SCU_RESET_SDRAM) {
+        timer_del(s->timer);
+        s->regs[WDT_CTRL] = 0;
+        return;
+    }
+
     qemu_log_mask(CPU_LOG_RESET, "Watchdog timer expired.\n");
     watchdog_perform_action();
     timer_del(s->timer);
@@ -232,6 +242,16 @@  static void aspeed_wdt_realize(DeviceState *dev, Error **errp)
 {
     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
     AspeedWDTState *s = ASPEED_WDT(dev);
+    Error *err = NULL;
+    Object *obj;
+
+    obj = object_property_get_link(OBJECT(dev), "scu", &err);
+    if (!obj) {
+        error_propagate(errp, err);
+        error_prepend(errp, "required link 'scu' not found: ");
+        return;
+    }
+    s->scu = ASPEED_SCU(obj);
 
     if (!is_supported_silicon_rev(s->silicon_rev)) {
         error_setg(errp, "Unknown silicon revision: 0x%" PRIx32,
diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_aspeed.h
index 7de3e5c224fb..cc734bd7ae7b 100644
--- a/include/hw/watchdog/wdt_aspeed.h
+++ b/include/hw/watchdog/wdt_aspeed.h
@@ -26,6 +26,7 @@  typedef struct AspeedWDTState {
     MemoryRegion iomem;
     uint32_t regs[ASPEED_WDT_REGS_MAX];
 
+    AspeedSCUState *scu;
     uint32_t pclk_freq;
     uint32_t silicon_rev;
     uint32_t ext_pulse_width_mask;