tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc/inst: Remove PPC_INST_BRANCH

Convert last users of PPC_INST_BRANCH to PPC_RAW_BRANCH()

And remove PPC_INST_BRANCH.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/fa8807108a2ef2287a2c9651d6e1ff7c051923d9.1652074503.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by
Michael Ellerman 4390a58e 8052d043

+2 -3
+1 -2
arch/powerpc/include/asm/ppc-opcode.h
··· 301 301 #define PPC_INST_ADDIS 0x3c000000 302 302 #define PPC_INST_ADD 0x7c000214 303 303 #define PPC_INST_DIVD 0x7c0003d2 304 - #define PPC_INST_BRANCH 0x48000000 305 304 #define PPC_INST_BL 0x48000001 306 305 #define PPC_INST_BRANCH_COND 0x40800000 307 306 ··· 585 586 #define PPC_RAW_MTSPR(spr, d) (0x7c0003a6 | ___PPC_RS(d) | __PPC_SPR(spr)) 586 587 #define PPC_RAW_EIEIO() (0x7c0006ac) 587 588 588 - #define PPC_RAW_BRANCH(addr) (PPC_INST_BRANCH | ((addr) & 0x03fffffc)) 589 + #define PPC_RAW_BRANCH(offset) (0x48000000 | PPC_LI(offset)) 589 590 #define PPC_RAW_BL(offset) (0x48000001 | PPC_LI(offset)) 590 591 591 592 /* Deal with instructions that older assemblers aren't aware of */
+1 -1
arch/powerpc/lib/feature-fixups.c
··· 451 451 452 452 if (types & L1D_FLUSH_FALLBACK) 453 453 /* b .+16 to fallback flush */ 454 - instrs[0] = PPC_INST_BRANCH | 16; 454 + instrs[0] = PPC_RAW_BRANCH(16); 455 455 456 456 i = 0; 457 457 if (types & L1D_FLUSH_ORI) {