From nobody Fri Nov 14 23:28:55 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=1759847495; cv=none; d=zohomail.com; s=zohoarc; b=lV8xTYXT7h0V84AVtXuigmvrHr8r98CwB3mTSQtMj+UNsq3VBvy19H16xE0cOpe/xrUJL6smtXJI86gk+w4V6dWRTLCiAdEYRzwj1+uKeDMteWP8IxlllQvG7oWvtDOD9lqIBsJOCaGKWjvtXkUEbiwN8AcPNKRKObyZbo9gm7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759847495; 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=ziGJUQupY63rU8TMMMSnY4UYmwRsfHPmPg1J/VFbM4k=; b=Va/h2laYJZzlYDP5HhJCcdG0p+4bagqXPmdYbYX/YrrN7OLSSkLwXQSV8UVWbbnSBd4rSy27+vCkyDNXmRLCwdpPbGorMPOg3J9A5vUs2h2plezeQE9rxJR31++2OhHwAUqG68ItWBMCWU5nAf3qq1pRClLhbp0WTTY4l+v0Hhg= 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 1759847495501408.5369310599567; Tue, 7 Oct 2025 07:31:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v68Qr-0005yu-UJ; Tue, 07 Oct 2025 10:12:49 -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 1v68QY-0005pT-1A for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:12:30 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v68QG-0002IA-Hd for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:12:28 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e3a50bc0fso51601835e9.3 for ; Tue, 07 Oct 2025 07:12:09 -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.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 07:12:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759846327; x=1760451127; 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=ziGJUQupY63rU8TMMMSnY4UYmwRsfHPmPg1J/VFbM4k=; b=Q4x+RBgwuzucuWwRjx4ufTMlUk0p0nsHDnCAQDVqkQPtRrvBd2At2qS5qfLIEvz/zr vlpfX0MWbUi6Of6MVGxif7hKbQELkbWh5ZU2bpO5IdYalQJ0GPZJZ62zb6OszWLtrIPZ AoT8saI7Rzy7ojNIyHGBwM8Eg518oUcQ5SbByK7XbDLCG5W6FwTJXDOA7gHOHrcAjPTN xBOwrzWGBQqqlupXWTCI6Of9gYSQlwyYQTg4hvv2k7shNFq8wRCBmZAZvtAejOcBr9KG DxWJXGTqcVqlN5nrPs8VY1udoMO/5PSHHVy7NA/L/5Idv5FwpwlWKWwlEXQoQBSY0XbX dgKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759846327; x=1760451127; 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=ziGJUQupY63rU8TMMMSnY4UYmwRsfHPmPg1J/VFbM4k=; b=KV6ZfOjftFn3YG9icsJt80Gzm9M7JpHm9zqdHUAixqG+QySNq6e2PZITWuWDepyZ1M yMrJnZTOWAdDKno5nnFMYA9AWNDGRril3fSKWWjq4wprqING/89vnRYBNjkVHz3nQIf+ NYw/b7caJyuWztpwcy+lk2Y+5LmRx2YV4+lXWe+8lnQ6m5H8PIbdXmRGzGuU/q2Sl0kT Zym8IqBGe98JRFmUqmmlGdkgctZ+iKiIMbZMiQ+iORpf9LKVKnJclL1P2SyNvSaj84vi zGQybWW//ilE0Nx0jzUHiO6aC/nqFnsYTY06rQ2MdQ+6hMe23EUncZLP78JqLUr+gEKU jCRw== X-Gm-Message-State: AOJu0Yy30E1GxDnh0z2zI4UTvTnfTKI6AXKmkyUUnAtxqNtf4Thrr/w+ /OM9GM3ZFmap/1oL1JnVqaXg4/DdRjfb+lnC/QnVX9TGCUGxJklUXzn0fljZKP9RaKUYc+STdkw UbzgD X-Gm-Gg: ASbGncuERIjQINkRHlCkyiKY/GFAOE+VEs28nST09/L3EYDzMxDg46M2mIlLCcOVYxX lLrOLUcW5iY0i6y+uqN97ceT7evGRQPi4RjC1zf9P4+RYsPPyn9wIu7pv3PhdBVe98b+bLPDlHb NaH7GQMT7Sj3V9ZtFJWH3GIsJ2ZmPa8MZUb5XskdYPjzooj8p59uIsRW9qRks9TkhGEfBf1/9y3 xeYsH84rAqT/ID/uB/ucb+VD5ZGVYqIdRQ0HnZrXEKV7SMwsO46RlkF6zJr07CnF2RFlEtCQMBC KXqa62/PCOPKgwfsIlsmbHDuUFPI6temCpOoo85mKjo8k5yId913fbKwQP8JCAwITOICeVDvQFV vSPqf9P5CwPhUEKC7X7O5+WymtFjyvpqNhTftymk52UPLe5ak0zckz+n3 X-Google-Smtp-Source: AGHT+IFHWrUDATjrE2Ij+Gl+D2Kp4RYlfVcHNLtzH8kAWBqHSdezwZTrKQD/AXjgcya+/oqeGsbtqQ== X-Received: by 2002:a05:600c:8b41:b0:456:1a69:94fa with SMTP id 5b1f17b1804b1-46e71102767mr99148965e9.13.1759846327001; Tue, 07 Oct 2025 07:12:07 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 39/62] hw/arm/xlnx-versal: add the target field in IRQ descriptor Date: Tue, 7 Oct 2025 15:10:59 +0100 Message-ID: <20251007141123.3239867-40-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::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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, T_SPF_TEMPERROR=0.01 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: 1759847496691154100 From: Luc Michel Add the target field in the IRQ descriptor. This allows to target an IRQ to another IRQ controller than the GIC(s). Other supported targets are the PMC PPU1 CPU interrupt controller and the EAM (Error management) device. Those two devices are currently not implemented so IRQs targeting those will be left unconnected. This is in preparation for versal2. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Tested-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20250926070806.292065-39-luc.michel@amd.com Signed-off-by: Peter Maydell --- hw/arm/xlnx-versal.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 3d960ed2636..64744401182 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -52,14 +52,26 @@ =20 /* * IRQ descriptor to catch the following cases: + * - An IRQ can either connect to the GICs, to the PPU1 intc, or the the= EAM * - Multiple devices can connect to the same IRQ. They are OR'ed togeth= er. */ FIELD(VERSAL_IRQ, IRQ, 0, 16) +FIELD(VERSAL_IRQ, TARGET, 16, 2) FIELD(VERSAL_IRQ, ORED, 18, 1) FIELD(VERSAL_IRQ, OR_IDX, 19, 4) /* input index on the IRQ OR gate */ =20 +typedef enum VersalIrqTarget { + IRQ_TARGET_GIC, + IRQ_TARGET_PPU1, + IRQ_TARGET_EAM, +} VersalIrqTarget; + +#define PPU1_IRQ(irq) ((IRQ_TARGET_PPU1 << R_VERSAL_IRQ_TARGET_SHIFT) | (i= rq)) +#define EAM_IRQ(irq) ((IRQ_TARGET_EAM << R_VERSAL_IRQ_TARGET_SHIFT) | (irq= )) #define OR_IRQ(irq, or_idx) \ (R_VERSAL_IRQ_ORED_MASK | ((or_idx) << R_VERSAL_IRQ_OR_IDX_SHIFT) | (i= rq)) +#define PPU1_OR_IRQ(irq, or_idx) \ + ((IRQ_TARGET_PPU1 << R_VERSAL_IRQ_TARGET_SHIFT) | OR_IRQ(irq, or_idx)) =20 typedef struct VersalSimplePeriphMap { uint64_t addr; @@ -414,6 +426,13 @@ static qemu_irq versal_get_gic_irq(Versal *s, int irq_= idx) static qemu_irq versal_get_irq_or_gate_in(Versal *s, int irq_idx, qemu_irq target_irq) { + static const char *TARGET_STR[] =3D { + [IRQ_TARGET_GIC] =3D "gic", + [IRQ_TARGET_PPU1] =3D "ppu1", + [IRQ_TARGET_EAM] =3D "eam", + }; + + VersalIrqTarget target; Object *container =3D versal_get_child(s, "irq-or-gates"); DeviceState *dev; g_autofree char *name; @@ -421,8 +440,9 @@ static qemu_irq versal_get_irq_or_gate_in(Versal *s, in= t irq_idx, =20 idx =3D FIELD_EX32(irq_idx, VERSAL_IRQ, IRQ); or_idx =3D FIELD_EX32(irq_idx, VERSAL_IRQ, OR_IDX); + target =3D FIELD_EX32(irq_idx, VERSAL_IRQ, TARGET); =20 - name =3D g_strdup_printf("irq[%d]", idx); + name =3D g_strdup_printf("%s-irq[%d]", TARGET_STR[target], idx); dev =3D DEVICE(object_resolve_path_at(container, name)); =20 if (dev =3D=3D NULL) { @@ -438,12 +458,29 @@ static qemu_irq versal_get_irq_or_gate_in(Versal *s, = int irq_idx, =20 static qemu_irq versal_get_irq(Versal *s, int irq_idx) { + VersalIrqTarget target; qemu_irq irq; bool ored; =20 + target =3D FIELD_EX32(irq_idx, VERSAL_IRQ, TARGET); ored =3D FIELD_EX32(irq_idx, VERSAL_IRQ, ORED); =20 - irq =3D versal_get_gic_irq(s, irq_idx); + switch (target) { + case IRQ_TARGET_EAM: + /* EAM not implemented */ + return NULL; + + case IRQ_TARGET_PPU1: + /* PPU1 CPU not implemented */ + return NULL; + + case IRQ_TARGET_GIC: + irq =3D versal_get_gic_irq(s, irq_idx); + break; + + default: + g_assert_not_reached(); + } =20 if (ored) { irq =3D versal_get_irq_or_gate_in(s, irq_idx, irq); --=20 2.43.0