Commit 08e6a343 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/mm/64s: Use PPC_SLBFEE macro 



Old toolchains don't know about slbfee and break the build, eg:
  {standard input}:37: Error: Unrecognized opcode: `slbfee.'

Fix it by using the macro version. We need to add an underscore
version that takes raw register numbers from the inline asm, rather
than our Rx macros.

Fixes: e15a4fea ("powerpc/64s/hash: Add some SLB debugging tests")
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 0ae79068

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -493,6 +493,8 @@ 
					__PPC_RS(t) | __PPC_RA0(a) | __PPC_RB(b))

					__PPC_RS(t) | __PPC_RA0(a) | __PPC_RB(b))

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

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

					__PPC_RT(t) | __PPC_RB(b))

					__PPC_RT(t) | __PPC_RB(b))

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

					       ___PPC_RT(t) | ___PPC_RB(b))

#define PPC_ICBT(c,a,b)		stringify_in_c(.long PPC_INST_ICBT | \

#define PPC_ICBT(c,a,b)		stringify_in_c(.long PPC_INST_ICBT | \

				       __PPC_CT(c) | __PPC_RA0(a) | __PPC_RB(b))

				       __PPC_CT(c) | __PPC_RA0(a) | __PPC_RB(b))

/* PASemi instructions */

/* PASemi instructions */

arch/powerpc/mm/slb.c

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

#include <asm/mmu.h>

#include <asm/mmu_context.h>

#include <asm/mmu_context.h>

#include <asm/paca.h>

#include <asm/paca.h>

#include <asm/ppc-opcode.h>

#include <asm/cputable.h>

#include <asm/cputable.h>

#include <asm/cacheflush.h>

#include <asm/cacheflush.h>

#include <asm/smp.h>

#include <asm/smp.h>
@@ -65,7 +66,7 @@ static void assert_slb_presence(bool present, unsigned long ea) 




	WARN_ON_ONCE(mfmsr() & MSR_EE);

	WARN_ON_ONCE(mfmsr() & MSR_EE);





	asm volatile("slbfee. %0, %1" : "=r"(tmp) : "r"(ea) : "cr0");

	asm volatile(__PPC_SLBFEE_DOT(%0, %1) : "=r"(tmp) : "r"(ea) : "cr0");





	WARN_ON(present == (tmp == 0));

	WARN_ON(present == (tmp == 0));

#endif

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE