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

Commit 6102c005 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: Fix unnecessary machine check handler relocation branch 



Similarly to commit 2563a70c ("powerpc/64s: Remove unnecessary relocation
branch from idle handler"), the machine check handler has a BRANCH_TO from
relocated to relocated code, which is unnecessary.

It has also caused build errors with some toolchains:

  arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
  arch/powerpc/kernel/exceptions-64s.S:395: Error: operand out of range
  (0xffffffffffff8280 is not between 0x0000000000000000 and
  0x000000000000ffff)

Fixes: 1945bc45 ("powerpc/64s: Fix POWER9 machine check handler from stop state")
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Reported-and-tested-by : Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ba95b5d0

arch/powerpc/kernel/exceptions-64s.S

+1 −3
Original line number Diff line number Diff line
@@ -391,9 +391,7 @@ EXC_COMMON_BEGIN(machine_check_handle_early) 
	 */

	BEGIN_FTR_SECTION

	rlwinm.	r11,r12,47-31,30,31

	beq-	4f

	BRANCH_TO_COMMON(r10, machine_check_idle_common)

4:

	bne	machine_check_idle_common

	END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)

#endif