hw/arm/sbsa-ref: add SBSA watchdog device

Included the newly implemented SBSA generic watchdog device model into
SBSA platform

Signed-off-by: Shashi Mallela <shashi.mallela@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20201027015927.29495-3-shashi.mallela@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Shashi Mallela 2020-10-26 21:59:27 -04:00 committed by Peter Maydell
parent 4204c5f703
commit baabe7d03c

View File

@ -40,6 +40,7 @@
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "hw/char/pl011.h" #include "hw/char/pl011.h"
#include "hw/watchdog/sbsa_gwdt.h"
#include "net/net.h" #include "net/net.h"
#include "qom/object.h" #include "qom/object.h"
@ -64,6 +65,9 @@ enum {
SBSA_GIC_DIST, SBSA_GIC_DIST,
SBSA_GIC_REDIST, SBSA_GIC_REDIST,
SBSA_SECURE_EC, SBSA_SECURE_EC,
SBSA_GWDT,
SBSA_GWDT_REFRESH,
SBSA_GWDT_CONTROL,
SBSA_SMMU, SBSA_SMMU,
SBSA_UART, SBSA_UART,
SBSA_RTC, SBSA_RTC,
@ -104,6 +108,8 @@ static const MemMapEntry sbsa_ref_memmap[] = {
[SBSA_GIC_DIST] = { 0x40060000, 0x00010000 }, [SBSA_GIC_DIST] = { 0x40060000, 0x00010000 },
[SBSA_GIC_REDIST] = { 0x40080000, 0x04000000 }, [SBSA_GIC_REDIST] = { 0x40080000, 0x04000000 },
[SBSA_SECURE_EC] = { 0x50000000, 0x00001000 }, [SBSA_SECURE_EC] = { 0x50000000, 0x00001000 },
[SBSA_GWDT_REFRESH] = { 0x50010000, 0x00001000 },
[SBSA_GWDT_CONTROL] = { 0x50011000, 0x00001000 },
[SBSA_UART] = { 0x60000000, 0x00001000 }, [SBSA_UART] = { 0x60000000, 0x00001000 },
[SBSA_RTC] = { 0x60010000, 0x00001000 }, [SBSA_RTC] = { 0x60010000, 0x00001000 },
[SBSA_GPIO] = { 0x60020000, 0x00001000 }, [SBSA_GPIO] = { 0x60020000, 0x00001000 },
@ -134,6 +140,7 @@ static const int sbsa_ref_irqmap[] = {
[SBSA_AHCI] = 10, [SBSA_AHCI] = 10,
[SBSA_EHCI] = 11, [SBSA_EHCI] = 11,
[SBSA_SMMU] = 12, /* ... to 15 */ [SBSA_SMMU] = 12, /* ... to 15 */
[SBSA_GWDT] = 16,
}; };
static uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState *sms, int idx) static uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState *sms, int idx)
@ -448,6 +455,20 @@ static void create_rtc(const SBSAMachineState *sms)
sysbus_create_simple("pl031", base, qdev_get_gpio_in(sms->gic, irq)); sysbus_create_simple("pl031", base, qdev_get_gpio_in(sms->gic, irq));
} }
static void create_wdt(const SBSAMachineState *sms)
{
hwaddr rbase = sbsa_ref_memmap[SBSA_GWDT_REFRESH].base;
hwaddr cbase = sbsa_ref_memmap[SBSA_GWDT_CONTROL].base;
DeviceState *dev = qdev_new(TYPE_WDT_SBSA);
SysBusDevice *s = SYS_BUS_DEVICE(dev);
int irq = sbsa_ref_irqmap[SBSA_GWDT];
sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, rbase);
sysbus_mmio_map(s, 1, cbase);
sysbus_connect_irq(s, 0, qdev_get_gpio_in(sms->gic, irq));
}
static DeviceState *gpio_key_dev; static DeviceState *gpio_key_dev;
static void sbsa_ref_powerdown_req(Notifier *n, void *opaque) static void sbsa_ref_powerdown_req(Notifier *n, void *opaque)
{ {
@ -731,6 +752,8 @@ static void sbsa_ref_init(MachineState *machine)
create_rtc(sms); create_rtc(sms);
create_wdt(sms);
create_gpio(sms); create_gpio(sms);
create_ahci(sms); create_ahci(sms);