Commit 75346251 authored by Jordan Niethe's avatar Jordan Niethe Committed by Michael Ellerman
Browse files

powerpc: Use a macro for creating instructions from u32s 



In preparation for instructions having a more complex data type start
using a macro, ppc_inst(), for making an instruction out of a u32.  A
macro is used so that instructions can be used as initializer elements.
Currently this does nothing, but it will allow for creating a data type
that can represent prefixed instructions.

Signed-off-by: default avatarJordan Niethe <jniethe5@gmail.com>
[mpe: Change include guard to _ASM_POWERPC_INST_H]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Reviewed-by: default avatarAlistair Popple <alistair@popple.id.au>
Link: https://lore.kernel.org/r/20200506034050.24806-7-jniethe5@gmail.com
parent 7c95d889

arch/powerpc/include/asm/code-patching.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/string.h>

#include <linux/kallsyms.h>

#include <asm/asm-compat.h>

#include <asm/inst.h>



/* Flags for create_branch:

 * "b"   == create_branch(addr, target, 0);
@@ -48,7 +49,7 @@ static inline int patch_branch_site(s32 *site, unsigned long target, int flags) 
static inline int modify_instruction(unsigned int *addr, unsigned int clr,

				     unsigned int set)

{

	return patch_instruction(addr, (*addr & ~clr) | set);

	return patch_instruction(addr, ppc_inst((*addr & ~clr) | set));

}



static inline int modify_instruction_site(s32 *site, unsigned int clr, unsigned int set)

arch/powerpc/include/asm/inst.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

#ifndef _ASM_POWERPC_INST_H

#define _ASM_POWERPC_INST_H



/*

 * Instruction data type for POWER

 */



#define ppc_inst(x) (x)



#endif /* _ASM_POWERPC_INST_H */

arch/powerpc/kernel/align.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/disassemble.h>

#include <asm/cpu_has_feature.h>

#include <asm/sstep.h>

#include <asm/inst.h>



struct aligninfo {

	unsigned char len;

arch/powerpc/kernel/crash_dump.c

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/firmware.h>

#include <linux/uaccess.h>

#include <asm/rtas.h>

#include <asm/inst.h>



#ifdef DEBUG

#include <asm/udbg.h>
@@ -44,7 +45,7 @@ static void __init create_trampoline(unsigned long addr) 
	 * branch to "addr" we jump to ("addr" + 32 MB). Although it requires

	 * two instructions it doesn't require any registers.

	 */

	patch_instruction(p, PPC_INST_NOP);

	patch_instruction(p, ppc_inst(PPC_INST_NOP));

	patch_branch(++p, addr + PHYSICAL_START, 0);

}

arch/powerpc/kernel/epapr_paravirt.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <asm/cacheflush.h>

#include <asm/code-patching.h>

#include <asm/machdep.h>

#include <asm/inst.h>



#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)

extern void epapr_ev_idle(void);
@@ -36,7 +37,7 @@ static int __init early_init_dt_scan_epapr(unsigned long node, 
		return -1;



	for (i = 0; i < (len / 4); i++) {

		u32 inst = be32_to_cpu(insts[i]);

		u32 inst = ppc_inst(be32_to_cpu(insts[i]));

		patch_instruction(epapr_hypercall_start + i, inst);

#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)

		patch_instruction(epapr_ev_idle_start + i, inst);