| Message ID | 20210806023119.431680-1-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-6.2] sbsa-ref: Rename SBSA_GWDT enum value | expand |
On Fri, 6 Aug 2021 at 03:31, Eduardo Habkost <ehabkost@redhat.com> wrote: > > The SBSA_GWDT enum value conflicts with the SBSA_GWDT() QOM type > checking helper, preventing us from using a OBJECT_DEFINE* or > DEFINE_INSTANCE_CHECKER macro for the SBSA_GWDT() wrapper. > > If I understand the SBSA 6.0 specification correctly, the signal > being connected to IRQ 16 is the WS0 output signal from the > Generic Watchdog. Rename the enum value to SBSA_GWDT_WS0 to be > more explicit and avoid the name conflict. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Applied to target-arm.next for 6.2, thanks. -- PMM
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index c1629df6031..509c5f09b4e 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -65,7 +65,7 @@ enum { SBSA_GIC_DIST, SBSA_GIC_REDIST, SBSA_SECURE_EC, - SBSA_GWDT, + SBSA_GWDT_WS0, SBSA_GWDT_REFRESH, SBSA_GWDT_CONTROL, SBSA_SMMU, @@ -140,7 +140,7 @@ static const int sbsa_ref_irqmap[] = { [SBSA_AHCI] = 10, [SBSA_EHCI] = 11, [SBSA_SMMU] = 12, /* ... to 15 */ - [SBSA_GWDT] = 16, + [SBSA_GWDT_WS0] = 16, }; static const char * const valid_cpus[] = { @@ -481,7 +481,7 @@ static void create_wdt(const SBSAMachineState *sms) 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]; + int irq = sbsa_ref_irqmap[SBSA_GWDT_WS0]; sysbus_realize_and_unref(s, &error_fatal); sysbus_mmio_map(s, 0, rbase);
The SBSA_GWDT enum value conflicts with the SBSA_GWDT() QOM type checking helper, preventing us from using a OBJECT_DEFINE* or DEFINE_INSTANCE_CHECKER macro for the SBSA_GWDT() wrapper. If I understand the SBSA 6.0 specification correctly, the signal being connected to IRQ 16 is the WS0 output signal from the Generic Watchdog. Rename the enum value to SBSA_GWDT_WS0 to be more explicit and avoid the name conflict. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Cc: Radoslaw Biernacki <rad@semihalf.com> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Shashi Mallela <shashi.mallela@linaro.org> Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- hw/arm/sbsa-ref.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)