From nobody Sat Nov 15 17:21:18 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=quarantine dis=none) header.from=adacore.com ARC-Seal: i=1; a=rsa-sha256; t=1749822192; cv=none; d=zohomail.com; s=zohoarc; b=UWfvhe54EgLxoYaY+vfRTj9PrmhP+pwX90blBYDfoMQjYh0VwvAomICmfX4CAXZrAHsCrY2CNbjjWBt88TBiPjr2dPflRy7/qP12hUoFEqE63IUF8aCHuUe5fJ3v9XFMId4kqVS99N15mHdRKTTledLVaNUytdV3AKIXuVAey38= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749822192; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=GWZIDBLsFhdR8GCNkB2CqLPUwwJ7URlhmr8AdedA46w=; b=WgPR/EXgBPd08wrShDMZ3skRzfuL+BULoPW4eF84oiLGFtvdOYk5r1qobd1pir9mD2EabESCQTSwBuspnzQl1cxMJEMRehwsGZ3x8TjlKlByWyIW3Xo5C7A7lUajyrcIxLkWvX3/r8XVQv/l6V/Fap4ldZV4CqdZcRyhCePTQOg= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1749822192542445.101845341474; Fri, 13 Jun 2025 06:43:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQ4g7-0001q2-0A; Fri, 13 Jun 2025 09:42:44 -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 1uQ4fi-0001iE-UZ for qemu-devel@nongnu.org; Fri, 13 Jun 2025 09:42:20 -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 1uQ4ff-0006GX-Gt for qemu-devel@nongnu.org; Fri, 13 Jun 2025 09:42:18 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-450dd065828so17499265e9.2 for ; Fri, 13 Jun 2025 06:42:15 -0700 (PDT) Received: from chigot-Dell.home ([2a01:cb15:8100:3d00:9e4f:bbb8:63a3:78f3]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532e224795sm53258035e9.7.2025.06.13.06.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 06:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1749822133; x=1750426933; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GWZIDBLsFhdR8GCNkB2CqLPUwwJ7URlhmr8AdedA46w=; b=jV+IU1xjMznxwsaYwDQOBPutJ2XMlPKvK6WEI3WOlsxJDSRGl4SkWAYPFVTiB+hVl5 pZJ1fYPXLGM4cftNldiGlKF+flUt1glUJ11Jpi49ZkKGbp2etthFZbdcf2hrgzVXFmEn mpedvJAXQF1CD/pJgxJkjqtnNlPn0ejsxxxFubih5YUt8c8nyrgKaJOp3IHwU2E7LTtD PXHz1K+dkCuUs9SKUl/0pfPKPxKWti/lttRU4iL3VUhLgVwqlA3TfqP18vG9bF9dJQMi RmsUjkv9BK6pFjd1DF5pZkddtEXO+StoemruFxpz0A3so6O7kYbqE57L6LLdIKmgr3H7 8Xxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749822133; x=1750426933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GWZIDBLsFhdR8GCNkB2CqLPUwwJ7URlhmr8AdedA46w=; b=nKfDrJhGXwLgM5ej27DJpIv1d9DHoo/lbPFkeQFitgML17TM+GLqU6pIn66pdxS6xM pL7YuEHJV2chJth7BkxYv5iUpapUI4fmtw21n62w8/Hn+eOf3wlRHkcn+BXfRHf+CUEw XK3iEekIZ783iX8gFyYwMt0M50XqH3ckxRiJfoJwA8srxIGkYbwYtkpicwW2m3PwIbLW 7eWkIppsAbxglLa9SffhoR31jw0xcSYETtJosgpPd8FdMSfhvATckrVOa36yGnlwFp7P IKZCOZluYbc/JLFL8srl1NpF2+smzOfa/OCN+Y5HvMh3wk+D2wEmpFKP4B5TWy++ZTHj eZRA== X-Gm-Message-State: AOJu0Yx3OIE8DWeNZuuJPcJ7OamNYV+uol1frzZheAlRRjTfXrGH53DC 0VSYs1IJ9w1jlPh+XiTvlRmGCzNErmNDtDkXoGuODnYGhwt0TyqFe2KR03pyqH/GGtZrqmR9KYm 1WaQ= X-Gm-Gg: ASbGncvF1RS0pWYxRyU3TqvSg2ci9Mw6AOhSt+qpTA6y01Wt57sefVqPBsBI/7EfVKJ 4dn7pM5+YK6BpMnMKNPh5Ai7CnH3xhouWkPbTLFWHtKdxX5g3nznV7OjcYsSzXQZHKH1Fg1x8w0 BJnNFw7qMrH1jK4ttfprWDd99o/x3CnbQhDor5c1UXq2rVxRUVfhEjfZQf2/fhd/57sxZZT5E5I QQIVYK0ALGz/6uk+t/89lqOcLX7Uh4GueToOB3v8Ph49eX7gq73v/sWGxV3LyiMhy7D94QJL0aD TI9+3E6eBEcmUiTi8h0RFaCHElDPNRBS8x2jTovuj31Sh7jcU8xVt1oQ12s4dnBFCmeELYY= X-Google-Smtp-Source: AGHT+IGDKkhaJdWsplV/NODlTd3qrSVom6X+jZ2Qa68Lno8nVrKB9Moia/dUCPgefqQJijZiyR3Sdg== X-Received: by 2002:a05:600c:4fd6:b0:450:d367:c385 with SMTP id 5b1f17b1804b1-45334ae6432mr34861245e9.16.1749822133566; Fri, 13 Jun 2025 06:42:13 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org, edgar.iglesias@gmail.com, alistair@alistair23.me, =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH v3 1/3] hw/arm: make cpu targeted by arm_load_kernel the primary CPU. Date: Fri, 13 Jun 2025 15:42:06 +0200 Message-Id: <20250613134208.1509436-2-chigot@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250613134208.1509436-1-chigot@adacore.com> References: <20250613134208.1509436-1-chigot@adacore.com> 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=chigot@adacore.com; 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, SPF_PASS=-0.001 autolearn=unavailable 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 @adacore.com) X-ZM-MESSAGEID: 1749822193882116600 Currently, arm booting processus assumes that the first_cpu is the CPU that will boot: `arm_load_kernel` is powering off all but the `first_cpu`; `do_cpu_reset` is setting the loader address only for this `first_cpu`. For most of the boards, this isn't an issue as the kernel is loaded and booted on the first CPU anyway. However, for zynqmp, the option "boot-cpu" allows to choose any CPUs. Create a new arm_boot_info entry `primary_cpu` recording which CPU will be boot first. This one is set when `arm_boot_kernel` is called. Signed-off-by: Cl=C3=A9ment Chigot Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/boot.c | 15 +++++++-------- include/hw/arm/boot.h | 3 +++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 79afb51b8a..3c93d87985 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -744,7 +744,7 @@ static void do_cpu_reset(void *opaque) } else { if (arm_feature(env, ARM_FEATURE_EL3) && (info->secure_boot || - (info->secure_board_setup && cs =3D=3D first_cpu))) { + (info->secure_board_setup && cpu =3D=3D info->primary= _cpu))) { /* Start this CPU in Secure SVC */ target_el =3D 3; } @@ -752,7 +752,7 @@ static void do_cpu_reset(void *opaque) =20 arm_emulate_firmware_reset(cs, target_el); =20 - if (cs =3D=3D first_cpu) { + if (cpu =3D=3D info->primary_cpu) { AddressSpace *as =3D arm_boot_address_space(cpu, info); =20 cpu_set_pc(cs, info->loader_start); @@ -1239,6 +1239,9 @@ void arm_load_kernel(ARMCPU *cpu, MachineState *ms, s= truct arm_boot_info *info) info->dtb_filename =3D ms->dtb; info->dtb_limit =3D 0; =20 + /* We assume the CPU passed as argument is the primary CPU. */ + info->primary_cpu =3D cpu; + /* Load the kernel. */ if (!info->kernel_filename || info->firmware_loaded) { arm_setup_firmware_boot(cpu, info); @@ -1288,12 +1291,8 @@ void arm_load_kernel(ARMCPU *cpu, MachineState *ms, = struct arm_boot_info *info) =20 object_property_set_int(cpuobj, "psci-conduit", info->psci_con= duit, &error_abort); - /* - * Secondary CPUs start in PSCI powered-down state. Like the - * code in do_cpu_reset(), we assume first_cpu is the primary - * CPU. - */ - if (cs !=3D first_cpu) { + /* Secondary CPUs start in PSCI powered-down state. */ + if (ARM_CPU(cs) !=3D info->primary_cpu) { object_property_set_bool(cpuobj, "start-powered-off", true, &error_abort); } diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index b12bf61ca8..a2e22bda8a 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -132,6 +132,9 @@ struct arm_boot_info { bool secure_board_setup; =20 arm_endianness endianness; + + /* CPU having load the kernel and that should be the first to boot. */ + ARMCPU *primary_cpu; }; =20 /** --=20 2.34.1 From nobody Sat Nov 15 17:21:18 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=quarantine dis=none) header.from=adacore.com ARC-Seal: i=1; a=rsa-sha256; t=1749822197; cv=none; d=zohomail.com; s=zohoarc; b=PA1/pjwy+s2d79GpBECWG4F1paMY0LE8ezZSgLDtH5hR3VV7bA2hduGg6r7T+NndCPdWx1PnOVffiwBIwzKPLB5M1G7ru83422IFL4Tb0YHmsWeYEMVis3UjYFitqzHtvhYlBsxVY7XxyTlGdwgMXTa19IVliIvJOmNlM6ZIlt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749822197; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=gBmjh7KSh/lXhoXTOuKukePRCVIS57DizEDl33AZgJw=; b=HGorBLbjAdMArWRUezr2XeV8qR3jnR++2KBhv/SnNcVh0O4wfVw/VCLil89jwDG+JffgAzqOmSyymd9zC6kGjeNOyCUX48Tt1e+PApgOUWANlGmZxrrv5psdSjGaKB8JNR0vsSTJbuk+ktjkNK682kQJzBcEqvyixe3xeJF6WtE= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174982219731092.28031562784702; Fri, 13 Jun 2025 06:43:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQ4gA-0001uq-Im; Fri, 13 Jun 2025 09:42:47 -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 1uQ4fk-0001iI-Cw for qemu-devel@nongnu.org; Fri, 13 Jun 2025 09:42:22 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uQ4fg-0006Gt-0X for qemu-devel@nongnu.org; Fri, 13 Jun 2025 09:42:18 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4530921461aso18725185e9.0 for ; Fri, 13 Jun 2025 06:42:15 -0700 (PDT) Received: from chigot-Dell.home ([2a01:cb15:8100:3d00:9e4f:bbb8:63a3:78f3]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532e224795sm53258035e9.7.2025.06.13.06.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 06:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1749822134; x=1750426934; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gBmjh7KSh/lXhoXTOuKukePRCVIS57DizEDl33AZgJw=; b=RrBhSCwjuNc/LO2Sdnu6jrTAqIUHQrdKxrKoTrMMKNeKXKRKJuWDpis0HuhqTVcoU3 giFJiUJM/e6ZwEwMFy50zXPVzGs9289qmzNjTQ102xk1LZHIodt0Z8Ex37MeQs3RNki1 Aph49V9mcoWqKLqghT8Zj1wyejOLLzpxWtNkedL17tGshUmnlwujHVTbbgbOGULdLxrP ZAsxUFrrSYAavI8ehi+Y05ZYchwRDtRJbWaY4YGIgSXuRweYWrrM6akRN/XrOPHEtJQB PRA5uUcAnThWJmmf3mS0oM7Cq4j45djmrznvAgm9ZNGvzgrhI6sdcWGJgz5Wjdoo+GAA NiXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749822134; x=1750426934; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gBmjh7KSh/lXhoXTOuKukePRCVIS57DizEDl33AZgJw=; b=rNc2PSR9SQWM2iYUZh6Q1O+t0DH2DRKV2y8LkIoFHlQCcFbXApEz+TCga38HyrXSHg /rqVtG/bIdP7E501fyfuQKDohJF9hfaJ3sQF4cQTTNH8oaV2CagSBIdKmReqRs2tzrjH ddgOClkOSJJdbusnYi7FVhPcKMorlbcPf9Ier/ExDlHUttPtKpidMxU0D61Re0VvnY0Q BT/TChLpNC3wBmROLasMo5dpUwnAVuCPRy8vRHPnTTZmOuDFtYn3LNzZsO8Wqo8t9KRx n0FnnAJfTLy6ALmCGXvTPv/BqbbHHwpEbaNuyn9qnlKTg4n1ux3tzrU/tOAnDr3dJp+m RCwg== X-Gm-Message-State: AOJu0YzQL+mBrEvDsBdpEyBZpfMg+GpD/8RrYtcXJMzOJz+1fS0mG+TF qydthTYJPmuzUGvLgIPB9+ospfqeFkmZUA8nAvta01Y4XCUwWvJPT6nfFeFqZFVT+GJxjmvsw9V i/Y8= X-Gm-Gg: ASbGnctpcPwjqgnwkUuy4+22CYGJxUD5Z3bCWZ/90oxcDvan7p6zL9SUMXsqb1EtYre Sl6i0XXYijld8HfYDk+htZ1LL7SeDq/skeRxzxfPz7ttaUh3Y52XmtmVhI7tHvMs/LrKIHwwkfP DlGFzUuxB++v6pIlYDuXnNPv+EKiga2XAIXZhkyVnlFn1TCd04VnIaa3XoMgSYGMVzbbw/wReGQ oO2z8WzJRoTrkiilP56fCuVl+Q4djZxbNeybAsv0AO5s7OxGp5bgmTohLn/SNHoUxxyeezqvKTW 0OFzqDvt39I9T3fpCkpRcVciioPxPH7azeo4yY4M0NCK3QGMbUyUkOWy8P782iuOyk1MXsg= X-Google-Smtp-Source: AGHT+IGSqhN5Y0rRhs274m7hKi2KXsOJXM4fouZ5Sl3FNuvTM9nV2EU1dqKy8M+s2TLZNxiroU0rzQ== X-Received: by 2002:a05:600c:8710:b0:43b:ca39:6c75 with SMTP id 5b1f17b1804b1-45334ad0716mr37715865e9.16.1749822134294; Fri, 13 Jun 2025 06:42:14 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org, edgar.iglesias@gmail.com, alistair@alistair23.me, Frederic Konrad , =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH v3 2/3] hw/intc/arm_gic: introduce a first-cpu-index property Date: Fri, 13 Jun 2025 15:42:07 +0200 Message-Id: <20250613134208.1509436-3-chigot@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250613134208.1509436-1-chigot@adacore.com> References: <20250613134208.1509436-1-chigot@adacore.com> 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::32c; envelope-from=chigot@adacore.com; helo=mail-wm1-x32c.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 @adacore.com) X-ZM-MESSAGEID: 1749822197681116600 From: Frederic Konrad This introduces a first-cpu-index property to the arm-gic, as some SOCs could have two separate GIC (ie: the zynqmp). Signed-off-by: Cl=C3=A9ment Chigot Reviewed-by: Peter Maydell --- hw/intc/arm_gic.c | 2 +- hw/intc/arm_gic_common.c | 1 + include/hw/intc/arm_gic.h | 2 ++ include/hw/intc/arm_gic_common.h | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index d18bef40fc..899f133363 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -59,7 +59,7 @@ static const uint8_t gic_id_gicv2[] =3D { static inline int gic_get_current_cpu(GICState *s) { if (!qtest_enabled() && s->num_cpu > 1) { - return current_cpu->cpu_index; + return current_cpu->cpu_index - s->first_cpu_index; } return 0; } diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index 0f0c48d89a..ed5be05645 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -350,6 +350,7 @@ static void arm_gic_common_linux_init(ARMLinuxBootIf *o= bj, =20 static const Property arm_gic_common_properties[] =3D { DEFINE_PROP_UINT32("num-cpu", GICState, num_cpu, 1), + DEFINE_PROP_UINT32("first-cpu-index", GICState, first_cpu_index, 0), DEFINE_PROP_UINT32("num-irq", GICState, num_irq, 32), /* Revision can be 1 or 2 for GIC architecture specification * versions 1 or 2, or 0 to indicate the legacy 11MPCore GIC. diff --git a/include/hw/intc/arm_gic.h b/include/hw/intc/arm_gic.h index 48f6a51a70..6faccf8ef6 100644 --- a/include/hw/intc/arm_gic.h +++ b/include/hw/intc/arm_gic.h @@ -27,6 +27,8 @@ * implement the security extensions * + QOM property "has-virtualization-extensions": set true if the GIC sh= ould * implement the virtualization extensions + * + QOM property "first-cpu-index": index of the first cpu attached to t= he + * GIC. * + unnamed GPIO inputs: (where P is number of SPIs, i.e. num-irq - 32) * [0..P-1] SPIs * [P..P+31] PPIs for CPU 0 diff --git a/include/hw/intc/arm_gic_common.h b/include/hw/intc/arm_gic_com= mon.h index 97fea4102d..93a3cc2bf8 100644 --- a/include/hw/intc/arm_gic_common.h +++ b/include/hw/intc/arm_gic_common.h @@ -129,6 +129,8 @@ struct GICState { uint32_t num_lrs; =20 uint32_t num_cpu; + /* cpu_index of the first CPU, attached to this GIC. */ + uint32_t first_cpu_index; =20 MemoryRegion iomem; /* Distributor */ /* This is just so we can have an opaque pointer which identifies --=20 2.34.1 From nobody Sat Nov 15 17:21:18 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=quarantine dis=none) header.from=adacore.com ARC-Seal: i=1; a=rsa-sha256; t=1749822195; cv=none; d=zohomail.com; s=zohoarc; b=ck2yIz6f8bh9pZhJ/w7DOD1a1xmMQcd2JHKMoXVk0stwo+mOHFn87cUOt3mz09IG8DRYenMSbWFlhFIfltCEQSBCfltJbjVRRG+TsIVl73cEsDV8U1Ih6KUTWEEudO3o+HEEuRKr0Py/M2WJWDDF+P4DRwNyg2zB0Wo1KlpUpbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749822195; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=VtuIMGrk4cA38mwOT6svvwt5leQDrrMzrCr1wrerMs8=; b=Z5zvMy8ExmXdSJChhgeFV8fHmE2DAjm3HzTUIzK+qliiAPvroTcJiJfXUUWjN8J7ov+M41yYOrup6KSyZQ05zzZrIjkmzNl0qNaq+38Fy095xoC41s1uVLzNjUfPo2XpVTcvUUL4Uv8ux+9QdU3KsCjCU7dVDFIBDbF/DpMpJFc= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174982219576085.96288835854295; Fri, 13 Jun 2025 06:43:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQ4gI-0002GT-Jx; Fri, 13 Jun 2025 09:42: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 1uQ4fm-0001ir-Lv for qemu-devel@nongnu.org; Fri, 13 Jun 2025 09:42:28 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uQ4fi-0006HC-Lg for qemu-devel@nongnu.org; Fri, 13 Jun 2025 09:42:21 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3a54836cb7fso1385987f8f.2 for ; Fri, 13 Jun 2025 06:42:16 -0700 (PDT) Received: from chigot-Dell.home ([2a01:cb15:8100:3d00:9e4f:bbb8:63a3:78f3]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532e224795sm53258035e9.7.2025.06.13.06.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 06:42:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1749822135; x=1750426935; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VtuIMGrk4cA38mwOT6svvwt5leQDrrMzrCr1wrerMs8=; b=igPAKDB9XocoNhr47GA7W0p9x1G0gnxTOw5h5vUjEO2BAZNOX+YoOPDDvrU0zO1wRI cWHRPZyr6wtu037fa4vNG0xSWUvd6kVoYO4T3zGlE/iCi+PdEC9TtbRAKQBwUu6ZPxPi UsrGwnNzVyti5V6p4PRXnfiL37n12o6HlvLS4q/toGqPAtu47N8Uc/53xECHV/J3jtYH P270NnVD/4UAFP8pziS1YJtnsJArEc41kqm3+g4GKyapJzNmDUG/3k0upfJwExu6lt+7 Vmh9WqYRoz3tXu2DLrdu6ytSScI1JyFRoV+wusKSvK4Oy0FgUEs1QEbYMDw4QtMfQj4F WnNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749822135; x=1750426935; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VtuIMGrk4cA38mwOT6svvwt5leQDrrMzrCr1wrerMs8=; b=P9YE+rc5v36lCc1BqaFWZQvXtHvrRwdQXHJGlYbY0f4Rr7i5GNMhF2dOzPyF6gSClV XVFJz14H4Zkkm9w/wMU7P6ZEXdhlAghbtyuzRAX4LlJfeRsDRi3zBhX/qGsVkHRwL4X6 jbbRxf5xmhOviw8Rh8PFCW3MIUqnB5vSMlp10geacXIL+WbBMDaxKZsQABhlkF9ZHzqM uzRUdTgt/TVah/W1gcxsa1DComRgKdxeLHiNZdr62gXRFw8ay5ho5O7li00uNwXwJyYd xCWnN9bJu4+YdDwP1Pb93euFt2clPwV8SW00VIZnM5XMCtlfg2tzGFehoPDrFXDWhKT2 XiEA== X-Gm-Message-State: AOJu0Yyf0BVZCb3iTGzzBkgoay0Cg10JgwcBUjGYAk91OcESuKAcib1Y qTBoNqmH4O/FGIU3ycHPWeTMf6p1BCegpFkDa5H7TRo5yerCLAKFbohUY88FocPg9/DSesZW8Ts TqIA= X-Gm-Gg: ASbGncsFk3+NL8PNn7mSftWm8gLqjkReakRClEi5sWToCaqUQNwzS9fnyQJ2fma+aSF DNdCDadV/zIL9ehxFnZSe6WxEIVyU8FZBbMTUQxQeSuoQudIv8hsL6HnoeOrmf/v9MZ9837Vy7a sjYS6AzgkOdA4miPMW8IP9hHdLuhw92UTbdwqOHs14GWQGni0qE2Kk9bhBspR+KXdDo4BWYTmhR BfoSm9Z5PmOvf6ph+hf/TheEk+gkP2HApLj0GDxxW2TuzLR3RcMVUX9n77nCdWuFDDRaFq5ka6Z 2mJFvFSqJDsgOx1NlZ/cYn5sxPeZdz3dpn1d4AfbJ3bVLP7aAJlX5AILuvvI3ySAuFTQ9RI= X-Google-Smtp-Source: AGHT+IGzI1gRhn91+4rbO5onEcFo7IyYl5ISQrLKpahw2G1eQAj39t7+wCgtGiqo9rNHe1J4qOUbPA== X-Received: by 2002:a05:6000:24c7:b0:3a5:26eb:b4af with SMTP id ffacd0b85a97d-3a5686fc03dmr3024839f8f.18.1749822135022; Fri, 13 Jun 2025 06:42:15 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org, edgar.iglesias@gmail.com, alistair@alistair23.me, Frederic Konrad , =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH v3 3/3] hw/arm/xlnx-zynqmp: wire a second GIC for the Cortex-R5 Date: Fri, 13 Jun 2025 15:42:08 +0200 Message-Id: <20250613134208.1509436-4-chigot@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250613134208.1509436-1-chigot@adacore.com> References: <20250613134208.1509436-1-chigot@adacore.com> 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::42c; envelope-from=chigot@adacore.com; helo=mail-wr1-x42c.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=unavailable 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 @adacore.com) X-ZM-MESSAGEID: 1749822197998116600 From: Frederic Konrad This wires a second GIC for the Cortex-R5, all the IRQs are split when there is an RPU instanciated. Signed-off-by: Cl=C3=A9ment Chigot --- hw/arm/xlnx-zynqmp.c | 103 +++++++++++++++++++++++++++++++---- include/hw/arm/xlnx-zynqmp.h | 5 ++ 2 files changed, 98 insertions(+), 10 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index ec96a46eec..ffed6e5126 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -26,8 +26,6 @@ #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" =20 -#define GIC_NUM_SPI_INTR 160 - #define ARM_PHYS_TIMER_PPI 30 #define ARM_VIRT_TIMER_PPI 27 #define ARM_HYP_TIMER_PPI 26 @@ -206,17 +204,26 @@ static const XlnxZynqMPGICRegion xlnx_zynqmp_gic_regi= ons[] =3D { =20 static inline int arm_gic_ppi_index(int cpu_nr, int ppi_index) { - return GIC_NUM_SPI_INTR + cpu_nr * GIC_INTERNAL + ppi_index; + return XLNX_ZYNQMP_GIC_NUM_SPI_INTR + cpu_nr * GIC_INTERNAL + ppi_inde= x; +} + +static unsigned int xlnx_zynqmp_get_rpu_number(MachineState *ms) +{ + /* + * RPUs will be created only if "-smp" is higher than the maximum + * of APUs. Round it up to 0 to avoid dealing with negative values. + */ + return MAX(0, MIN((int)(ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS), + XLNX_ZYNQMP_NUM_RPU_CPUS)); } =20 static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, const char *boot_cpu, Error **errp) { int i; - int num_rpus =3D MIN((int)(ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS), - XLNX_ZYNQMP_NUM_RPU_CPUS); + int num_rpus =3D xlnx_zynqmp_get_rpu_number(ms); =20 - if (num_rpus <=3D 0) { + if (!num_rpus) { /* Don't create rpu-cluster object if there's nothing to put in it= */ return; } @@ -377,6 +384,7 @@ static void xlnx_zynqmp_init(Object *obj) XlnxZynqMPState *s =3D XLNX_ZYNQMP(obj); int i; int num_apus =3D MIN(ms->smp.cpus, XLNX_ZYNQMP_NUM_APU_CPUS); + int num_rpus =3D xlnx_zynqmp_get_rpu_number(ms); =20 object_initialize_child(obj, "apu-cluster", &s->apu_cluster, TYPE_CPU_CLUSTER); @@ -390,6 +398,12 @@ static void xlnx_zynqmp_init(Object *obj) =20 object_initialize_child(obj, "gic", &s->gic, gic_class_name()); =20 + if (num_rpus) { + /* Do not create the rpu_gic if we don't have rpus */ + object_initialize_child(obj, "rpu_gic", &s->rpu_gic, + gic_class_name()); + } + for (i =3D 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) { object_initialize_child(obj, "gem[*]", &s->gem[i], TYPE_CADENCE_GE= M); object_initialize_child(obj, "gem-irq-orgate[*]", @@ -439,6 +453,15 @@ static void xlnx_zynqmp_init(Object *obj) object_initialize_child(obj, "qspi-irq-orgate", &s->qspi_irq_orgate, TYPE_OR_IRQ); =20 + if (num_rpus) { + for (i =3D 0; i < ARRAY_SIZE(s->splitter); i++) { + g_autofree char *name =3D g_strdup_printf("irq-splitter%d", i); + object_initialize_child(obj, name, &s->splitter[i], TYPE_SPLIT= _IRQ); + } + } + + + for (i =3D 0; i < XLNX_ZYNQMP_NUM_USB; i++) { object_initialize_child(obj, "usb[*]", &s->usb[i], TYPE_USB_DWC3); } @@ -452,9 +475,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) uint8_t i; uint64_t ram_size; int num_apus =3D MIN(ms->smp.cpus, XLNX_ZYNQMP_NUM_APU_CPUS); + int num_rpus =3D xlnx_zynqmp_get_rpu_number(ms); const char *boot_cpu =3D s->boot_cpu ? s->boot_cpu : "apu-cpu[0]"; ram_addr_t ddr_low_size, ddr_high_size; - qemu_irq gic_spi[GIC_NUM_SPI_INTR]; + qemu_irq gic_spi[XLNX_ZYNQMP_GIC_NUM_SPI_INTR]; Error *err =3D NULL; =20 ram_size =3D memory_region_size(s->ddr_ram); @@ -502,13 +526,22 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Err= or **errp) g_free(ocm_name); } =20 - qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", GIC_NUM_SPI_INTR + 32= ); + qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", + XLNX_ZYNQMP_GIC_NUM_SPI_INTR + 32); qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 2); qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", num_apus); qdev_prop_set_bit(DEVICE(&s->gic), "has-security-extensions", s->secur= e); qdev_prop_set_bit(DEVICE(&s->gic), "has-virtualization-extensions", s->virt); =20 + if (num_rpus) { + qdev_prop_set_uint32(DEVICE(&s->rpu_gic), "num-irq", + XLNX_ZYNQMP_GIC_NUM_SPI_INTR + 32); + qdev_prop_set_uint32(DEVICE(&s->rpu_gic), "revision", 1); + qdev_prop_set_uint32(DEVICE(&s->rpu_gic), "num-cpu", num_rpus); + qdev_prop_set_uint32(DEVICE(&s->rpu_gic), "first-cpu-index", 4); + } + qdev_realize(DEVICE(&s->apu_cluster), NULL, &error_fatal); =20 /* Realize APUs before realizing the GIC. KVM requires this. */ @@ -608,13 +641,63 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Err= or **errp) return; } =20 + if (num_rpus) { + if (!sysbus_realize(SYS_BUS_DEVICE(&s->rpu_gic), errp)) { + return; + } + + for (i =3D 0; i < num_rpus; i++) { + qemu_irq irq; + + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rpu_gic), i + 1, + GIC_BASE_ADDR + i * 0x1000); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->rpu_gic), i, + qdev_get_gpio_in(DEVICE(&s->rpu_cpu[i]), + ARM_CPU_IRQ)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->rpu_gic), i + num_rpus, + qdev_get_gpio_in(DEVICE(&s->rpu_cpu[i]), + ARM_CPU_FIQ)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->rpu_gic), i + num_rpus *= 2, + qdev_get_gpio_in(DEVICE(&s->rpu_cpu[i]), + ARM_CPU_VIRQ)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->rpu_gic), i + num_rpus *= 3, + qdev_get_gpio_in(DEVICE(&s->rpu_cpu[i]), + ARM_CPU_VFIQ)); + irq =3D qdev_get_gpio_in(DEVICE(&s->rpu_gic), + arm_gic_ppi_index(i, ARM_PHYS_TIMER_PPI= )); + qdev_connect_gpio_out(DEVICE(&s->rpu_cpu[i]), GTIMER_PHYS, irq= ); + irq =3D qdev_get_gpio_in(DEVICE(&s->rpu_gic), + arm_gic_ppi_index(i, ARM_VIRT_TIMER_PPI= )); + qdev_connect_gpio_out(DEVICE(&s->rpu_cpu[i]), GTIMER_VIRT, irq= ); + irq =3D qdev_get_gpio_in(DEVICE(&s->rpu_gic), + arm_gic_ppi_index(i, ARM_HYP_TIMER_PPI)= ); + qdev_connect_gpio_out(DEVICE(&s->rpu_cpu[i]), GTIMER_HYP, irq); + irq =3D qdev_get_gpio_in(DEVICE(&s->rpu_gic), + arm_gic_ppi_index(i, ARM_SEC_TIMER_PPI)= ); + qdev_connect_gpio_out(DEVICE(&s->rpu_cpu[i]), GTIMER_SEC, irq); + } + + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rpu_gic), 0, GIC_BASE_ADDR); + } + if (!s->boot_cpu_ptr) { error_setg(errp, "ZynqMP Boot cpu %s not found", boot_cpu); return; } =20 - for (i =3D 0; i < GIC_NUM_SPI_INTR; i++) { - gic_spi[i] =3D qdev_get_gpio_in(DEVICE(&s->gic), i); + for (i =3D 0; i < XLNX_ZYNQMP_GIC_NUM_SPI_INTR; i++) { + if (num_rpus) { + DeviceState *splitter =3D DEVICE(&s->splitter[i]); + qdev_prop_set_uint16(splitter, "num-lines", 2); + qdev_realize(splitter, NULL, &error_abort); + gic_spi[i] =3D qdev_get_gpio_in(splitter, 0); + qdev_connect_gpio_out(splitter, 0, + qdev_get_gpio_in(DEVICE(&s->gic), i)); + qdev_connect_gpio_out(splitter, 1, + qdev_get_gpio_in(DEVICE(&s->rpu_gic), i)= ); + } else { + gic_spi[i] =3D qdev_get_gpio_in(DEVICE(&s->gic), i); + } } =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) { diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index c137ac59e8..0ae00e10f6 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -42,6 +42,7 @@ #include "hw/misc/xlnx-zynqmp-crf.h" #include "hw/timer/cadence_ttc.h" #include "hw/usb/hcd-dwc3.h" +#include "hw/core/split-irq.h" =20 #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp" OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP) @@ -87,6 +88,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP) XLNX_ZYNQMP_MAX_HIGH_RAM_SIZE) =20 #define XLNX_ZYNQMP_NUM_TTC 4 +#define XLNX_ZYNQMP_GIC_NUM_SPI_INTR 160 =20 /* * Unimplemented mmio regions needed to boot some images. @@ -105,6 +107,9 @@ struct XlnxZynqMPState { GICState gic; MemoryRegion gic_mr[XLNX_ZYNQMP_GIC_REGIONS][XLNX_ZYNQMP_GIC_ALIASES]; =20 + GICState rpu_gic; + SplitIRQ splitter[XLNX_ZYNQMP_GIC_NUM_SPI_INTR]; + MemoryRegion ocm_ram[XLNX_ZYNQMP_NUM_OCM_BANKS]; =20 MemoryRegion *ddr_ram; --=20 2.34.1