From nobody Sat Feb 7 07:39:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628217158442676.3742969005891; Thu, 5 Aug 2021 19:32:38 -0700 (PDT) Received: from localhost ([::1]:33668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBpf3-0005m9-Ex for importer@patchew.org; Thu, 05 Aug 2021 22:32:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBpdx-0004AQ-Pc for qemu-devel@nongnu.org; Thu, 05 Aug 2021 22:31:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBpdu-0002WB-SF for qemu-devel@nongnu.org; Thu, 05 Aug 2021 22:31:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-57-1I9_eIxhNLW_HPZoiHDf0Q-1; Thu, 05 Aug 2021 22:31:22 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E591D802B9F; Fri, 6 Aug 2021 02:31:20 +0000 (UTC) Received: from localhost (unknown [10.22.11.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B313779D0; Fri, 6 Aug 2021 02:31:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628217083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zjd7se0onNJo2aiTwnoUmHMlJWpyG2rtkXxBgYKFn4A=; b=Wh26iR0kVEfJrRY3KoxS6zCQ7g+/ub7z33WkKSNO4lFHnhuDKPB2Oyhd9j6ZcLCAO1b+ok E8BImelQpRN8NNLZd7VUYSa9hpKSN48n0D4ycv6sY1UdH5/IA6PZBL/jbTyVW0bmveyH9g anpy1chYOeC3m1nUgnhAiP/lMLzFmLo= X-MC-Unique: 1I9_eIxhNLW_HPZoiHDf0Q-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH for-6.2] sbsa-ref: Rename SBSA_GWDT enum value Date: Thu, 5 Aug 2021 22:31:19 -0400 Message-Id: <20210806023119.431680-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Shashi Mallela , Leif Lindholm , qemu-arm@nongnu.org, Radoslaw Biernacki Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628217159849100001 Content-Type: text/plain; charset="utf-8" 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 --- Cc: Radoslaw Biernacki Cc: Peter Maydell Cc: Leif Lindholm Cc: Shashi Mallela Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- hw/arm/sbsa-ref.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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[] =3D { [SBSA_AHCI] =3D 10, [SBSA_EHCI] =3D 11, [SBSA_SMMU] =3D 12, /* ... to 15 */ - [SBSA_GWDT] =3D 16, + [SBSA_GWDT_WS0] =3D 16, }; =20 static const char * const valid_cpus[] =3D { @@ -481,7 +481,7 @@ static void create_wdt(const SBSAMachineState *sms) hwaddr cbase =3D sbsa_ref_memmap[SBSA_GWDT_CONTROL].base; DeviceState *dev =3D qdev_new(TYPE_WDT_SBSA); SysBusDevice *s =3D SYS_BUS_DEVICE(dev); - int irq =3D sbsa_ref_irqmap[SBSA_GWDT]; + int irq =3D sbsa_ref_irqmap[SBSA_GWDT_WS0]; =20 sysbus_realize_and_unref(s, &error_fatal); sysbus_mmio_map(s, 0, rbase); --=20 2.31.1