From nobody Mon Dec 15 17:00:17 2025 X-Original-To: dev-commits-src-all@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 4dVRBp1TcGz6L1jt for ; Mon, 15 Dec 2025 17:00:18 +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 4dVRBn6Dj4z3pTB for ; Mon, 15 Dec 2025 17:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818017; 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=bejPFYnMT4y04X4nuwBSY4+O8NGaFFm48pJAvm/ery8=; b=EM11b1SkPG3dvCCQts2Dl/a+TyYI+2W84Ch0LfyUiSMcztNfMwJgfmq/Ov5WwYFBJ2af7U d2B6nTllX88BPrYJSRjIMK69Ug9dumEz92f4xCnBajKDX71Ppnot3JCRQUs1tSX2qm2m+s re6HBCyXLmxsw0NaExYanxp9TYsLA7PQ9JK/PJRiJeP4qbAc7uzwaC3kCBQ474hMVh2Q1b FaajDqYZpQReuSXGf3nOAoAbvx/w4AUh+qjfgrRETeTiLPjEvgD7DfF2zD6FyZ1uvcCwcK CtP4Q7mjsfj2XStyzLOPjW4LbzyNAV5OuJt2z6CFBqbdVtBOwwc7pJ0Y+09Dqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818017; 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=bejPFYnMT4y04X4nuwBSY4+O8NGaFFm48pJAvm/ery8=; b=ds2nvFc0VOHvfvrWzvGCwcioyjLWm1HIeotD3jN+Q0A5NwbVXcyqam5E0lHbG99yNiVLzE q3rW8LkzR0M9nD2rc7ba6U3ieuGfF+C9qNCsX1M3rGeEwpdd62+CmQo6kV/MuKrZPbgrjj itDceR/gTVjr6pU8jpPeQevsZLNLaASQv6dLD5pVcPjh0U+2T/BTKD1L9YBlYFNPLZInVJ hdlMKOseaX276W5tX2C/YpRgNIONoea1bx1T8S3r4YitLKBw1WIT1gukODVyCl98PwZqTX CNN6IuFUJfDSpXJKr7fbkJ/PZCS74oVFL/BksjhHJD+kxKSDmm6AEv60PXohtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818017; a=rsa-sha256; cv=none; b=PiGcibAwWI5iV9XpG44MkrQhkZEfMN/pxvo0ReYGRXhz73QomjghnRyqG8OqrLZKI5dA8K brN/I9gf1tYXbAOEzkC6TWL97f+dg64ohwYoON0obHyawaUnTQXahciobzjbjArMC2mLRT 0xmpeP5xdQuHFNHvbjRi3j/kNGJaSYjnfqjUInyta5kCqyvTCX2SKODAori+LTbMMvmLqi VZykYu2CxG5wk24vPZua8kzKB5c523Sj6cJ/yBP9ri2AZrQB2MckEF2KRejTiV9Vn3Vlk2 KdmjSUVhDKlMkkbMAYLMVwMBjSdDTplUyX1jgLJ3VwuRJLYqksZP87S4QXPW+g== 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 4dVRBn5cGgzClH for ; Mon, 15 Dec 2025 17:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e285 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 753dd37ab951 - stable/14 - gic_v3: Correctly handle GICC GIGR Base Address case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 753dd37ab9519f181ca1272aa52aa5c733419f81 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:17 +0000 Message-Id: <69403ea1.e285.6617a70c@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=753dd37ab9519f181ca1272aa52aa5c733419f81 commit 753dd37ab9519f181ca1272aa52aa5c733419f81 Author: Jessica Clarke AuthorDate: 2024-12-09 21:55:06 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 16:58:44 +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 | 2 +- sys/arm64/arm64/gic_v3_acpi.c | 1 + sys/arm64/arm64/gic_v3_var.h | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 9c77f6842aa4..62b5bf5eff05 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -1435,7 +1435,7 @@ gic_v3_redist_find(struct gic_v3_softc *sc) (GICR_VLPI_BASE_SIZE + GICR_RESERVED_SIZE); } } while (offset < rman_get_size(r_res) && - (typer & GICR_TYPER_LAST) == 0); + !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 fca73010759d..3e549bded623 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -301,6 +301,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 1c5d354ee217..8bc0f456d91e 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -53,6 +53,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; };