Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'xtensa-20181115' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fixes from Max Filippov:
- fix stack alignment for bFLT binaries.
- fix physical-to-virtual address translation for boot parameters in
MMUv3 256+256 and 512+512 virtual memory layouts.
* tag 'xtensa-20181115' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: fix boot parameters address translation
xtensa: make sure bFLT stack is 16 byte aligned
+10
-3
+5
-1
arch/xtensa/include/asm/processor.h
+5
-1
arch/xtensa/include/asm/processor.h
···
23
23
# error Linux requires the Xtensa Windowed Registers Option.
24
24
#endif
25
25
26
-
#define ARCH_SLAB_MINALIGN XCHAL_DATA_WIDTH
26
+
/* Xtensa ABI requires stack alignment to be at least 16 */
27
+
28
+
#define STACK_ALIGN (XCHAL_DATA_WIDTH > 16 ? XCHAL_DATA_WIDTH : 16)
29
+
30
+
#define ARCH_SLAB_MINALIGN STACK_ALIGN
27
31
28
32
/*
29
33
* User space process size: 1 GB.
+5
-2
arch/xtensa/kernel/head.S
+5
-2
arch/xtensa/kernel/head.S
···
88
88
initialize_mmu
89
89
#if defined(CONFIG_MMU) && XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
90
90
rsr a2, excsave1
91
-
movi a3, 0x08000000
91
+
movi a3, XCHAL_KSEG_PADDR
92
+
bltu a2, a3, 1f
93
+
sub a2, a2, a3
94
+
movi a3, XCHAL_KSEG_SIZE
92
95
bgeu a2, a3, 1f
93
-
movi a3, 0xd0000000
96
+
movi a3, XCHAL_KSEG_CACHED_VADDR
94
97
add a2, a2, a3
95
98
wsr a2, excsave1
96
99
1: