From nobody Mon Jul 15 12:38:10 2024 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 4WN1vQ3Gvbz5QrZk; Mon, 15 Jul 2024 12:38:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN1vQ1xdNz4HHC; Mon, 15 Jul 2024 12:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047090; 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=t/7pbkG9pBqfkwGWX3oj00elejXb3dsxvEsH2UxSYJc=; b=FScAUCMRpQTQhgPE62JR5jCyVco9pElxzvpIyZKFc3LYAe/rW20dZ1eandr4SwFmovGwtU h7q8qqPDp/SEemAVIgk1TYlWUTXwl3pLp2BUfLYC2L2KHEwnn/GzljP0++aKuHm7UpIL+j kPRHLfWo/adhIrjr3EZ/n5xXxSVYtSjEqBHXOFxLgjqcEz8QTMou64Ky1F/aRmD85gunjh oVptXW+wK9F5lMMhnrLNlXbTSL5uDMX3V2XLl08WOyuunHl3JYiHWcFfq9DMFukxBFRE5O GdWSHlH+yuxEftL9PS7RxmW3z7qMUzS8kdoiHtTbdPDib3+PgtTiVFItppBeHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047090; a=rsa-sha256; cv=none; b=NSMTuDUrCUO9IOdUbeFsB9W8xXswysT6LOLNh1M6ZYkDKAc6SMpaCP/6dA21v4Cdlz2ltA uhnZrwlI+KA/003387EiPTVEDVxImUVNFf78u+RkFGnActAqpg76rTaVuxi4riKDAb7pGz M29tUiiZOhpY2cKuBycBo0s0GI2YcxOD61PAp5P6rGRoHGuM8K6DKXsDsxaDow53fViE7h NBZyN/DuaEszO9Yfhy+PGs0eFa42n7EApp73owRkglFijS0rT5B4XwZylWiXLCwyBcLKl/ 6TUuBY41y2zmAD9yLq4NxUxIbQtIzc6KsWaReWvmU9dAOvjTm5OirVWUqoZiww== 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=1721047090; 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=t/7pbkG9pBqfkwGWX3oj00elejXb3dsxvEsH2UxSYJc=; b=SwILvglUZOxWk5tgc4ZyUZ8/6Ub9PMCmjQ4Wx5gmvsftO5poozxvx7wRU6mJZzXZsCI1py pQVHNcMlDtMeKGRdaxY6zjnSr2SBJXWUmJ/icY+BwKmCv3fcDsTpxuNTcyTvReKXHtWDzB XeqlfK9kLTwFHvGJzB1PaYTgWfbvW7YWAmPfKgXUUFrDIqExKXLhA8ioEhgFj92oC3Ct1D hmAu6QHveuoKJQil1M+9+0lwhaA2Tcmw1ay1I75x6U9orKSPVqC5zJNecWEpwuRMUVwxdK CkVIqcV8XiK8tfXc+R+SK0DPUKzBQOClxDjwaSsXYCz1t9L8Ml6qEMPxX5IFAw== 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 4WN1vQ19pdzscj; Mon, 15 Jul 2024 12:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46FCcAfs059979; Mon, 15 Jul 2024 12:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCcADa059976; Mon, 15 Jul 2024 12:38:10 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:10 GMT Message-Id: <202407151238.46FCcADa059976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 2f54bff74a4b - stable/14 - arm64/gicv3: Check if the hardware supports LPIs 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2f54bff74a4b19108f39fc8791614a0dfa6e6b9c Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2f54bff74a4b19108f39fc8791614a0dfa6e6b9c commit 2f54bff74a4b19108f39fc8791614a0dfa6e6b9c Author: Andrew Turner AuthorDate: 2024-04-23 11:28:23 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:24:40 +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 (cherry picked from commit 4ab0f5ab3fd6dcd7f76c1ed1c9dc0dcd152fb64f) --- 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 4e9080787149..9c77f6842aa4 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -495,6 +495,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 02c063fe57b5..8f3c30d772b6 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -2212,6 +2212,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); } @@ -2281,6 +2284,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); }