From nobody Mon Jul 15 12:38:01 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 4WN1vG0Nwvz5QrJr; Mon, 15 Jul 2024 12:38:02 +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 4WN1vF3kJXz4Gwt; Mon, 15 Jul 2024 12:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047081; 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=n3qOs1Ze677vETHo7tmAQFogbhYvrtxg90cUSQ9ZyPo=; b=OxU/x2fttZ92N57XbAV3yhaLqufVDjBCN2y4Ls8rgn8I8J+QF9OX53Lwwr/GvSpK0LA+sR z1ZzpBj/gy0xgW1Wmmy0x4AV7yR9xXI1Cqt5E6eN69yjPvg5MI3DP5DZRt92AveRj6tsh3 Mt0Vtc13HmVmRVbG73wJT0J2sjgOMRC6iyu2IJaO4EJ8/3v+jVmAfMNBX8FLokOcazvNzi OKWiktmXvTD4RPSIJrSGzaSfLHmQU6dfY5b6NQIPQhG9I5zw7Gqq8phxkl+Pxs5zmtHia7 +jRL5ovl73d/IMikjipUffuypUyVifiHyKPXfPMEiAqpPnHv7hWhiyVuYyz3Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047081; a=rsa-sha256; cv=none; b=dOGVIJHpuSxUhBHMmcF2NlOyXM5JCjReJOiptbYHOBef+GpJsEKht90qTUW0nqBq49UA20 oyKg9pyyk8aS6zqoV8zEq16rYpf973vWxXk0ylT1KNZL082/LMWXpQOZUpmNp5I0Mj0XVP Hu9kblkOTL2RUkspVE5bm8Cop6eAWQ5x2SYMFgdJLcs//ttQr+EjtNtsfC7qfTXxeT02D7 NI4zJJOYPXAGQGn+xswiYXdNI6VkQln9a7QtmVUuWMzHJrwUF4TobOUM2sR78RgCcG53EH DpQWPfOpDsBfdGsZTLHsPKLDKHfQ/E8d0wBZMwBlFMhBMl76NYtHmnkEvCUTUQ== 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=1721047081; 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=n3qOs1Ze677vETHo7tmAQFogbhYvrtxg90cUSQ9ZyPo=; b=Bb1OVVoCKpOC9vpxAGcSBqfuoWrmhqssuNpsQgFt9Fb/bTvViR8D8PlagiaQNJEtlCYeta 29OCAQWBbqo/IL8DSl6GDS6EFXVQfVy61pp3VIycpN41OiLKFRTO4NKkjrGY8QWekvjA+y sW1S7jM7A7v/bItDHaay/hIBVWmXK1TyYk2mmv4bAieCEpNG5zk/TohFDFK3cNmnFVDJOX Ot9h3fywOTlyGzXn9T3k8OH0X30UbkjnPUfGTZHIatyFWZplR4VDGNShoibvMpew3V52ZO 6E3+b5t3pYJAcmQJxC77INBeeliwW7OcXmXCE4s+ZuevvpHS4goxPWrSGqk7AQ== 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 4WN1vF33Jrzsrn; Mon, 15 Jul 2024 12:38:01 +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 46FCc1Ot059237; Mon, 15 Jul 2024 12:38:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCc1KM059234; Mon, 15 Jul 2024 12:38:01 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:01 GMT Message-Id: <202407151238.46FCc1KM059234@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: 1eb9c65b124b - stable/13 - arm64: Add ISS_MSR_REG for ESR_ELx.ISS values 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/13 X-Git-Reftype: branch X-Git-Commit: 1eb9c65b124b12cf9d290716d481a7c155ad7a69 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1eb9c65b124b12cf9d290716d481a7c155ad7a69 commit 1eb9c65b124b12cf9d290716d481a7c155ad7a69 Author: Andrew Turner AuthorDate: 2024-02-21 18:10:19 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:34:28 +0000 arm64: Add ISS_MSR_REG for ESR_ELx.ISS values Add a macro to get the ESR_ELx ISS value when we trap accessing a special register. (cherry picked from commit 09ac9cf8971a0709bb8d5a3a703cd3dbff882b6f) --- sys/arm64/include/armreg.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 674d8fc6b68f..ffe19a5cc0ef 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -368,6 +368,12 @@ #define ISS_MSR_REG_MASK \ (ISS_MSR_OP0_MASK | ISS_MSR_OP2_MASK | ISS_MSR_OP1_MASK | \ ISS_MSR_CRn_MASK | ISS_MSR_CRm_MASK) +#define ISS_MSR_REG(reg) \ + (((reg ## _op0) << ISS_MSR_OP0_SHIFT) | \ + ((reg ## _op1) << ISS_MSR_OP1_SHIFT) | \ + ((reg ## _CRn) << ISS_MSR_CRn_SHIFT) | \ + ((reg ## _CRm) << ISS_MSR_CRm_SHIFT) | \ + ((reg ## _op2) << ISS_MSR_OP2_SHIFT)) #define ISS_DATA_ISV_SHIFT 24 #define ISS_DATA_ISV (0x01 << ISS_DATA_ISV_SHIFT)