From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com,
dave.martin@arm.com, james.morse@arm.com,
linux@dominikbrodowski.net, linux-fsdevel@vger.kernel.org,
marc.zyngier@arm.com, mark.rutland@arm.com,
viro@zeniv.linux.org.uk, will.deacon@arm.com
Subject: [PATCH 03/18] arm64: introduce sysreg_clear_set()
Date: Mon, 14 May 2018 10:46:25 +0100 [thread overview]
Message-ID: <20180514094640.27569-4-mark.rutland@arm.com> (raw)
In-Reply-To: <20180514094640.27569-1-mark.rutland@arm.com>
Currently we have a couple of helpers to manipulate bits in particular
sysregs:
* config_sctlr_el1(u32 clear, u32 set)
* change_cpacr(u64 val, u64 mask)
The parameters of these differ in naming convention, order, and size,
which is unfortunate. They also differ slightly in behaviour, as
change_cpacr() skips the sysreg write if the bits are unchanged, which
is a useful optimization when sysreg writes are expensive.
Before we gain more yet another sysreg manipulation function, let's
unify these with a common helper, providing a consistent order for
clear/set operands, and the write skipping behaviour from
change_cpacr(). Code will be migrated to the new helper in subsequent
patches.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Martin <dave.martin@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm64/include/asm/sysreg.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index bd1d1194a5e7..b52762769329 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -729,6 +729,17 @@ asm(
asm volatile("msr_s " __stringify(r) ", %x0" : : "rZ" (__val)); \
} while (0)
+/*
+ * Modify bits in a sysreg. Bits in the clear mask are zeroed, then bits in the
+ * set mask are set. Other bits are left as-is.
+ */
+#define sysreg_clear_set(sysreg, clear, set) do { \
+ u64 __scs_val = read_sysreg(sysreg); \
+ u64 __scs_new = (__scs_val & ~(u64)(clear)) | (set); \
+ if (__scs_new != __scs_val) \
+ write_sysreg(__scs_new, sysreg); \
+} while (0)
+
static inline void config_sctlr_el1(u32 clear, u32 set)
{
u32 val;
--
2.11.0
next prev parent reply other threads:[~2018-05-14 9:47 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 9:46 [PATCH 00/18] arm64: invoke syscalls with pt_regs Mark Rutland
2018-05-14 9:46 ` [PATCH 01/18] arm64: consistently use unsigned long for thread flags Mark Rutland
2018-05-14 9:57 ` Dave Martin
2018-05-14 9:46 ` [PATCH 02/18] arm64: move SCTLR_EL{1,2} assertions to <asm/sysreg.h> Mark Rutland
2018-05-14 10:00 ` Dave Martin
2018-05-14 10:08 ` Mark Rutland
2018-05-14 11:20 ` Dave Martin
2018-05-14 11:56 ` Robin Murphy
2018-05-14 12:06 ` Mark Rutland
2018-05-14 12:41 ` Dave Martin
2018-05-14 13:10 ` Mark Rutland
2018-05-14 9:46 ` Mark Rutland [this message]
2018-05-14 10:04 ` [PATCH 03/18] arm64: introduce sysreg_clear_set() Dave Martin
2018-05-14 9:46 ` [PATCH 04/18] arm64: kill config_sctlr_el1() Mark Rutland
2018-05-14 10:05 ` Dave Martin
2018-05-14 9:46 ` [PATCH 05/18] arm64: kill change_cpacr() Mark Rutland
2018-05-14 10:06 ` Dave Martin
2018-05-14 9:46 ` [PATCH 06/18] arm64: move sve_user_{enable,disable} to <asm/fpsimd.h> Mark Rutland
2018-05-14 11:06 ` [PATCH 06/18] arm64: move sve_user_{enable, disable} " Dave Martin
2018-05-15 10:39 ` Mark Rutland
2018-05-15 12:19 ` Dave Martin
2018-05-15 16:33 ` Mark Rutland
2018-05-16 9:01 ` Dave Martin
2018-06-01 10:29 ` Mark Rutland
2018-06-01 10:42 ` Dave Martin
2018-05-14 9:46 ` [PATCH 07/18] arm64: remove sigreturn wrappers Mark Rutland
2018-05-14 11:07 ` Dave Martin
2018-05-14 9:46 ` [PATCH 08/18] arm64: convert raw syscall invocation to C Mark Rutland
2018-05-14 11:07 ` Dave Martin
2018-05-14 11:41 ` Mark Rutland
2018-05-14 12:53 ` Dave Martin
2018-05-14 20:24 ` Dominik Brodowski
2018-05-15 8:22 ` Mark Rutland
2018-05-15 10:01 ` Dominik Brodowski
2018-05-15 10:13 ` Mark Rutland
2018-05-14 18:00 ` Dominik Brodowski
2018-05-15 8:18 ` Mark Rutland
2018-05-14 9:46 ` [PATCH 09/18] arm64: convert syscall trace logic " Mark Rutland
2018-05-14 9:46 ` [PATCH 10/18] arm64: convert native/compat syscall entry " Mark Rutland
2018-05-14 11:07 ` Dave Martin
2018-05-14 11:58 ` Mark Rutland
2018-05-14 14:43 ` Dave Martin
2018-05-14 15:01 ` Mark Rutland
2018-05-14 9:46 ` [PATCH 11/18] arm64: zero GPRs upon entry from EL0 Mark Rutland
2018-05-14 11:07 ` Dave Martin
2018-05-14 9:46 ` [PATCH 12/18] kernel: add ksys_personality() Mark Rutland
2018-05-14 11:08 ` Dave Martin
2018-05-14 12:07 ` Christoph Hellwig
2018-05-15 9:56 ` Mark Rutland
2018-05-14 9:46 ` [PATCH 13/18] kernel: add kcompat_sys_{f,}statfs64() Mark Rutland
2018-05-14 17:14 ` Mark Rutland
2018-05-14 20:34 ` Dominik Brodowski
2018-05-15 9:53 ` Mark Rutland
2018-05-15 9:58 ` Dominik Brodowski
2018-05-14 9:46 ` [PATCH 14/18] arm64: remove in-kernel call to sys_personality() Mark Rutland
2018-05-14 9:46 ` [PATCH 15/18] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn Mark Rutland
2018-05-14 9:46 ` [PATCH 16/18] arm64: use SYSCALL_DEFINE6() for mmap Mark Rutland
2018-05-14 9:46 ` [PATCH 17/18] arm64: convert compat wrappers to C Mark Rutland
2018-05-14 12:10 ` Christoph Hellwig
2018-05-14 12:43 ` Mark Rutland
2018-05-14 9:46 ` [PATCH 18/18] arm64: implement syscall wrappers Mark Rutland
2018-05-14 20:57 ` Dominik Brodowski
2018-05-15 8:37 ` 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=20180514094640.27569-4-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=dave.martin@arm.com \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=marc.zyngier@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=will.deacon@arm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).