powerpc: Drop SYNC_601() ISYNC_601() and SYNC() (d2a5cd83) · Commits · 戴 / test

arch/powerpc/include/asm/ppc_asm.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -382,10 +382,6 @@ n:
		#endif

		/* various errata or part fixups */
		#define SYNC
		#define SYNC_601
		#define ISYNC_601

		#if defined(CONFIG_PPC_CELL) \|\| defined(CONFIG_PPC_FSL_BOOK3E)
		#define MFTB(dest) \
		90: mfspr dest, SPRN_TBRL; \

arch/powerpc/kernel/entry_32.S

+1 −16

Original line number	Diff line number	Diff line
		@@ -234,7 +234,6 @@ transfer_to_handler_cont:
		mtspr SPRN_SRR0,r11
		mtspr SPRN_SRR1,r10
		mtlr r9
		SYNC
		RFI /* jump to handler, enable MMU */

		#if defined (CONFIG_PPC_BOOK3S_32) \|\| defined(CONFIG_E500)
		@@ -264,7 +263,6 @@ _ASM_NOKPROBE_SYMBOL(transfer_to_handler_cont)
		LOAD_REG_IMMEDIATE(r0, MSR_KERNEL)
		mtspr SPRN_SRR0,r12
		mtspr SPRN_SRR1,r0
		SYNC
		RFI

		reenable_mmu:
		@@ -323,7 +321,6 @@ stack_ovf:
		#endif
		mtspr SPRN_SRR0,r9
		mtspr SPRN_SRR1,r10
		SYNC
		RFI
		_ASM_NOKPROBE_SYMBOL(stack_ovf)
		#endif
		@@ -411,7 +408,6 @@ ret_from_syscall:
		/* disable interrupts so current_thread_info()->flags can't change */
		LOAD_REG_IMMEDIATE(r10,MSR_KERNEL) /* doesn't include MSR_EE */
		/* Note: We don't bother telling lockdep about it */
		SYNC
		mtmsr r10
		lwz r9,TI_FLAGS(r2)
		li r8,-MAX_ERRNO
		@@ -474,7 +470,6 @@ syscall_exit_finish:
		#endif
		mtspr SPRN_SRR0,r7
		mtspr SPRN_SRR1,r8
		SYNC
		RFI
		_ASM_NOKPROBE_SYMBOL(syscall_exit_finish)
		#ifdef CONFIG_44x
		@@ -567,7 +562,6 @@ syscall_exit_work:
		* lockdep as we are supposed to have IRQs on at this point
		*/
		ori r10,r10,MSR_EE
		SYNC
		mtmsr r10

		/* Save NVGPRS if they're not saved already */
		@@ -606,7 +600,6 @@ ret_from_kernel_syscall:
		#endif
		mtspr SPRN_SRR0, r9
		mtspr SPRN_SRR1, r10
		SYNC
		RFI
		_ASM_NOKPROBE_SYMBOL(ret_from_kernel_syscall)

		@@ -810,7 +803,6 @@ fast_exception_return:
		REST_GPR(9, r11)
		REST_GPR(12, r11)
		lwz r11,GPR11(r11)
		SYNC
		RFI
		_ASM_NOKPROBE_SYMBOL(fast_exception_return)

		@@ -872,7 +864,6 @@ ret_from_except:
		* from the interrupt. */
		/* Note: We don't bother telling lockdep about it */
		LOAD_REG_IMMEDIATE(r10,MSR_KERNEL)
		SYNC /* Some chip revs have problems here... */
		mtmsr r10 /* disable interrupts */

		lwz r3,_MSR(r1) /* Returning to user mode? */
		@@ -1035,7 +1026,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
		* exc_exit_restart below. -- paulus
		*/
		LOAD_REG_IMMEDIATE(r10,MSR_KERNEL & ~MSR_RI)
		SYNC
		mtmsr r10 /* clear the RI bit */
		.globl exc_exit_restart
		exc_exit_restart:
		@@ -1046,7 +1036,6 @@ exc_exit_restart:
		lwz r1,GPR1(r1)
		.globl exc_exit_restart_end
		exc_exit_restart_end:
		SYNC
		RFI
		_ASM_NOKPROBE_SYMBOL(exc_exit_restart)
		_ASM_NOKPROBE_SYMBOL(exc_exit_restart_end)
		@@ -1274,7 +1263,6 @@ do_resched: /* r10 contains MSR_KERNEL here */
		mfmsr r10
		#endif
		ori r10,r10,MSR_EE
		SYNC
		mtmsr r10 /* hard-enable interrupts */
		bl schedule
		recheck:
		@@ -1283,7 +1271,6 @@ recheck:
		* TI_FLAGS aren't advertised.
		*/
		LOAD_REG_IMMEDIATE(r10,MSR_KERNEL)
		SYNC
		mtmsr r10 /* disable interrupts */
		lwz r9,TI_FLAGS(r2)
		andi. r0,r9,_TIF_NEED_RESCHED
		@@ -1292,7 +1279,6 @@ recheck:
		beq restore_user
		do_user_signal: /* r10 contains MSR_KERNEL here */
		ori r10,r10,MSR_EE
		SYNC
		mtmsr r10 /* hard-enable interrupts */
		/* save r13-r31 in the exception frame, if not already done */
		lwz r3,_TRAP(r1)
		@@ -1382,8 +1368,7 @@ _GLOBAL(enter_rtas)
		mfmsr r9
		stw r9,8(r1)
		LOAD_REG_IMMEDIATE(r0,MSR_KERNEL)
		SYNC /* disable interrupts so SRR0/1 */
		mtmsr r0 /* don't get trashed */
		mtmsr r0 /* disable interrupts so SRR0/1 don't get trashed */
		li r9,MSR_KERNEL & ~(MSR_IR\|MSR_DR)
		mtlr r6
		stw r7, THREAD + RTAS_SP(r2)

arch/powerpc/kernel/fpu.S

+0 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,6 @@ BEGIN_FTR_SECTION
		oris r5,r5,MSR_VSX@h
		END_FTR_SECTION_IFSET(CPU_FTR_VSX)
		#endif
		SYNC
		MTMSRD(r5) /* enable use of fpu now */
		isync
		/* enable use of FP after return */

arch/powerpc/kernel/head_32.S

+0 −9

Original line number	Diff line number	Diff line
		@@ -219,7 +219,6 @@ turn_on_mmu:
		lis r0,start_here@h
		ori r0,r0,start_here@l
		mtspr SPRN_SRR0,r0
		SYNC
		RFI /* enables MMU */

		/*
		@@ -784,14 +783,12 @@ fast_hash_page_return:
		mtcr r11
		lwz r11, THR11(r10)
		mfspr r10, SPRN_SPRG_SCRATCH0
		SYNC
		RFI

		1: /* ISI */
		mtcr r11
		mfspr r11, SPRN_SPRG_SCRATCH1
		mfspr r10, SPRN_SPRG_SCRATCH0
		SYNC
		RFI

		stack_overflow:
		@@ -882,7 +879,6 @@ __secondary_start_pmac_0:
		set to map the 0xf0000000 - 0xffffffff region */
		mfmsr r0
		rlwinm r0,r0,0,28,26 /* clear DR (0x10) */
		SYNC
		mtmsr r0
		isync

		@@ -930,7 +926,6 @@ __secondary_start:
		ori r3,r3,start_secondary@l
		mtspr SPRN_SRR0,r3
		mtspr SPRN_SRR1,r4
		SYNC
		RFI
		#endif /* CONFIG_SMP */

		@@ -1074,7 +1069,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
		.align 4
		mtspr SPRN_SRR0,r4
		mtspr SPRN_SRR1,r3
		SYNC
		RFI
		/* Load up the kernel context */
		2: bl load_up_mmu
		@@ -1099,7 +1093,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
		ori r3,r3,start_kernel@l
		mtspr SPRN_SRR0,r3
		mtspr SPRN_SRR1,r4
		SYNC
		RFI

		/*
		@@ -1217,7 +1210,6 @@ _ENTRY(update_bats)
		.align 4
		mtspr SPRN_SRR0, r4
		mtspr SPRN_SRR1, r3
		SYNC
		RFI
		1: bl clear_bats
		lis r3, BATS@ha
		@@ -1237,7 +1229,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
		mtmsr r3
		mtspr SPRN_SRR0, r7
		mtspr SPRN_SRR1, r6
		SYNC
		RFI

		flush_tlbs:

arch/powerpc/kernel/head_32.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,6 @@
		#endif
		mtspr SPRN_SRR1,r10
		mtspr SPRN_SRR0,r11
		SYNC
		RFI /* jump to handler, enable MMU */
		99: b ret_from_kernel_syscall
		.endm

Admin message