The following commit has been merged into the x86/merge branch of tip:

Commit-ID:     bdfda83a6b5988f1ac62cd0eaceb6c3b44dc2a31
Gitweb:        https://git.kernel.org/tip/bdfda83a6b5988f1ac62cd0eaceb6c3b44dc2a31
Author:        Ingo Molnar <mingo@kernel.org>
AuthorDate:    Fri, 02 May 2025 10:13:53 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 02 May 2025 10:18:19 +02:00

x86/msr: Move the EAX_EDX_*() methods from <asm/msr.h> to <asm/asm.h>

We are going to use them from multiple headers, and in any case,
such register access wrapper macros are better in <asm/asm.h>
anyway.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Uros Bizjak <ubizjak@gmail.com>
Cc: linux-kernel@vger.kernel.org
---
 arch/x86/include/asm/asm.h | 19 +++++++++++++++++++
 arch/x86/include/asm/msr.h | 19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index cc28815..206e134 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -243,5 +243,24 @@ register unsigned long current_stack_pointer asm(_ASM_SP);
 #define _ASM_EXTABLE_FAULT(from, to)				\
 	_ASM_EXTABLE_TYPE(from, to, EX_TYPE_FAULT)
 
+/*
+ * Both i386 and x86_64 returns 64-bit values in edx:eax for certain
+ * instructions, but GCC's "A" constraint has different meanings.
+ * For i386, "A" means exactly edx:eax, while for x86_64 it
+ * means rax *or* rdx.
+ *
+ * These helpers wrapping these semantic differences save one instruction
+ * clearing the high half of 'low':
+ */
+#ifdef CONFIG_X86_64
+# define EAX_EDX_DECLARE_ARGS(val, low, high)	unsigned long low, high
+# define EAX_EDX_VAL(val, low, high)		((low) | (high) << 32)
+# define EAX_EDX_RET(val, low, high)		"=a" (low), "=d" (high)
+#else
+# define EAX_EDX_DECLARE_ARGS(val, low, high)	u64 val
+# define EAX_EDX_VAL(val, low, high)		(val)
+# define EAX_EDX_RET(val, low, high)		"=A" (val)
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* _ASM_X86_ASM_H */
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index d57a94c..856d660 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -37,25 +37,6 @@ struct saved_msrs {
 };
 
 /*
- * Both i386 and x86_64 returns 64-bit values in edx:eax for certain
- * instructions, but GCC's "A" constraint has different meanings.
- * For i386, "A" means exactly edx:eax, while for x86_64 it
- * means rax *or* rdx.
- *
- * These helpers wrapping these semantic differences save one instruction
- * clearing the high half of 'low':
- */
-#ifdef CONFIG_X86_64
-# define EAX_EDX_DECLARE_ARGS(val, low, high)	unsigned long low, high
-# define EAX_EDX_VAL(val, low, high)		((low) | (high) << 32)
-# define EAX_EDX_RET(val, low, high)		"=a" (low), "=d" (high)
-#else
-# define EAX_EDX_DECLARE_ARGS(val, low, high)	u64 val
-# define EAX_EDX_VAL(val, low, high)		(val)
-# define EAX_EDX_RET(val, low, high)		"=A" (val)
-#endif
-
-/*
  * Be very careful with includes. This header is prone to include loops.
  */
 #include <asm/atomic.h>