From nobody Mon Sep 02 08:50:45 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 4Wy2XQ0Hxpz5Mnqp; Mon, 02 Sep 2024 08:50:46 +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 4Wy2XP6CWgz42GQ; Mon, 2 Sep 2024 08:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725267045; 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=L19UTrLolykX/oC8EaP7So2K1coaVyD+GA2CBYUhPGc=; b=GVvjW+LnRZHd8uTJJp5NyyuNUNydBfg4S2CNIk4x87GKlpcQ36LI4nTPziVFrcyt9Ne6t6 lkDwk/bn6HOuZdu4R/B7tr6UlIKnqVGZgAYLJ/tAjS3yZy8MV7zS2OiWAsYG7Xq7Z1jItp 7hwuOArdqz6uZWKYgrgiuzQSbl1nZuOrxUiuVdvkcSJ7nv1qBQrjV+xfK3xu8xxFDMPLCu sG4zjYtgJ+TrgTHu1LqM/j9wkjha0F4Clov9Sn/CkT6Ll8JRp/YHAZRCo3pakgRhIZZRNn B6RrwQO2CLJVch571JVGOP55TLKnrz9EHW8Lt84CAhiUaNkSpKJz+ZKKVc2avw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725267045; a=rsa-sha256; cv=none; b=q9z038jGZ/nWgUvhuhGA3wHx4fts/+O7hpqh7pi2H90yhtS7yrLMzG4IaubnIdzpJCcucL WQ+jcqrKvR1q/ggDRaqUz/aP/tLxZaCH3j6JrzFxeW9Nq41tOGeVMg1Opwrgumfr/JAkxM UkI2iu3ICathjIER2imE+q6246YMl39ywTA42T0Y3XgZHeXiuEf8/ampRt7VBkSv+o6OfU mgM8NiwFTzNDxlh5vkbDGDRnDaCDo49hfX7oyLlpnwAdjvHkS8K9Q3PpD24Vhi02hNya/r E336tfCnVZ51jbTdy5Xw69OBW2WEFBtAlsbcteF3aA4+VUsLsWMn1NaB7jFFwg== 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=1725267045; 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=L19UTrLolykX/oC8EaP7So2K1coaVyD+GA2CBYUhPGc=; b=S+O/dBQ7CmKLFbG019MNcJ0AP+/TZvoxZBV0zJb3+uuQv40/XdIrLAZieCkbEfKT0cusI0 9HgpeEZvmwEmcRFvzuHXMUF3H8yYf7oGNZ9+0JP8ITfpV2lsBe3Vcmdd1ZdFmuN7MdRE9w 4j/3YyA0YD8kGDCEmsKlRZElngQ1cHao/wID0JhGbz7lTsXkNFbHSJQqz1qUXLx72Ptwgc bv0l6/zd9Fsm+uURN6wUsu40HspyyHs1ANC9pyg7E3vPiylkfcFM90G9W1Nt4UKfHbDwKx +ITvWb+5piqSyefA4xe3p5sGyvloAW1D/iye6q4l6x4rqLH6op4n+AabX5R7lA== 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 4Wy2XP5qctz15Ny; Mon, 2 Sep 2024 08:50:45 +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 4828ojVF007248; Mon, 2 Sep 2024 08:50:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4828oj71007245; Mon, 2 Sep 2024 08:50:45 GMT (envelope-from git) Date: Mon, 2 Sep 2024 08:50:45 GMT Message-Id: <202409020850.4828oj71007245@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: 94865825c014 - stable/14 - arm64: Fix the gicv3 check in locore.S 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 94865825c014dfaab300ea785b8cb7013d23187c Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=94865825c014dfaab300ea785b8cb7013d23187c commit 94865825c014dfaab300ea785b8cb7013d23187c Author: Andrew Turner AuthorDate: 2024-07-23 09:18:08 +0000 Commit: Andrew Turner CommitDate: 2024-09-02 08:48:32 +0000 arm64: Fix the gicv3 check in locore.S In locore.S we need to configure access to the GICv3. To check if it's available we read the id_aa64pfr0_el1 register, however we then only check if a GICv3.0 or 4.0 is present. If the system has a GICv4.1 this check would fail. Move to checking if the GICV3+ is not absent so this will still work if the field is updated again. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45530 (cherry picked from commit 57ef7935eb114e98e7e554c5ffbded68fd038c04) --- sys/arm64/arm64/locore.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index e637749b1321..debfb90e74e2 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -341,9 +341,8 @@ LENTRY(enter_kernel_el) mrs x2, id_aa64pfr0_el1 /* Extract GIC bits from the register */ ubfx x2, x2, #ID_AA64PFR0_GIC_SHIFT, #ID_AA64PFR0_GIC_BITS - /* GIC[3:0] == 0001 - GIC CPU interface via special regs. supported */ - cmp x2, #(ID_AA64PFR0_GIC_CPUIF_EN >> ID_AA64PFR0_GIC_SHIFT) - b.ne 2f + /* GIC[3:0] != 0000 - GIC CPU interface via special regs. supported */ + cbz x2, 2f mrs x2, icc_sre_el2 orr x2, x2, #ICC_SRE_EL2_EN /* Enable access from insecure EL1 */