| Message ID | 1f0ede830ccb33a659119a55cb590820c27004db.1638208156.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v5,1/5] powerpc/inst: Refactor ___get_user_instr() | expand |
On Mon, 29 Nov 2021 18:49:37 +0100, Christophe Leroy wrote: > PPC64 version of ___get_user_instr() can be used for PPC32 as well, > by simply disabling the suffix part with IS_ENABLED(CONFIG_PPC64). > > Applied to powerpc/next. [1/5] powerpc/inst: Refactor ___get_user_instr() https://git.kernel.org/powerpc/c/3261d99adba269a024d0e55737beeedec5eba00e [2/5] powerpc/inst: Define ppc_inst_t https://git.kernel.org/powerpc/c/c545b9f040f341038d5228932140fb17e0c156e2 [3/5] powerpc/inst: Define ppc_inst_t as u32 on PPC32 https://git.kernel.org/powerpc/c/07b863aef5b682a482474b524f3df4957d2862ac [4/5] powerpc/inst: Move ppc_inst_t definition in asm/reg.h https://git.kernel.org/powerpc/c/9b307576f37136d37d5e42b1d8713ec34a601a62 [5/5] powerpc/inst: Optimise copy_inst_from_kernel_nofault() https://git.kernel.org/powerpc/c/0d76914a4c99ab5658f3fb07cdf3799d28e2eab3 cheers
diff --git a/arch/powerpc/include/asm/inst.h b/arch/powerpc/include/asm/inst.h index b11c0e2f9639..10a5c1b76ca0 100644 --- a/arch/powerpc/include/asm/inst.h +++ b/arch/powerpc/include/asm/inst.h @@ -4,8 +4,6 @@ #include <asm/ppc-opcode.h> -#ifdef CONFIG_PPC64 - #define ___get_user_instr(gu_op, dest, ptr) \ ({ \ long __gui_ret; \ @@ -16,7 +14,7 @@ __chk_user_ptr(ptr); \ __gui_ret = gu_op(__prefix, __gui_ptr); \ if (__gui_ret == 0) { \ - if ((__prefix >> 26) == OP_PREFIX) { \ + if (IS_ENABLED(CONFIG_PPC64) && (__prefix >> 26) == OP_PREFIX) { \ __gui_ret = gu_op(__suffix, __gui_ptr + 1); \ __gui_inst = ppc_inst_prefix(__prefix, __suffix); \ } else { \ @@ -27,13 +25,6 @@ } \ __gui_ret; \ }) -#else /* !CONFIG_PPC64 */ -#define ___get_user_instr(gu_op, dest, ptr) \ -({ \ - __chk_user_ptr(ptr); \ - gu_op((dest).val, (u32 __user *)(ptr)); \ -}) -#endif /* CONFIG_PPC64 */ #define get_user_instr(x, ptr) ___get_user_instr(get_user, x, ptr) @@ -71,7 +62,7 @@ static inline u32 ppc_inst_suffix(struct ppc_inst x) } #else -#define ppc_inst_prefix(x, y) ppc_inst(x) +#define ppc_inst_prefix(x, y) ((void)y, ppc_inst(x)) static inline u32 ppc_inst_suffix(struct ppc_inst x) {
PPC64 version of ___get_user_instr() can be used for PPC32 as well, by simply disabling the suffix part with IS_ENABLED(CONFIG_PPC64). Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- v5: Force use of 'y' in ppc_inst_prefix on PPC32 to avoid 'use variable' warning with W=1 --- arch/powerpc/include/asm/inst.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)