From nobody Wed Jun 24 00:56:51 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glNn12hwkz6hDg4 for ; Wed, 24 Jun 2026 00:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glNmz6qQzz3qkb for ; Wed, 24 Jun 2026 00:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782262613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bef+fn7nm/t3PTucf/4qnqWvNkffhJCTn2L1dqnQT98=; b=AcoFJH8/lbsMYAjYQnG0nwfMli6X3c+lsbI27Vq13CTxcSyAU7gpudHHqQmmsI+0NbmAj4 nTCJwDdVxt9VYfnVVBg+e4XjMSELSi4PO2H9ZX396gRTecLKJDkrr0hpmd4CaP5HQZXdEl AaXPWAeXpNL8xidKIZSl1Msru3nwsYiEFPQXy9MHTJql+4rnsSu+/lfJ2Gl1hpQ+XVVoiy ZXgjVwdcuAJzicyYlWUoZLM+R7N5rhyDbjMIwsKdmZKU+RRuEFEWDpPRXPG5EoQwlXxRw9 sFMnTKH4hv+3YtXcgr/A2zvw9WIgoMfh+C7R3KBfjzn9AHPuphDJyPnDbhIAIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782262612; a=rsa-sha256; cv=none; b=yP3Bm2sN1P5bvbr8erVRB6ysxFaLLwA7jLg0B3aOxTM6arUEj6kKsYnhl9s6ghjlss3JdS dFZ29n9qgsVmc01bZTufanh5WmjBiREYP1OLOt7iuNA6g0ibPfAlvkBjIBXMWke+PxdK3x MxVxmXGCh+weSP1zM/HdVIx8Ys2S5lCw21D3DIShUIMQy7xrdgNy5UfPZD3UzWYHUa2waV 3ki/Qi9tTpHd6VIdzdXdfaTQoVwwgnWvTywmHI1sgbn3CFIhz2eTebdHd5oQsfAVHI59Qo Fq7mdlrc+IaG3F718+YZFsE8vKSb6vU7Kl4dOQntHgr1+moH3wyYPHdlO1MF8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782262612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bef+fn7nm/t3PTucf/4qnqWvNkffhJCTn2L1dqnQT98=; b=XIpNC3NYFNBU+VYiLHh5I05f/H4bpSDVc+E/AdoBTll60ULfy7riVKPIto3IevzCcEYVmo MJHu3lNTwDx8eIEb0SmDEJzRHV+2yafOpboia9zNtB5DsQmzl0134hhaory9KEtcmQqg6T 1/w9PXNbnvI7DKvucsTbIiGic5e0/BfL2qrO3LjZA1SjtaRtf66C3pO/GRHwp2pfxyLZu/ wS0hUjFbVLanLZmW1Tfz82fN6Wsm/8HdGdhKOVcJZTxDcwvZ/fsWmR0Xj2O94WMwRnHO1z i+0zCYdgSsrVTyRZQPnOvjp7JNtg3P1lhzOuBz3+B8VW9ERTWiZXvFTplbn+DA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glNmz5kGwzy6k for ; Wed, 24 Jun 2026 00:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ade4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 00:56:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9522100a1724 - main - arm64: Fix build of gicv5 driver without SMP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9522100a172466913cf6580b250101bfaa483460 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 00:56:51 +0000 Message-Id: <6a3b2b53.3ade4.358261fd@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9522100a172466913cf6580b250101bfaa483460 commit 9522100a172466913cf6580b250101bfaa483460 Author: John Baldwin AuthorDate: 2026-06-24 00:56:41 +0000 Commit: John Baldwin CommitDate: 2026-06-24 00:56:41 +0000 arm64: Fix build of gicv5 driver without SMP Fixes: c84261da6f6c ("arm64: Add an initial GICv5 driver") --- sys/arm64/arm64/gicv5.c | 5 +++++ sys/arm64/arm64/gicv5_fdt.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/sys/arm64/arm64/gicv5.c b/sys/arm64/arm64/gicv5.c index f42e3c97352c..5201248e20f5 100644 --- a/sys/arm64/arm64/gicv5.c +++ b/sys/arm64/arm64/gicv5.c @@ -918,7 +918,12 @@ gicv5_intr(void *arg) KASSERT(LPI_IPI_IDX(irq) < LPI_IPI_LIMIT, ("%s: Invalid IPI LPI %u", __func__, irq)); ipi = LPI_TO_IPI(irq); +#ifdef SMP intr_ipi_dispatch(ipi); +#else + device_printf(sc->gic_dev, + "IPI LPI %u on UP system detected\n", ipi); +#endif gicv5_eoi_intr(GICv5_LPI, irq); } else { intr_child_irq_handler(sc->gic_pic, irq); diff --git a/sys/arm64/arm64/gicv5_fdt.c b/sys/arm64/arm64/gicv5_fdt.c index b8e3fd721206..265cbd833078 100644 --- a/sys/arm64/arm64/gicv5_fdt.c +++ b/sys/arm64/arm64/gicv5_fdt.c @@ -278,7 +278,9 @@ gicv5_fdt_attach(device_t dev) /* Register xref */ OF_device_register_xref(xref, dev); +#ifdef SMP intr_ipi_pic_register(dev, 0); +#endif error = intr_pic_claim_root(dev, xref, gicv5_intr, sc, INTR_ROOT_IRQ); if (error != 0)