hw/arm/fsl-imx7: Connect watchdog interrupts

qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

i.MX7 supports watchdog pretimeout interupts. With this commit,
the watchdog in mcimx7d-sabre is fully operational, including
pretimeout support.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Message-id: 20200517162135.110364-9-linux@roeck-us.net
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

authored by

Guenter Roeck and committed by

Peter Maydell 5 years ago c4947e64 72465e1e

+16

2 changed files

expand all

arm

fsl-imx7.c

include

arm

fsl-imx7.h

+11

hw/arm/fsl-imx7.c

··· 447 447 FSL_IMX7_WDOG3_ADDR, 448 448 FSL_IMX7_WDOG4_ADDR, 449 449 }; 450 + static const int FSL_IMX7_WDOGn_IRQ[FSL_IMX7_NUM_WDTS] = { 451 + FSL_IMX7_WDOG1_IRQ, 452 + FSL_IMX7_WDOG2_IRQ, 453 + FSL_IMX7_WDOG3_IRQ, 454 + FSL_IMX7_WDOG4_IRQ, 455 + }; 450 456 457 + object_property_set_bool(OBJECT(&s->wdt[i]), true, "pretimeout-support", 458 + &error_abort); 451 459 object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", 452 460 &error_abort); 453 461 454 462 sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0, FSL_IMX7_WDOGn_ADDR[i]); 463 + sysbus_connect_irq(SYS_BUS_DEVICE(&s->wdt[i]), 0, 464 + qdev_get_gpio_in(DEVICE(&s->a7mpcore), 465 + FSL_IMX7_WDOGn_IRQ[i])); 455 466 } 456 467 457 468 /*

include/hw/arm/fsl-imx7.h

··· 228 228 FSL_IMX7_USB2_IRQ = 42, 229 229 FSL_IMX7_USB3_IRQ = 40, 230 230 231 + FSL_IMX7_WDOG1_IRQ = 78, 232 + FSL_IMX7_WDOG2_IRQ = 79, 233 + FSL_IMX7_WDOG3_IRQ = 10, 234 + FSL_IMX7_WDOG4_IRQ = 109, 235 + 231 236 FSL_IMX7_PCI_INTA_IRQ = 125, 232 237 FSL_IMX7_PCI_INTB_IRQ = 124, 233 238 FSL_IMX7_PCI_INTC_IRQ = 123,