sbsa-ref: Rename SBSA_GWDT enum value
PATCH 1/1 sbsa-ref: Rename SBSA_GWDT enum value
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.
---
Cc: Radoslaw Biernacki <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: Leif Lindholm <[email protected]>
Cc: Shashi Mallela <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- hw/arm/sbsa-ref.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/arm/sbsa-ref.c +3 -3
@@ -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);
Signature · 1 line
2.31.1
Peter Maydell
AppliedQuoted 11 lines · Eduardo Habkost
The
SBSA_GWDTenum value conflicts with theSBSA_GWDT()QOM type checking helper, preventing us from using a OBJECT_DEFINE* orDEFINE_INSTANCE_CHECKERmacro for theSBSA_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_WS0to be more explicit and avoid the name conflict.Signed-off-by Eduardo Habkost <[email protected]>
Applied to target-arm.next for 6.2, thanks.
-- PMM