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

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

Pull xtensa updates from Max Filippov:

 - reorganize exception vectors placement

 - small cleanups (drop unused functions/headers/defconfig entries,
   spelling fixes)

* tag 'xtensa-20200206' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: ISS: improve simcall assembly
  xtensa: reorganize vectors placement
  xtensa: separate SMP and XIP support
  xtensa: move fast exception handlers close to vectors
  arch/xtensa: fix Kconfig typos for HAVE_SMP
  xtensa: clean up optional XCHAL_* definitions
  xtensa: drop unused function fast_coprocessor_double
  xtensa: drop empty platform_* functions from platforms
  xtensa: clean up platform headers
  xtensa: drop set_except_vector declaration
  xtensa: configs: Cleanup old Kconfig IO scheduler options
parents 90568ecf c74c0fd2

arch/xtensa/Kconfig

+35 −9
Original line number Diff line number Diff line
@@ -180,11 +180,11 @@ config HAVE_SMP 
	depends on XTENSA_VARIANT_CUSTOM

	select XTENSA_MX

	help

	  This option is use to indicate that the system-on-a-chip (SOC)

	  This option is used to indicate that the system-on-a-chip (SOC)

	  supports Multiprocessing. Multiprocessor support implemented above

	  the CPU core definition and currently needs to be selected manually.



	  Multiprocessor support in implemented with external cache and

	  Multiprocessor support is implemented with external cache and

	  interrupt controllers.



	  The MX interrupt distributer adds Interprocessor Interrupts
@@ -572,15 +572,41 @@ config KERNEL_LOAD_ADDRESS 


	  If unsure, leave the default value here.



config VECTORS_OFFSET

	hex "Kernel vectors offset"

	default 0x00003000

	depends on !XIP_KERNEL

choice

	prompt "Relocatable vectors location"

	default XTENSA_VECTORS_IN_TEXT

	help

	  This is the offset of the kernel image from the relocatable vectors

	  base.

	  Choose whether relocatable vectors are merged into the kernel .text

	  or placed separately at runtime. This option does not affect

	  configurations without VECBASE register where vectors are always

	  placed at their hardware-defined locations.



	  If unsure, leave the default value here.

config XTENSA_VECTORS_IN_TEXT

	bool "Merge relocatable vectors into kernel text"

	depends on !MTD_XIP

	help

	  This option puts relocatable vectors into the kernel .text section

	  with proper alignment.

	  This is a safe choice for most configurations.



config XTENSA_VECTORS_SEPARATE

	bool "Put relocatable vectors at fixed address"

	help

	  This option puts relocatable vectors at specific virtual address.

	  Vectors are merged with the .init data in the kernel image and

	  are copied into their designated location during kernel startup.

	  Use it to put vectors into IRAM or out of FLASH on kernels with

	  XIP-aware MTD support.



endchoice



config VECTORS_ADDR

	hex "Kernel vectors virtual address"

	default 0x00000000

	depends on XTENSA_VECTORS_SEPARATE

	help

	  This is the virtual address of the (relocatable) vectors base.

	  It must be within KSEG if MMU is used.



config XIP_DATA_ADDR

	hex "XIP kernel data virtual address"

arch/xtensa/configs/audio_kc705_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ CONFIG_PROFILING=y 
CONFIG_OPROFILE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_XTENSA_VARIANT_CUSTOM=y

CONFIG_XTENSA_VARIANT_CUSTOM_NAME="test_kc705_hifi"

CONFIG_XTENSA_UNALIGNED_USER=y

arch/xtensa/configs/cadence_csp_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ CONFIG_MODULES=y 
CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_XTENSA_VARIANT_CUSTOM=y

CONFIG_XTENSA_VARIANT_CUSTOM_NAME="csp"

CONFIG_XTENSA_UNALIGNED_USER=y

arch/xtensa/configs/generic_kc705_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ CONFIG_PROFILING=y 
CONFIG_OPROFILE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_XTENSA_VARIANT_DC233C=y

CONFIG_XTENSA_UNALIGNED_USER=y

CONFIG_PREEMPT=y

arch/xtensa/configs/iss_defconfig

+0 −2
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EXPERT=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_PCI is not set

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttyS0,38400 eth0=tuntap,,tap0 ip=192.168.168.5:192.168.168.1 root=nfs nfsroot=192.168.168.1:/opt/montavista/pro/devkit/xtensa/linux_be/target memmap=128M@0"

CRA Git | Maintained and supported by SUSTech CRA and CCSE