Merge remote-tracking branch 'anton/abiv2' into next (f6869e7f) · Commits · 戴 / test

arch/powerpc/Makefile

+8 −3

Original line number	Diff line number	Diff line
		@@ -113,8 +113,13 @@ else
		endif
		endif

		CFLAGS-$(CONFIG_PPC64) := -mtraceback=no -mcall-aixdesc
		CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1)
		CFLAGS-$(CONFIG_PPC64) := -mtraceback=no
		ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
		CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2,-mcall-aixdesc)
		AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2)
		else
		CFLAGS-$(CONFIG_PPC64) += -mcall-aixdesc
		endif
		CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcmodel=medium,-mminimal-toc)
		CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mno-pointers-to-nested-functions)
		CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 $(MULTIPLEWORD)
		@@ -151,7 +156,7 @@ endif
		CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell)

		KBUILD_CPPFLAGS += -Iarch/$(ARCH)
		KBUILD_AFLAGS += -Iarch/$(ARCH)
		KBUILD_AFLAGS += -Iarch/$(ARCH) $(AFLAGS-y)
		KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
		CPP = $(CC) -E $(KBUILD_CFLAGS)

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ udelay:
		mfspr r4,SPRN_PVR
		srwi r4,r4,16
		cmpwi 0,r4,1 /* 601 ? */
		bne .udelay_not_601
		bne .Ludelay_not_601
		00: li r0,86 /* Instructions / microsecond? */
		mtctr r0
		10: addi r0,r0,0 /* NOP */
		@@ -54,7 +54,7 @@ udelay:
		bne 00b
		blr

		.udelay_not_601:
		.Ludelay_not_601:
		mulli r4,r3,1000 /* nanoseconds */
		/* Change r4 to be the number of ticks using:
		* (nanoseconds + (timebase_period_ns - 1 )) / timebase_period_ns

+36 −4

Original line number	Diff line number	Diff line
		@@ -42,15 +42,47 @@ void __patch_exception(int exc, unsigned long addr);
		} while (0)
		#endif

		#define OP_RT_RA_MASK 0xffff0000UL
		#define LIS_R2 0x3c020000UL
		#define ADDIS_R2_R12 0x3c4c0000UL
		#define ADDI_R2_R2 0x38420000UL

		static inline unsigned long ppc_function_entry(void *func)
		{
		#ifdef CONFIG_PPC64
		#if defined(CONFIG_PPC64)
		#if defined(_CALL_ELF) && _CALL_ELF == 2
		u32 *insn = func;

		/*
		* On PPC64 the function pointer actually points to the function's
		* descriptor. The first entry in the descriptor is the address
		* of the function text.
		* A PPC64 ABIv2 function may have a local and a global entry
		* point. We need to use the local entry point when patching
		* functions, so identify and step over the global entry point
		* sequence.
		*
		* The global entry point sequence is always of the form:
		*
		* addis r2,r12,XXXX
		* addi r2,r2,XXXX
		*
		* A linker optimisation may convert the addis to lis:
		*
		* lis r2,XXXX
		* addi r2,r2,XXXX
		*/
		if ((((*insn & OP_RT_RA_MASK) == ADDIS_R2_R12) \|\|
		((*insn & OP_RT_RA_MASK) == LIS_R2)) &&
		((*(insn+1) & OP_RT_RA_MASK) == ADDI_R2_R2))
		return (unsigned long)(insn + 2);
		else
		return (unsigned long)func;
		#else
		/*
		* On PPC64 ABIv1 the function pointer actually points to the
		* function's descriptor. The first entry in the descriptor is the
		* address of the function text.
		*/
		return ((func_descr_t *)func)->entry;
		#endif
		#else
		return (unsigned long)func;
		#endif

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,9 +2,9 @@
		#define _ASM_POWERPC_CONTEXT_TRACKING_H

		#ifdef CONFIG_CONTEXT_TRACKING
		#define SCHEDULE_USER bl .schedule_user
		#define SCHEDULE_USER bl schedule_user
		#else
		#define SCHEDULE_USER bl .schedule
		#define SCHEDULE_USER bl schedule
		#endif

		#endif

+3 −3

Original line number	Diff line number	Diff line
		@@ -174,10 +174,10 @@ exc_##label##_book3e:
		mtlr r16;
		#define TLB_MISS_STATS_D(name) \
		addi r9,r13,MMSTAT_DSTATS+name; \
		bl .tlb_stat_inc;
		bl tlb_stat_inc;
		#define TLB_MISS_STATS_I(name) \
		addi r9,r13,MMSTAT_ISTATS+name; \
		bl .tlb_stat_inc;
		bl tlb_stat_inc;
		#define TLB_MISS_STATS_X(name) \
		ld r8,PACA_EXTLB+EX_TLB_ESR(r13); \
		cmpdi cr2,r8,-1; \
		@@ -185,7 +185,7 @@ exc_##label##_book3e:
		addi r9,r13,MMSTAT_DSTATS+name; \
		b 62f; \
		61: addi r9,r13,MMSTAT_ISTATS+name; \
		62: bl .tlb_stat_inc;
		62: bl tlb_stat_inc;
		#define TLB_MISS_STATS_SAVE_INFO \
		std r14,EX_TLB_ESR(r12); /* save ESR */
		#define TLB_MISS_STATS_SAVE_INFO_BOLTED \