Commit 9f73eacd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.14-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Fix scv implicit soft-mask table for relocated (eg. kdump) kernels

 - Re-enable ARCH_ENABLE_SPLIT_PMD_PTLOCK, which was disabled due to a
   typo

Thanks to Lukas Bulwahn, Nicholas Piggin, and Daniel Axtens.

* tag 'powerpc-5.14-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Fix scv implicit soft-mask table for relocated kernels
  powerpc: Re-enable ARCH_ENABLE_SPLIT_PMD_PTLOCK
parents 64b4fc45 787c70f2

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

+4 −3
Original line number Diff line number Diff line
@@ -812,7 +812,6 @@ __start_interrupts: 
 * syscall register convention is in Documentation/powerpc/syscall64-abi.rst

 */

EXC_VIRT_BEGIN(system_call_vectored, 0x3000, 0x1000)

1:

	/* SCV 0 */

	mr	r9,r13

	GET_PACA(r13)
@@ -842,10 +841,12 @@ EXC_VIRT_BEGIN(system_call_vectored, 0x3000, 0x1000) 
	b	system_call_vectored_sigill

#endif

	.endr

2:

EXC_VIRT_END(system_call_vectored, 0x3000, 0x1000)



SOFT_MASK_TABLE(1b, 2b) // Treat scv vectors as soft-masked, see comment above.

// Treat scv vectors as soft-masked, see comment above.

// Use absolute values rather than labels here, so they don't get relocated,

// because this code runs unrelocated.

SOFT_MASK_TABLE(0xc000000000003000, 0xc000000000004000)



#ifdef CONFIG_RELOCATABLE

TRAMP_VIRT_BEGIN(system_call_vectored_tramp)

arch/powerpc/platforms/Kconfig.cputype

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ config PPC_BOOK3S_64 
	select PPC_HAVE_PMU_SUPPORT

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION

	select ARCH_ENABLE_PMD_SPLIT_PTLOCK

	select ARCH_ENABLE_SPLIT_PMD_PTLOCK

	select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE

	select ARCH_SUPPORTS_HUGETLBFS

	select ARCH_SUPPORTS_NUMA_BALANCING