Skip to contentSkip to conversation

xtensa updates for v5.5

GIT PULL Merged Max Filippov 2 participants 2 messages Dec 3, 2019

lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull the following batch of updates for the Xtensa architecture. There's a merge conflict in arch/xtensa/kernel/vmlinux.lds.S that has obvious part (the conflicting part itself) and non-obvious part (another copy of RW_DATA_SECTION macro which was renamed in c9174047b48d ("vmlinux.lds.h: Replace RW_DATA_SECTION with RW_DATA")) that doesn't conflict, but will result in build error if left unfixed. My resolution of this conflict is available at

git://github.com/jcmvbkbc/linux-xtensa.git tags/xtensa-20191201-mainline-merge

The following changes since commit 7d194c2100ad2a6dded545887d02754948ca5241:

Linux 5.4-rc4 (2019-10-20 15:56:22 -0400)

are available in the Git repository at:

git://github.com/jcmvbkbc/linux-xtensa.git tags/xtensa-20191201

for you to fetch changes up to 9d9043f6a81713248d82d88983c06b1eaedda287:

xtensa: clean up system_call/xtensa_rt_sigreturn interaction (2019-11-29 19:37:12 -0800)

----------------------------------------------------------------
Xtensa updates for v5.5:

- add support for execute in place (XIP) kernels
- improvements in inline assembly: use named arguments and "m" constraints where possible
- improve stack dumping
- clean up system_call code and syscall tracing
- various small fixes and cleanups

----------------------------------------------------------------
Max Filippov (27):
xtensa: update arch features
xtensa: clean up empty include files
xtensa: move XCHAL_KIO_* definitions to kmem_layout.h
xtensa: move MPU constants from .data to .ref.rodata
xtensa: fix section name for start_info
xtensa: use correct symbol for the end of .rodata
xtensa: move kernel memory layout to platform options
xtensa: add XIP kernel support
xtensa: merge .fixup with .text
xtensa: use "m" constraint instead of "a" in uaccess.h assembly
xtensa: use macros to generate *_bit and test_and_*_bit functions
xtensa: use named assembly arguments in bitops.h
xtensa: use "m" constraint instead of "a" in bitops.h assembly
xtensa: use named assembly arguments in atomic.h
xtensa: use "m" constraint instead of "a" in atomic.h assembly
xtensa: use named assembly arguments in cmpxchg.h
xtensa: use "m" constraint instead of "a" in cmpxchg.h assembly
xtensa: use "m" constraint instead of "r" in futex.h assembly
xtensa: improve stack dumping
xtensa: make stack dump size configurable
xtensa: fix TLB sanity checker
xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map
xtensa: drop unneeded headers from coprocessor.S
xtensa: fix syscall_set_return_value
xtensa: rearrange syscall tracing
xtensa: fix system_call interaction with ptrace
xtensa: clean up system_call/xtensa_rt_sigreturn interaction

Mike Rapoport (2):
xtensa: mm: fix PMD folding implementation
xtensa: get rid of __ARCH_USE_5LEVEL_HACK

Valentin Schneider (1):
xtensa: entry: Remove unneeded need_resched() loop

 .../features/core/tracehook/arch-support.txt       |   2 +-
 arch/xtensa/Kconfig                                | 396 ++++++++++++---------
 arch/xtensa/Kconfig.debug                          |   7 +
 arch/xtensa/Makefile                               |   3 +-
 arch/xtensa/boot/Makefile                          |   5 +
 arch/xtensa/configs/xip_kc705_defconfig            | 119 +++++++
 arch/xtensa/include/asm/Kbuild                     |   2 +
 arch/xtensa/include/asm/atomic.h                   | 124 +++----
 arch/xtensa/include/asm/bitops.h                   | 323 +++++------------
 arch/xtensa/include/asm/cache.h                    |   6 +
 arch/xtensa/include/asm/cmpxchg.h                  |  71 ++--
 arch/xtensa/include/asm/fixmap.h                   |   8 +-
 arch/xtensa/include/asm/futex.h                    |  10 +-
 arch/xtensa/include/asm/hw_irq.h                   |  14 -
 arch/xtensa/include/asm/initialize_mmu.h           |   3 +-
 arch/xtensa/include/asm/kmem_layout.h              |  29 ++
 arch/xtensa/include/asm/page.h                     |  11 +
 arch/xtensa/include/asm/pgtable.h                  |   4 -
 arch/xtensa/include/asm/processor.h                |   3 +-
 arch/xtensa/include/asm/syscall.h                  |   4 +-
 arch/xtensa/include/asm/uaccess.h                  |  16 +-
 arch/xtensa/include/asm/user.h                     |  20 --
 arch/xtensa/include/asm/vectors.h                  |  44 +--
 arch/xtensa/kernel/coprocessor.S                   |  10 +-
 arch/xtensa/kernel/entry.S                         |  22 +-
 arch/xtensa/kernel/head.S                          |  13 +-
 arch/xtensa/kernel/process.c                       |   2 +
 arch/xtensa/kernel/ptrace.c                        |  18 +-
 arch/xtensa/kernel/setup.c                         |   7 +
 arch/xtensa/kernel/signal.c                        |   4 +-
 arch/xtensa/kernel/traps.c                         |  27 +-
 arch/xtensa/kernel/vmlinux.lds.S                   |  58 ++-
 arch/xtensa/mm/fault.c                             |  16 +-
 arch/xtensa/mm/init.c                              |   4 +-
 arch/xtensa/mm/kasan_init.c                        |  12 +-
 arch/xtensa/mm/mmu.c                               |   4 +-
 arch/xtensa/mm/tlb.c                               |  14 +-
 37 files changed, 772 insertions(+), 663 deletions(-)
 create mode 100644 arch/xtensa/configs/xip_kc705_defconfig
 delete mode 100644 arch/xtensa/include/asm/hw_irq.h
 delete mode 100644 arch/xtensa/include/asm/user.h

Thanks.
-- Max

merge bot Merged
#1 lore raw
The pull request you sent on Mon, 2 Dec 2019 23:46:29 -0800:

The pull request you sent on Mon, 2 Dec 2019 23:46:29 -0800:

Quoted 1 line

git://github.com/jcmvbkbc/linux-xtensa.git tags/xtensa-20191201-mainline-merge

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4d7048f55104434ec64fe0b5196cbc89a8f99548

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker