From nobody Mon Dec 15 18:18:44 2025 X-Original-To: dev-commits-src-branches@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 4dVSxK26b3z6L7TW for ; Mon, 15 Dec 2025 18:18:45 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVSxK0HgDz4LMG for ; Mon, 15 Dec 2025 18:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822725; 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=5lTLoGMadqSKdBbKVf7VM1I0q2jkiHI6tPjIc1RxlRs=; b=lPw6VS0HTeL8xoBo+DbJVFzK3BVx9j57Jy8LNvn0eGZTXEzkErwDHrXFc2XCgrlRaoYoVH gThbkc9rJBpHUMYR3IiHdGY3UIIfMeYVNk6Rko1qOI/ouRZon3FCg7dP8mHGUlPX225hKj DDPm4l1SithUAwW1pJ8if2yDvEE+LxXj4m0YJrK6QetEhyJGvnC84kxVZiDdrOOxoyXLGb /eKVVRtUYHIz4CXbO62ys+iWp52Mw+4tOMleQzt+Fd20MNhi3VVEuJRGeSGqSUlNuAXJV5 OncW1KLF4IeJmHo2Qt7rAOd3czt3KNoWOuBUhLCAufPdUV74XGR3n/ySGQ3ExA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822725; 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=5lTLoGMadqSKdBbKVf7VM1I0q2jkiHI6tPjIc1RxlRs=; b=ub6j+3ShohTVZerg8kGULTpFnAXGNXglSxdAy7YQnS0/BIzRBBb2BaT+Al4Xw8PlXLYqcR XxbYYvRbUd9L0hdkklRcXHqy3xpPQHZ1YLkDP+492Tv5jETbwlR3xeAAQ7VcqX9H1Z4CxY fedhFiHClR5SJ2VxARcW0fvCtRDjCsn92t6yl1X1wRtgqDmVDrZBuANJ7Ig563WFIMRX/q wbbicTiCnNCFemWE33yg0ZqS5msi4bh0k4GFeW94wKW21l91xKp5si7lEjpPQ0uelymN2J mmELH6z8LJ5KeWl/WL2v99N6iBba4PxgjkQLOYBnzKPQgW9gfqPyySsj+C2jJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822725; a=rsa-sha256; cv=none; b=bIOJIncIom791pmqKZjkWGEN5UIiZfddKxo06v1EiJAd3x0k5VeW5fVV2mKw7LViij4LJx UoJ1O9cR8/MaP1K+/6rveGC1MDkZODbihrVOVoYZMbPln9SwbB7pN9uQLZU2xrU4nd9dm3 6Fb4cZ2P8IZoQF1GD4DiSJvJOh4xUswm7kuFuqj0P1PdZjNt5vd2G5Soe8dne+hMrg5t/V Nq5uvFv0jOkcUludf1XczFWbFOzCVCG7yUvxFqTXr+kUB3IMp+BTudCHtQtE3cHkIjryws oR6tiXgrNJOEDDBlr6r6AEbv7BIlyef2kMVIdvlySEdsxkF8FwqZd0LU3raC1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVSxJ6y4jzVhT for ; Mon, 15 Dec 2025 18:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 257f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:18:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: d00f1d6858a0 - stable/13 - gic_v3: Correctly handle GICC GIGR Base Address case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d00f1d6858a0caca5c52f819da8381a6be11e3a9 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:18:44 +0000 Message-Id: <69405104.257f9.7de14132@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d00f1d6858a0caca5c52f819da8381a6be11e3a9 commit d00f1d6858a0caca5c52f819da8381a6be11e3a9 Author: Jessica Clarke AuthorDate: 2024-12-09 21:55:06 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:36 +0000 gic_v3: Correctly handle GICC GIGR Base Address case When using the GICR Base Address field from each GICC structure instead of GICR structures, the field gives the address of a single redistributor page. However, that does not mean that they are not contiguous, and so GICR_TYPER.Last could be clear on them. Thus we must ignore GICR_TYPER.Last in this case and always treat each region as having a single page. Normally we'd do that as a result of checking against the rman's size (though that's a rather roundabout and iffy way of achieving it), but for whatever reason this is bigger on the Qualcomm Snapdragon X Elite (I assume the MADT reports GICv4 but TYPER doesn't report VLPIS and so there is a mismatch between the rman size and the stride used) and we end up walking off the region's mapping. Reviewed by: andrew, phk MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47560 (cherry picked from commit f8c90b704189c94275d22d7cc204d1d74e821d86) --- sys/arm64/arm64/gic_v3.c | 3 ++- sys/arm64/arm64/gic_v3_acpi.c | 1 + sys/arm64/arm64/gic_v3_var.h | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index c90edc3ba14c..5e77d2670217 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -1315,7 +1315,8 @@ gic_v3_redist_find(struct gic_v3_softc *sc) } rman_set_bushandle(&r_res, r_bsh); - } while ((typer & GICR_TYPER_LAST) == 0); + } while (!sc->gic_redists.single && + (typer & GICR_TYPER_LAST) == 0); } device_printf(sc->dev, "No Re-Distributor found for CPU%u\n", cpuid); diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index 45e5578ee647..287c8c2d99eb 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -290,6 +290,7 @@ gic_v3_acpi_count_regions(device_t dev) acpi_walk_subtables(madt + 1, (char *)madt + madt->Header.Length, madt_count_gicc_redistrib, sc); + sc->gic_redists.single = true; } acpi_unmap_table(madt); diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 1a4112a4b0ea..c5ca77a46811 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -52,6 +52,12 @@ struct gic_redists { struct resource ** regions; /* Number of Re-Distributor regions */ u_int nregions; + /* + * Whether to treat each region as a single Re-Distributor page or a + * series of contiguous pages (i.e. from each ACPI MADT GICC's GICR + * Base Address field) + */ + bool single; /* Per-CPU Re-Distributor data */ struct redist_pcpu *pcpu[MAXCPU]; };