Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-4
+4
-3
arch/powerpc/kernel/exceptions-64s.S
+4
-3
arch/powerpc/kernel/exceptions-64s.S
···
812
812
* syscall register convention is in Documentation/powerpc/syscall64-abi.rst
813
813
*/
814
814
EXC_VIRT_BEGIN(system_call_vectored, 0x3000, 0x1000)
815
-
1:
816
815
/* SCV 0 */
817
816
mr r9,r13
818
817
GET_PACA(r13)
···
841
842
b system_call_vectored_sigill
842
843
#endif
843
844
.endr
844
-
2:
845
845
EXC_VIRT_END(system_call_vectored, 0x3000, 0x1000)
846
846
847
-
SOFT_MASK_TABLE(1b, 2b) // Treat scv vectors as soft-masked, see comment above.
847
+
// Treat scv vectors as soft-masked, see comment above.
848
+
// Use absolute values rather than labels here, so they don't get relocated,
849
+
// because this code runs unrelocated.
850
+
SOFT_MASK_TABLE(0xc000000000003000, 0xc000000000004000)
848
851
849
852
#ifdef CONFIG_RELOCATABLE
850
853
TRAMP_VIRT_BEGIN(system_call_vectored_tramp)
+1
-1
arch/powerpc/platforms/Kconfig.cputype
+1
-1
arch/powerpc/platforms/Kconfig.cputype
···
98
98
select PPC_HAVE_PMU_SUPPORT
99
99
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
100
100
select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION
101
-
select ARCH_ENABLE_PMD_SPLIT_PTLOCK
101
+
select ARCH_ENABLE_SPLIT_PMD_PTLOCK
102
102
select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
103
103
select ARCH_SUPPORTS_HUGETLBFS
104
104
select ARCH_SUPPORTS_NUMA_BALANCING