mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
powerpc: Replace PPC_INST_NOP by PPC_RAW_NOP()
On the road to removing all PPC_INST_xx defines in asm/ppc-opcodes.h, change PPC_INST_NOP to PPC_RAW_NOP(). Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/ad46c195ca1b8572629ef07ba6bfe247585239a6.1621506159.git.christophe.leroy@csgroup.eu
This commit is contained in:
parent
deefd0ae99
commit
f30becb5e9
5 changed files with 5 additions and 6 deletions
|
@ -261,7 +261,6 @@
|
|||
#define PPC_INST_MFSPR_PVR 0x7c1f42a6
|
||||
#define PPC_INST_MFSPR_PVR_MASK 0xfc1ffffe
|
||||
#define PPC_INST_MTMSRD 0x7c000164
|
||||
#define PPC_INST_NOP 0x60000000
|
||||
#define PPC_INST_POPCNTB 0x7c0000f4
|
||||
#define PPC_INST_POPCNTB_MASK 0xfc0007fe
|
||||
#define PPC_INST_RFEBB 0x4c000124
|
||||
|
@ -476,7 +475,7 @@
|
|||
#define PPC_RAW_ADD_DOT(t, a, b) (PPC_INST_ADD | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b) | 0x1)
|
||||
#define PPC_RAW_ADDC(t, a, b) (0x7c000014 | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b))
|
||||
#define PPC_RAW_ADDC_DOT(t, a, b) (0x7c000014 | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b) | 0x1)
|
||||
#define PPC_RAW_NOP() (PPC_INST_NOP)
|
||||
#define PPC_RAW_NOP() PPC_RAW_ORI(0, 0, 0)
|
||||
#define PPC_RAW_BLR() (0x4e800020)
|
||||
#define PPC_RAW_BLRL() (0x4e800021)
|
||||
#define PPC_RAW_MTLR(r) (0x7c0803a6 | ___PPC_RT(r))
|
||||
|
|
|
@ -45,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(PPC_INST_NOP));
|
||||
patch_instruction(p, ppc_inst(PPC_RAW_NOP()));
|
||||
patch_branch((void *)p + 4, addr + PHYSICAL_START, 0);
|
||||
}
|
||||
|
||||
|
|
|
@ -16,5 +16,5 @@ void arch_jump_label_transform(struct jump_entry *entry,
|
|||
if (type == JUMP_LABEL_JMP)
|
||||
patch_branch(addr, jump_entry_target(entry), 0);
|
||||
else
|
||||
patch_instruction(addr, ppc_inst(PPC_INST_NOP));
|
||||
patch_instruction(addr, ppc_inst(PPC_RAW_NOP()));
|
||||
}
|
||||
|
|
|
@ -85,7 +85,7 @@ notrace void __init machine_init(u64 dt_ptr)
|
|||
/* Enable early debugging if any specified (see udbg.h) */
|
||||
udbg_early_init();
|
||||
|
||||
patch_instruction_site(&patch__memcpy_nocache, ppc_inst(PPC_INST_NOP));
|
||||
patch_instruction_site(&patch__memcpy_nocache, ppc_inst(PPC_RAW_NOP()));
|
||||
|
||||
create_cond_branch(&insn, addr, branch_target(addr), 0x820000);
|
||||
patch_instruction(addr, insn); /* replace b by bne cr0 */
|
||||
|
|
|
@ -922,7 +922,7 @@ static struct compute_test compute_tests[] = {
|
|||
.subtests = {
|
||||
{
|
||||
.descr = "R0 = LONG_MAX",
|
||||
.instr = ppc_inst(PPC_INST_NOP),
|
||||
.instr = ppc_inst(PPC_RAW_NOP()),
|
||||
.regs = {
|
||||
.gpr[0] = LONG_MAX,
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue