From nobody Fri May 10 09:30:11 2024 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 4VbNs01JHCz5J2kS; Fri, 10 May 2024 09:30:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VbNrz68P9z4GC2; Fri, 10 May 2024 09:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715333411; 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=nPVOhQjon7iAPjfaAE1j7CpZtBJ2icsQRtB10rMm2rw=; b=kvyyRTvrVEpPsRIZBYcD47O8adCLyXV1dHKnfVM4PU2q/DlpL8qIppUegw4/h23pksfdi4 vUO2jXgZZXqT3pGDtW7vFRmGd5163nx+G1zq9eJzZ1VC7A3YXoD5jbESA3UJiJwaMnWvMK frGiMavYURdtFSUMNM5/qeHqNCBhbo42tVClff75StxWndIQ2lrdmTYraqCzgn7YJpqY8B 0ZtroYnw9cRXeFuOrHdlbN0xhTslreFM9dHGYuJ83HwrAWSDRhaC1N/2AZ6AEgwOyQJBTF goHugdW7X+Mtn7wF5vYPlwysQoHIgTtAx8ivaFIc4NV+tJHHEmRkyvYyDxCITA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715333411; a=rsa-sha256; cv=none; b=NWnaXvw1U9vF/hGtDPn7Cxb23fgtJZ+j83FrRRw0aqXH9KnMKJPrnlBDlyNoovQASFexgT 9SLIQSl1Vl7WEHz86zrG0F8Yb57rDImR3bYEuES2D7i/b/XkyG0V4DsV6nHXEoHQ6yN6D6 4YBIPUnIL3ZTafceS/TWLvvFszDVwuaSeVZl6JQ6vifAMz8uXgDAUp7EDf3PrVmxQ7kIQp gk/+M0Hfo2ZK8Jgf023FkUcslktqlVg6d9Ki+Qu/yi4wCT7+BJiSqPvTLhHj6+PFllISEy MqztqCExIpwGgv3q3zYrgXs/i+5+IKNnnTnh+ZJAELOWNLnK/YY4bXFPVQxwMg== 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=1715333411; 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=nPVOhQjon7iAPjfaAE1j7CpZtBJ2icsQRtB10rMm2rw=; b=hFXcrYKzI0EBXYMTUdszuSigoSr5PH8wtM2njmSPgJKpJ9RICbwZD5gsPEnIKoRl5sU13k 9slODgOYWedZzwRul+VD0vp6N/hQ/mnu+0pFz6fD9D85rnuQ5u3qki0WvKeWkjTHMuBeXj zkrabGRi2N6v1+iASJwqcwi9AKpsh52c0xF3XMFvNEchCxrtZ6sdXUMcIFekm5Z2E7s2WN jteDqR/8ClJ+9M5vKqsPSZ+xWbj6uGbWfIv1QqtQbU0jhhBhtzu15Kc1GumRvZApEMZqNR akTsmOv1I5vpaQIf7K28kGb+BZClzRuSvtIVrd9HypN6R3Tz1/zW/1EDhPFsLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VbNrz5ly8zXqG; Fri, 10 May 2024 09:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44A9UBAP086192; Fri, 10 May 2024 09:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44A9UB6T086187; Fri, 10 May 2024 09:30:11 GMT (envelope-from git) Date: Fri, 10 May 2024 09:30:11 GMT Message-Id: <202405100930.44A9UB6T086187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4ab0f5ab3fd6 - main - arm64/gicv3: Check if the hardware supports LPIs 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ab0f5ab3fd6dcd7f76c1ed1c9dc0dcd152fb64f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4ab0f5ab3fd6dcd7f76c1ed1c9dc0dcd152fb64f commit 4ab0f5ab3fd6dcd7f76c1ed1c9dc0dcd152fb64f Author: Andrew Turner AuthorDate: 2024-04-23 11:28:23 +0000 Commit: Andrew Turner CommitDate: 2024-05-10 09:29:24 +0000 arm64/gicv3: Check if the hardware supports LPIs Some simulators have the ITS in the DTB passed to the kernel, however it is a runtime configuration option to enable it. Check the GICD_TYPER register to see if LPIs are enabled before attaching the ITS driver. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44914 --- sys/arm64/arm64/gic_v3.c | 4 ++++ sys/arm64/arm64/gic_v3_var.h | 2 ++ sys/arm64/arm64/gicv3_its.c | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index b57dd9be48aa..0b25650b3fbf 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -494,6 +494,10 @@ gic_v3_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) case GICV3_IVAR_REDIST: *result = (uintptr_t)&sc->gic_redists.pcpu[PCPU_GET(cpuid)]; return (0); + case GICV3_IVAR_SUPPORT_LPIS: + *result = + (gic_d_read(sc, 4, GICD_TYPER) & GICD_TYPER_LPIS) != 0; + return (0); case GIC_IVAR_HW_REV: KASSERT( GICR_PIDR2_ARCH(sc->gic_pidr2) == GICR_PIDR2_ARCH_GICv3 || diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 81526e7cc15e..1c5d354ee217 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -102,9 +102,11 @@ MALLOC_DECLARE(M_GIC_V3); #define GICV3_IVAR_NIRQS 1000 /* 1001 was GICV3_IVAR_REDIST_VADDR */ #define GICV3_IVAR_REDIST 1002 +#define GICV3_IVAR_SUPPORT_LPIS 1003 __BUS_ACCESSOR(gicv3, nirqs, GICV3, NIRQS, u_int); __BUS_ACCESSOR(gicv3, redist, GICV3, REDIST, void *); +__BUS_ACCESSOR(gicv3, support_lpis, GICV3, SUPPORT_LPIS, bool); /* Device methods */ int gic_v3_attach(device_t dev); diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 31a0ded6c95d..46695a415e86 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -2208,6 +2208,9 @@ gicv3_its_fdt_probe(device_t dev) if (!ofw_bus_is_compatible(dev, "arm,gic-v3-its")) return (ENXIO); + if (!gicv3_get_support_lpis(dev)) + return (ENXIO); + device_set_desc(dev, "ARM GIC Interrupt Translation Service"); return (BUS_PROBE_DEFAULT); } @@ -2277,6 +2280,9 @@ gicv3_its_acpi_probe(device_t dev) if (gic_get_hw_rev(dev) < 3) return (EINVAL); + if (!gicv3_get_support_lpis(dev)) + return (ENXIO); + device_set_desc(dev, "ARM GIC Interrupt Translation Service"); return (BUS_PROBE_DEFAULT); }