From nobody Fri Nov 14 23:28:50 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759847549; cv=none; d=zohomail.com; s=zohoarc; b=XWvs3lnRAe3NYkoPfuBiBL9veTX6Ob7Avdwp0mHuqdRtnfGN4JF/j0v2OayYIQ7kL4nfr6SjwdghlbnluluiXmMXtfEjUsva3vAiCYXsgYCADps4PFXi7KU1J8dSXVTLRn7dGqQbDKo5zXwroGTKmfirnzM3DX/Qoj362ZrWNb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759847549; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=GFnB0dE3EY2EnfVj9Zafs1tOQvVMrxpMd2tdX/02X84=; b=kkLXEmQbgUnldUqViYH0Dc789laxDJ19Cva6d2kiZ1M7WLl6PMMLvSmkjZXIZMQESC+vDyZ0p5sPiynCnrL80ZYyDiN3QVBqEwT8+fDzWmgpkUvq1GdxqfkALvCEyBWa5457LD8zS3yZusekflCS01YiUl7g2KCClGzYfow4uAI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759847549034116.72074581363495; Tue, 7 Oct 2025 07:32:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v68Qu-00061h-Qj; Tue, 07 Oct 2025 10:12:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v68QS-0005oo-7d for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:12:25 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v68QC-0002G4-7z for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:12:23 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e2e363118so57806505e9.0 for ; Tue, 07 Oct 2025 07:12:05 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e78c5d290sm167037135e9.0.2025.10.07.07.12.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 07:12:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759846323; x=1760451123; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GFnB0dE3EY2EnfVj9Zafs1tOQvVMrxpMd2tdX/02X84=; b=LXEshL99WHVoxqVYfa9ccSuv59ZB+m345u1tkGM+hxiqGBgYY1GG+RcuL75La/c599 KdLtxOi4kxABREr73QI1AYtOzVxZ52AxtZC85GSWmJsNEwNGHq6QUttTMSQzK3m5lq4T KzI4cdZyAQm2HFf2VuTT7AA3Bk9WXf31WLMDZczxRzMsgqYIeCNYcQRlr6xc0aTyfbr9 LZis8AXv4/2+yzDibGwosYuA3cn17XNDcC5IY2mPmrxODfknNwMIrYnL3BtX1NpEdCSV 668CgaBo5l62AsbMEq9u1k3M2tt0lp1R+q99JV8lupTu8eIXH/wZdBpUoJENrEsNdsVP FMYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759846323; x=1760451123; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GFnB0dE3EY2EnfVj9Zafs1tOQvVMrxpMd2tdX/02X84=; b=t42suFxbZbVQkE3EYvVsL22Ci0++4W0L7rAxOfg9z67Uq/0ksFdQYLhr21pW24tCGu pkyZPLeXbXSJLYfofQH19DogCeRmjX3nWcBeBYe4wILIaAgIERwfdr9ax/jjTbt4pQ6S +A1ZU/8FpPu8GT1PhKk5ghUXfi16rQkwCyLgRJrIfuYz7ISopu8ilUT4QhX+trV3JqbZ Z8yUig4SGUwlJWO5bgTCa787ORHnteQ57lhpDsEnJZD7IMO2hATyg4xhSMKPJzv+SlbK yO9aOLFSQrF2/kzNMuuZ8VZm2I+Skw4J8PaZQKhFL2AeuKWj1djdtUR+NjFrDwQmByC+ Hkjw== X-Gm-Message-State: AOJu0YyH+EV3f7dFM68eX380DYmD1+vZBsJ30F3Gp+raAQP8GMBaPt6Q sAh27MkFfCvloIKCHk6tP8ub3k8llTGrPEDOUhpUU+YLKdC6HRKWTATTrmfPSe4fT0zGclc6wMB swgwQ X-Gm-Gg: ASbGncsUjKweOM1LRZNk+bDinAYS8Fh9Vxi4Z7Por8rlo6F2V0ezOkE/gf9VTjpjGs8 9Nzcyi9GmT2St5yInrbO/KfFacdsglXiTR27rrQeW5kaKMsNTlWcDGLx0W7PoafZeUoVbKNg++H CkE27QBZmrSClfr6OdxRY/hzwHlSkNyOT0kI/nUu74qdh5+dlBCSaM3fe595DPbvtS7Azj1kS5h gYkixizsUsOW9L5w1F9Xmlnrv78OxwFc3Cd5yvlsYSk4g8b/T4/SIV6i7xVcO5xZGaHCmktfgEU wxKd1l3gsmElgznH5X+WjSGzVwG41lXdnz24RYDNde2m0yOMMrE6RSfV1BwGCeliCaaIOngK/oR jWZgqgEoAmc+gLQb+yILIjwu6dOMGozSyo9gIcB+a5gvKT5a6oUGiJWFw X-Google-Smtp-Source: AGHT+IFxsS87KT6f2nDQRRwvz9VS7eu/kzpLb2WdBZkBvPrQECig8mgNI6z3nqWNzot8dyFlDWQLvQ== X-Received: by 2002:a05:600c:6092:b0:46e:48fd:a1a9 with SMTP id 5b1f17b1804b1-46e7117258cmr117242725e9.33.1759846322901; Tue, 07 Oct 2025 07:12:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 35/62] hw/arm/xlnx-versal: use hw/arm/bsa.h for timer IRQ indices Date: Tue, 7 Oct 2025 15:10:55 +0100 Message-ID: <20251007141123.3239867-36-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251007141123.3239867-1-peter.maydell@linaro.org> References: <20251007141123.3239867-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759847551021154100 From: Luc Michel Use the bsa.h header for ARM timer and maintainance IRQ indices instead of redefining our owns. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Edgar E. Iglesias Tested-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20250926070806.292065-35-luc.michel@amd.com Signed-off-by: Peter Maydell --- include/hw/arm/xlnx-versal.h | 6 ------ hw/arm/xlnx-versal.c | 28 +++++++++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 7bdf6dab629..da0260b83de 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -87,12 +87,6 @@ int versal_get_num_sdhci(VersalVersion version); /* Memory-map and IRQ definitions. Copied a subset from * auto-generated files. */ =20 -#define VERSAL_GIC_MAINT_IRQ 9 -#define VERSAL_TIMER_VIRT_IRQ 11 -#define VERSAL_TIMER_S_EL1_IRQ 13 -#define VERSAL_TIMER_NS_EL1_IRQ 14 -#define VERSAL_TIMER_NS_EL2_IRQ 10 - #define VERSAL_CRL_IRQ 10 #define VERSAL_UART0_IRQ_0 18 #define VERSAL_UART1_IRQ_0 19 diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 6604e24a9cd..dc388300185 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -49,6 +49,7 @@ #include "hw/core/split-irq.h" #include "target/arm/cpu.h" #include "hw/cpu/cluster.h" +#include "hw/arm/bsa.h" =20 #define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72") #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f") @@ -673,7 +674,8 @@ static DeviceState *versal_create_gic(Versal *s, qemu_fdt_setprop_cell(s->cfg.fdt, node, "phandle", s->phandle.gic); qemu_fdt_setprop_cell(s->cfg.fdt, node, "#interrupt-cells", 3); qemu_fdt_setprop_cells(s->cfg.fdt, node, "interrupts", - GIC_FDT_IRQ_TYPE_PPI, VERSAL_GIC_MAINT_IRQ, + GIC_FDT_IRQ_TYPE_PPI, + INTID_TO_PPI(ARCH_GIC_MAINT_IRQ), GIC_FDT_IRQ_FLAGS_LEVEL_HI); qemu_fdt_setprop(s->cfg.fdt, node, "interrupt-controller", NULL, 0= ); } @@ -698,10 +700,10 @@ static void connect_gic_to_cpu(const VersalCpuCluster= Map *map, * GIC PPI inputs. */ const int timer_irq[] =3D { - [GTIMER_PHYS] =3D VERSAL_TIMER_NS_EL1_IRQ, - [GTIMER_VIRT] =3D VERSAL_TIMER_VIRT_IRQ, - [GTIMER_HYP] =3D VERSAL_TIMER_NS_EL2_IRQ, - [GTIMER_SEC] =3D VERSAL_TIMER_S_EL1_IRQ, + [GTIMER_PHYS] =3D INTID_TO_PPI(ARCH_TIMER_NS_EL1_IRQ), + [GTIMER_VIRT] =3D INTID_TO_PPI(ARCH_TIMER_VIRT_IRQ), + [GTIMER_HYP] =3D INTID_TO_PPI(ARCH_TIMER_NS_EL2_IRQ), + [GTIMER_SEC] =3D INTID_TO_PPI(ARCH_TIMER_S_EL1_IRQ), }; =20 has_gtimer =3D arm_feature(&ARM_CPU(cpu)->env, ARM_FEATURE_GENERIC_TIM= ER); @@ -716,9 +718,9 @@ static void connect_gic_to_cpu(const VersalCpuClusterMa= p *map, =20 if (map->gic.version =3D=3D 3) { qemu_irq maint_irq; + int maint_idx =3D ppibase + INTID_TO_PPI(ARCH_GIC_MAINT_IRQ); =20 - maint_irq =3D qdev_get_gpio_in(gic, - ppibase + VERSAL_GIC_MAINT_IRQ); + maint_irq =3D qdev_get_gpio_in(gic, maint_idx); qdev_connect_gpio_out_named(cpu, "gicv3-maintenance-interrupt", 0, maint_irq); } @@ -842,13 +844,17 @@ static void versal_create_cpu_cluster(Versal *s, cons= t VersalCpuClusterMap *map) if (map->dtb_expose && has_gtimer) { qemu_fdt_add_subnode(s->cfg.fdt, "/timer"); qemu_fdt_setprop_cells(s->cfg.fdt, "/timer", "interrupts", - GIC_FDT_IRQ_TYPE_PPI, VERSAL_TIMER_S_EL1_IR= Q, + GIC_FDT_IRQ_TYPE_PPI, + INTID_TO_PPI(ARCH_TIMER_S_EL1_IRQ), GIC_FDT_IRQ_FLAGS_LEVEL_HI, - GIC_FDT_IRQ_TYPE_PPI, VERSAL_TIMER_NS_EL1_I= RQ, + GIC_FDT_IRQ_TYPE_PPI, + INTID_TO_PPI(ARCH_TIMER_NS_EL1_IRQ), GIC_FDT_IRQ_FLAGS_LEVEL_HI, - GIC_FDT_IRQ_TYPE_PPI, VERSAL_TIMER_VIRT_IRQ, + GIC_FDT_IRQ_TYPE_PPI, + INTID_TO_PPI(ARCH_TIMER_VIRT_IRQ), GIC_FDT_IRQ_FLAGS_LEVEL_HI, - GIC_FDT_IRQ_TYPE_PPI, VERSAL_TIMER_NS_EL2_I= RQ, + GIC_FDT_IRQ_TYPE_PPI, + INTID_TO_PPI(ARCH_TIMER_NS_EL2_IRQ), GIC_FDT_IRQ_FLAGS_LEVEL_HI); qemu_fdt_setprop(s->cfg.fdt, "/timer", "compatible", compatible, sizeof(compatible)); --=20 2.43.0