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

Merge tag 'xtensa-20181228' of git://github.com/jcmvbkbc/linux-xtensa 

Pull Xtensa updates from Max Filippov:

 - switch to generated syscall table

 - switch ptrace to regsets, use regsets for core dumps

 - complete tracehook implementation

 - add syscall tracepoints support

 - add jumplabels support

 - add memtest support

 - drop unused/duplicated code from entry.S, ptrace.c, coprocessor.S,
   elf.h and syscall.h

 - clean up warnings caused by WSR/RSR macros

 - clean up DTC warnings about SPI controller node names in xtfpga.dtsi

 - simplify coprocessor.S

 - get rid of explicit 'l32r' instruction usage in assembly

* tag 'xtensa-20181228' of git://github.com/jcmvbkbc/linux-xtensa: (25 commits)
  xtensa: implement jump_label support
  xtensa: implement syscall tracepoints
  xtensa: implement tracehook functions and enable HAVE_ARCH_TRACEHOOK
  xtensa: enable CORE_DUMP_USE_REGSET
  xtensa: implement TIE regset
  xtensa: implement task_user_regset_view
  xtensa: call do_syscall_trace_{enter,leave} selectively
  xtensa: use NO_SYSCALL instead of -1
  xtensa: define syscall_get_arch()
  Move EM_XTENSA to uapi/linux/elf-em.h
  xtensa: support memtest
  xtensa: don't use l32r opcode directly
  xtensa: xtfpga.dtsi: fix dtc warnings about SPI
  xtensa: don't clear cpenable unconditionally on release
  xtensa: simplify coprocessor.S
  xtensa: clean up WSR*/RSR*/get_sr/set_sr
  xtensa: drop unused declarations from elf.h
  xtensa: clean up syscall.h
  xtensa: drop unused coprocessor helper functions
  xtensa: drop custom PTRACE_{PEEK,POKE}{TEXT,DATA}
  ...
parents 889bb743 64711f9a

Documentation/features/core/jump-labels/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ 
    |          um: | TODO |

    |   unicore32: | TODO |

    |         x86: |  ok  |

    |      xtensa: | TODO |

    |      xtensa: |  ok  |

    -----------------------

arch/xtensa/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ config XTENSA 
	select GENERIC_PCI_IOMAP

	select GENERIC_SCHED_CLOCK

	select GENERIC_STRNCPY_FROM_USER if KASAN

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_KASAN if MMU

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS

	select HAVE_EXIT_THREAD
@@ -27,6 +29,7 @@ config XTENSA 
	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA

	select PERF_USE_VMALLOC

arch/xtensa/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ boot := arch/xtensa/boot 
all Image zImage uImage: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@



archheaders:

	$(Q)$(MAKE) $(build)=arch/xtensa/kernel/syscalls all



define archhelp

  @echo '* Image       - Kernel ELF image with reset vector'

  @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'

arch/xtensa/boot/boot-elf/bootstrap.S

+14 −15
Original line number Diff line number Diff line
@@ -29,17 +29,7 @@ _ResetVector: 
	.begin  no-absolute-literals

	.literal_position



#if defined(CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX) && \

	XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY

	.literal RomInitAddr, CONFIG_KERNEL_LOAD_ADDRESS

#else

	.literal RomInitAddr, KERNELOFFSET

#endif

#ifndef CONFIG_PARSE_BOOTPARAM

	.literal RomBootParam, 0

#else

	.literal RomBootParam, _bootparam



#ifdef CONFIG_PARSE_BOOTPARAM

	.align 4

_bootparam:

	.short	BP_TAG_FIRST
@@ -66,13 +56,22 @@ _SetupMMU: 
	initialize_mmu

#endif



	.end    no-absolute-literals



	rsil    a0, XCHAL_DEBUGLEVEL-1

	rsync

reset:

	l32r    a0, RomInitAddr

	l32r	a2, RomBootParam

#if defined(CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX) && \

	XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY

	movi	a0, CONFIG_KERNEL_LOAD_ADDRESS

#else

	movi	a0, KERNELOFFSET

#endif

#ifdef CONFIG_PARSE_BOOTPARAM

	movi	a2, _bootparam

#else

	movi	a2, 0

#endif

	movi	a3, 0

	movi	a4, 0

	jx      a0



	.end    no-absolute-literals

arch/xtensa/boot/dts/xtfpga.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
			};

		};



		spi0: spi-master@0d0a0000 {

		spi0: spi@0d0a0000 {

			compatible = "cdns,xtfpga-spi";

			#address-cells = <1>;

			#size-cells = <0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE