diff mbox

[U-Boot,v2,16/20] x86: Add functions to set and clear bits on MSRs

Message ID 1430274322-14383-17-git-send-email-sjg@chromium.org
State Superseded
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass April 29, 2015, 2:25 a.m. UTC 
Since we do these sorts of operations a lot, it is useful to have a simpler
API, similar to clrsetbits_le32().

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 arch/x86/include/asm/msr.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Comments

Bin Meng April 29, 2015, 1:34 p.m. UTC | #1 
Hi Simon,

On Wed, Apr 29, 2015 at 10:25 AM, Simon Glass <sjg@chromium.org> wrote:
> Since we do these sorts of operations a lot, it is useful to have a simpler
> API, similar to clrsetbits_le32().
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
>  arch/x86/include/asm/msr.h | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>
> diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
> index 1955a75..5349519 100644
> --- a/arch/x86/include/asm/msr.h
> +++ b/arch/x86/include/asm/msr.h
> @@ -128,6 +128,25 @@ static inline void wrmsr(unsigned msr, unsigned low, unsigned high)
>  #define wrmsrl(msr, val)                                               \
>         native_write_msr((msr), (u32)((u64)(val)), (u32)((u64)(val) >> 32))
>
> +static inline void msr_clrsetbits_64(unsigned msr, u64 clear, u64 set)
> +{
> +       u64 val;
> +
> +       val = native_read_msr(msr);
> +       val &= ~clear;
> +       val |= set;
> +       wrmsrl(msr, val);
> +}
> +
> +static inline void msr_setbits_64(unsigned msr, u64 set)
> +{
> +       u64 val;
> +
> +       val = native_read_msr(msr);
> +       val |= set;
> +       wrmsrl(msr, val);
> +}
> +
>  /* rdmsr with exception handling */
>  #define rdmsr_safe(msr, p1, p2)                                        \
>  ({                                                             \
> --

For completeness, should we add msr_clrbits_64() as well?

Regards,
Bin
diff mbox

Patch

diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 1955a75..5349519 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -128,6 +128,25 @@  static inline void wrmsr(unsigned msr, unsigned low, unsigned high)
 #define wrmsrl(msr, val)						\
 	native_write_msr((msr), (u32)((u64)(val)), (u32)((u64)(val) >> 32))
 
+static inline void msr_clrsetbits_64(unsigned msr, u64 clear, u64 set)
+{
+	u64 val;
+
+	val = native_read_msr(msr);
+	val &= ~clear;
+	val |= set;
+	wrmsrl(msr, val);
+}
+
+static inline void msr_setbits_64(unsigned msr, u64 set)
+{
+	u64 val;
+
+	val = native_read_msr(msr);
+	val |= set;
+	wrmsrl(msr, val);
+}
+
 /* rdmsr with exception handling */
 #define rdmsr_safe(msr, p1, p2)					\
 ({								\