Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4404a9f9 authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

powerpc/pasemi: Move lbz/stbciz to ppc-opcode.h 



move lbz/stbciz to ppc-opcode.h.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9a13a524

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

+7 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ 
#define PPC_INST_NEG			0x7c0000d0

#define PPC_INST_BRANCH			0x48000000

#define PPC_INST_BRANCH_COND		0x40800000

#define PPC_INST_LBZCIX			0x7c0006aa

#define PPC_INST_STBCIX			0x7c0007aa



/* macros to insert fields into opcodes */

#define __PPC_RA(a)	(((a) & 0x1f) << 16)
@@ -219,6 +221,11 @@ 
					__PPC_RS(t) | __PPC_RA(a) | __PPC_RB(b))

#define PPC_SLBFEE_DOT(t, b)	stringify_in_c(.long PPC_INST_SLBFEE | \

					__PPC_RT(t) | __PPC_RB(b))

/* PASemi instructions */

#define LBZCIX(t,a,b)		stringify_in_c(.long PPC_INST_LBZCIX | \

				       __PPC_RT(t) | __PPC_RA(a) | __PPC_RB(b))

#define STBCIX(s,a,b)		stringify_in_c(.long PPC_INST_STBCIX | \

				       __PPC_RS(s) | __PPC_RA(a) | __PPC_RB(b))



/*

 * Define what the VSX XX1 form instructions will look like, then add

arch/powerpc/kernel/misc_64.S

+0 −5
Original line number Diff line number Diff line
@@ -301,11 +301,6 @@ _GLOBAL(real_writeb) 


#ifdef CONFIG_PPC_PASEMI



/* No support in all binutils for these yet, so use defines */

#define LBZCIX(RT,RA,RB)  .long (0x7c0006aa|(RT<<21)|(RA<<16)|(RB << 11))

#define STBCIX(RS,RA,RB)  .long (0x7c0007aa|(RS<<21)|(RA<<16)|(RB << 11))





_GLOBAL(real_205_readb)

	mfmsr	r7

	ori	r0,r7,MSR_DR