Commit 4390a58e authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

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: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/fa8807108a2ef2287a2c9651d6e1ff7c051923d9.1652074503.git.christophe.leroy@csgroup.eu
parent 8052d043

arch/powerpc/include/asm/ppc-opcode.h

+1 −2
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ 
#define PPC_INST_ADDIS			0x3c000000

#define PPC_INST_ADD			0x7c000214

#define PPC_INST_DIVD			0x7c0003d2

#define PPC_INST_BRANCH			0x48000000

#define PPC_INST_BL			0x48000001

#define PPC_INST_BRANCH_COND		0x40800000
@@ -586,7 +585,7 @@ 
#define PPC_RAW_MTSPR(spr, d)		(0x7c0003a6 | ___PPC_RS(d) | __PPC_SPR(spr))

#define PPC_RAW_EIEIO()			(0x7c0006ac)



#define PPC_RAW_BRANCH(addr)		(PPC_INST_BRANCH | ((addr) & 0x03fffffc))

#define PPC_RAW_BRANCH(offset)		(0x48000000 | PPC_LI(offset))

#define PPC_RAW_BL(offset)		(0x48000001 | PPC_LI(offset))



/* Deal with instructions that older assemblers aren't aware of */

arch/powerpc/lib/feature-fixups.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int __do_rfi_flush_fixups(void *data) 


	if (types & L1D_FLUSH_FALLBACK)

		/* b .+16 to fallback flush */

		instrs[0] = PPC_INST_BRANCH | 16;

		instrs[0] = PPC_RAW_BRANCH(16);



	i = 0;

	if (types & L1D_FLUSH_ORI) {