From nobody Fri Mar 28 17:58:28 2025 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 4ZPStr4lMvz5rCGX; Fri, 28 Mar 2025 17:58:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZPStr2Fspz3PLB; Fri, 28 Mar 2025 17:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743184708; 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=tUm5vxRohpmd0OH2KXNQi77ljJZrKGfTtuSvKMwKxt4=; b=XY9646Q6+sP4c9iMQS1TynMsvm2aXOugfBgjdfEY+yc3f1G+LOzzGWOtpQ7EuWAQpASALq gJtFVY6hOUNSEaR5K5E01kGMx3RyD0cUXDupOtc/SK5Dv3PrG0icK3LZgFtzCTlYlN4ucK 9k8VsxFBJRf7f1l5UrIkIgKlt6AByqqLrWZTIqQKCQg9WDA3yDovncRnUYI7xk+IRO++z5 20Oe+fiA4e8pqLsgW3sUaiHY6HVEuSpKgPcTNQlEqqoX4wd/0IKFY1AnhHoS7bsaG1mRhS iETcYjZ+dFu0w0HQ8wezQUe0GZLXETsxKTjcy9Ci6pygcnfMALKJk2j6cYG8cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743184708; a=rsa-sha256; cv=none; b=qUOMlnJeYZSimQXesRw+IU6rxR/kBEUvOKuNxdgEImIid36naKp1GqQzISP0oA3uRMkcyD oFCYy2qjw4wn5Vnkd2qVEG+5DuBNGrl6Va66mbFPGWoK3Knbr+8Z4bE3ZWFNr/+e1wjZJt nFKfxXB7cleIQeHRF8BVrnTpRVV7XAuo+6htw47sePBvVoRLPFmF89fKox7Hc7CAdaDwp+ PB2ZEiCVLg395vrO3hGP/1yfWSMLowgd8ovg+Rn5T0d/STW2P2mptkHnBTcQUX1zXS0rW6 efaNsGdXamI4CfJBvyV2nBcvSQLGIL8+2lZ/932WeYVuccJmPuYNzXM2NvTOtA== 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=1743184708; 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=tUm5vxRohpmd0OH2KXNQi77ljJZrKGfTtuSvKMwKxt4=; b=GO3GNGsYjmfG3Z5xWdRwZy/RXeVkYL4KeDROwif5bRXvpcYdMbufSrI315xUbtxo1UWGFw dTIXY4KdVdkml+XIXs6qdrDuU4y/wWlDhrBLpB/stL9xlkzD4Zazev9QK8yfaz7woE6h+1 IjbRWrVXpXKtMuEu8704bTUH0ZG29AmF72PPMPET1q8jL9ejo2yAwHfhMiCU8kDXshW0J9 IAagYGrcpcN1YjezHkAEeYIQsPzl4v/h16OaiamNOE68HxPDksvwg7rn1VnadoJif6DWrE p+GnWfepH+usabARMdeZ/VR2MWBEL0f7ODA20mm63dLsjhbE9X+WaId5rhUfxA== 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 4ZPStr0qxczsXL; Fri, 28 Mar 2025 17:58:28 +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 52SHwS22091495; Fri, 28 Mar 2025 17:58:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52SHwSBY091492; Fri, 28 Mar 2025 17:58:28 GMT (envelope-from git) Date: Fri, 28 Mar 2025 17:58:28 GMT Message-Id: <202503281758.52SHwSBY091492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: a1759dca9674 - main - arm64: Fix off-by-one in its_init_cpu_lpi 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1759dca96748648a6da5f9ebd14e46836eed45e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a1759dca96748648a6da5f9ebd14e46836eed45e commit a1759dca96748648a6da5f9ebd14e46836eed45e Author: Colin Percival AuthorDate: 2025-03-27 20:23:32 +0000 Commit: Colin Percival CommitDate: 2025-03-28 17:58:19 +0000 arm64: Fix off-by-one in its_init_cpu_lpi The low bits of GICR_PROPBASER are defined as The number of bits of LPI INTID supported, minus one, by the LPI Configuration table starting at Physical_Address. but flsl(1 << n) returns n + 1; use ilog2_long instead. PR: 285677 Reported by: Julien Grall Reviewed by: andrew Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49542 --- sys/arm64/arm64/gicv3_its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 77d1936d8c95..546a225abf09 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -801,7 +801,7 @@ its_init_cpu_lpi(device_t dev, struct gicv3_its_softc *sc) /* Make sure changes are observable my the GIC */ dsb(sy); - size = (flsl(LPI_CONFTAB_SIZE | GIC_FIRST_LPI) - 1); + size = ilog2_long(LPI_CONFTAB_SIZE | GIC_FIRST_LPI) - 1; xbaser = vtophys(sc->sc_conf_base) | (GICR_PROPBASER_SHARE_IS << GICR_PROPBASER_SHARE_SHIFT) |