All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>, Oliver Upton <oupton@google.com>
Subject: [PATCH][boot-wrapper] aarch64: Enable ECV to allow access to CNTPOFF_EL2
Date: Wed, 11 Aug 2021 10:22:26 +0100	[thread overview]
Message-ID: <20210811092226.2316583-1-maz@kernel.org> (raw)

If the implemnentation supports ID_AA64MMFR0_EL1.ECV==2,
set SCR_EL3.ECVEn to allow EL2 access to CNTPOFF_EL2.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/aarch64/boot.S | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
index 7f208b5..f0aa3cb 100644
--- a/arch/aarch64/boot.S
+++ b/arch/aarch64/boot.S
@@ -54,10 +54,17 @@ ASM_FUNC(_start)
 1:
 	/* Enable FGT if present */
 	mrs	x1, id_aa64mmfr0_el1
-	ubfx	x1, x1, #56, #4
-	cbz	x1, 1f
+	ubfx	x2, x1, #56, #4
+	cbz	x2, 1f
 
 	orr	x0, x0, #(1 << 27)		// FGT enable
+1:
+	/* Enable ECV2 if present (allows CNTPOFF_EL2) */
+	ubfx	x2, x1, #60, #4
+	cmp	x2, #2
+	bne	1f
+
+	orr	x0, x0, #(1 << 28)		// ECV enable
 1:
 	/* Enable MTE if present */
 	mrs	x10, id_aa64pfr1_el1
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

             reply	other threads:[~2021-08-11  9:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-11  9:22 Marc Zyngier [this message]
2021-08-11 13:55 ` [PATCH][boot-wrapper] aarch64: Enable ECV to allow access to CNTPOFF_EL2 Mark Rutland
2021-08-11 14:45   ` Marc Zyngier
2021-08-11 14:49     ` Mark Rutland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210811092226.2316583-1-maz@kernel.org \
    --to=maz@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=oupton@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.