hw/arm/fsl-imx8mp: Add watchdog support

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-id: 20250223114708.1780-13-shentey@gmail.com
[PMM: drop static const from wdog_table for GCC 7.5]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Bernhard Beschow 2025-02-23 12:47:02 +01:00 committed by Peter Maydell
parent 06908a84f0
commit 1ac21eb8fb
4 changed files with 37 additions and 0 deletions

View file

@ -17,6 +17,7 @@ The ``imx8mp-evk`` machine implements the following devices:
* 5 GPIO Controllers * 5 GPIO Controllers
* 6 I2C Controllers * 6 I2C Controllers
* 3 SPI Controllers * 3 SPI Controllers
* 3 Watchdogs
* Secure Non-Volatile Storage (SNVS) including an RTC * Secure Non-Volatile Storage (SNVS) including an RTC
* Clock Tree * Clock Tree

View file

@ -606,6 +606,7 @@ config FSL_IMX8MP
select PCI_EXPRESS_FSL_IMX8M_PHY select PCI_EXPRESS_FSL_IMX8M_PHY
select SDHCI select SDHCI
select UNIMP select UNIMP
select WDT_IMX2
config FSL_IMX8MP_EVK config FSL_IMX8MP_EVK
bool bool

View file

@ -228,6 +228,11 @@ static void fsl_imx8mp_init(Object *obj)
object_initialize_child(obj, name, &s->spi[i], TYPE_IMX_SPI); object_initialize_child(obj, name, &s->spi[i], TYPE_IMX_SPI);
} }
for (i = 0; i < FSL_IMX8MP_NUM_WDTS; i++) {
g_autofree char *name = g_strdup_printf("wdt%d", i);
object_initialize_child(obj, name, &s->wdt[i], TYPE_IMX2_WDT);
}
object_initialize_child(obj, "pcie", &s->pcie, TYPE_DESIGNWARE_PCIE_HOST); object_initialize_child(obj, "pcie", &s->pcie, TYPE_DESIGNWARE_PCIE_HOST);
object_initialize_child(obj, "pcie_phy", &s->pcie_phy, object_initialize_child(obj, "pcie_phy", &s->pcie_phy,
TYPE_FSL_IMX8M_PCIE_PHY); TYPE_FSL_IMX8M_PCIE_PHY);
@ -491,6 +496,28 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error **errp)
sysbus_mmio_map(SYS_BUS_DEVICE(&s->snvs), 0, sysbus_mmio_map(SYS_BUS_DEVICE(&s->snvs), 0,
fsl_imx8mp_memmap[FSL_IMX8MP_SNVS_HP].addr); fsl_imx8mp_memmap[FSL_IMX8MP_SNVS_HP].addr);
/* Watchdogs */
for (i = 0; i < FSL_IMX8MP_NUM_WDTS; i++) {
struct {
hwaddr addr;
unsigned int irq;
} wdog_table[FSL_IMX8MP_NUM_WDTS] = {
{ fsl_imx8mp_memmap[FSL_IMX8MP_WDOG1].addr, FSL_IMX8MP_WDOG1_IRQ },
{ fsl_imx8mp_memmap[FSL_IMX8MP_WDOG2].addr, FSL_IMX8MP_WDOG2_IRQ },
{ fsl_imx8mp_memmap[FSL_IMX8MP_WDOG3].addr, FSL_IMX8MP_WDOG3_IRQ },
};
object_property_set_bool(OBJECT(&s->wdt[i]), "pretimeout-support",
true, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdt[i]), errp)) {
return;
}
sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0, wdog_table[i].addr);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->wdt[i]), 0,
qdev_get_gpio_in(gicdev, wdog_table[i].irq));
}
/* PCIe */ /* PCIe */
if (!sysbus_realize(SYS_BUS_DEVICE(&s->pcie), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->pcie), errp)) {
return; return;
@ -531,6 +558,7 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error **errp)
case FSL_IMX8MP_SNVS_HP: case FSL_IMX8MP_SNVS_HP:
case FSL_IMX8MP_UART1 ... FSL_IMX8MP_UART4: case FSL_IMX8MP_UART1 ... FSL_IMX8MP_UART4:
case FSL_IMX8MP_USDHC1 ... FSL_IMX8MP_USDHC3: case FSL_IMX8MP_USDHC1 ... FSL_IMX8MP_USDHC3:
case FSL_IMX8MP_WDOG1 ... FSL_IMX8MP_WDOG3:
/* device implemented and treated above */ /* device implemented and treated above */
break; break;

View file

@ -21,6 +21,7 @@
#include "hw/pci-host/fsl_imx8m_phy.h" #include "hw/pci-host/fsl_imx8m_phy.h"
#include "hw/sd/sdhci.h" #include "hw/sd/sdhci.h"
#include "hw/ssi/imx_spi.h" #include "hw/ssi/imx_spi.h"
#include "hw/watchdog/wdt_imx2.h"
#include "qom/object.h" #include "qom/object.h"
#include "qemu/units.h" #include "qemu/units.h"
@ -38,6 +39,7 @@ enum FslImx8mpConfiguration {
FSL_IMX8MP_NUM_IRQS = 160, FSL_IMX8MP_NUM_IRQS = 160,
FSL_IMX8MP_NUM_UARTS = 4, FSL_IMX8MP_NUM_UARTS = 4,
FSL_IMX8MP_NUM_USDHCS = 3, FSL_IMX8MP_NUM_USDHCS = 3,
FSL_IMX8MP_NUM_WDTS = 3,
}; };
struct FslImx8mpState { struct FslImx8mpState {
@ -53,6 +55,7 @@ struct FslImx8mpState {
IMXI2CState i2c[FSL_IMX8MP_NUM_I2CS]; IMXI2CState i2c[FSL_IMX8MP_NUM_I2CS];
IMXSerialState uart[FSL_IMX8MP_NUM_UARTS]; IMXSerialState uart[FSL_IMX8MP_NUM_UARTS];
SDHCIState usdhc[FSL_IMX8MP_NUM_USDHCS]; SDHCIState usdhc[FSL_IMX8MP_NUM_USDHCS];
IMX2WdtState wdt[FSL_IMX8MP_NUM_WDTS];
DesignwarePCIEHost pcie; DesignwarePCIEHost pcie;
FslImx8mPciePhyState pcie_phy; FslImx8mPciePhyState pcie_phy;
}; };
@ -235,6 +238,10 @@ enum FslImx8mpIrqs {
FSL_IMX8MP_I2C5_IRQ = 76, FSL_IMX8MP_I2C5_IRQ = 76,
FSL_IMX8MP_I2C6_IRQ = 77, FSL_IMX8MP_I2C6_IRQ = 77,
FSL_IMX8MP_WDOG1_IRQ = 78,
FSL_IMX8MP_WDOG2_IRQ = 79,
FSL_IMX8MP_WDOG3_IRQ = 10,
FSL_IMX8MP_PCI_INTA_IRQ = 126, FSL_IMX8MP_PCI_INTA_IRQ = 126,
FSL_IMX8MP_PCI_INTB_IRQ = 125, FSL_IMX8MP_PCI_INTB_IRQ = 125,
FSL_IMX8MP_PCI_INTC_IRQ = 124, FSL_IMX8MP_PCI_INTC_IRQ = 124,