Commit cd984a5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xtensa fixes from Max Filippov:

 - fix ccount_timer_shutdown for secondary CPUs

 - fix secondary CPU initialization

 - fix secondary CPU reset vector clash with double exception vector

 - fix present CPUs when booting with 'maxcpus' parameter

 - limit possible CPUs by configured NR_CPUS

 - issue a warning if xtensa PIC is asked to retrigger anything other
   than software IRQ

 - fix masking/unmasking of the first two IRQs on xtensa MX PIC

 - fix typo in Kconfig description for user space unaligned access
   feature

 - fix Kconfig warning for selecting BUILTIN_DTB

* tag 'xtensa-20190201' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: SMP: limit number of possible CPUs by NR_CPUS
  xtensa: rename BUILTIN_DTB to BUILTIN_DTB_SOURCE
  xtensa: Fix typo use space=>user space
  drivers/irqchip: xtensa-mx: fix mask and unmask
  drivers/irqchip: xtensa: add warning to irq_retrigger
  xtensa: SMP: mark each possible CPU as present
  xtensa: smp_lx200_defconfig: fix vectors clash
  xtensa: SMP: fix secondary CPU initialization
  xtensa: SMP: fix ccount_timer_shutdown
parents 8b050fe4 25384ce5

arch/xtensa/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ config XTENSA_FAKE_NMI 
	  If unsure, say N.



config XTENSA_UNALIGNED_USER

	bool "Unaligned memory access in use space"

	bool "Unaligned memory access in user space"

	help

	  The Xtensa architecture currently does not handle unaligned

	  memory accesses in hardware but through an exception handler.
@@ -451,7 +451,7 @@ config USE_OF 
	help

	  Include support for flattened device tree machine descriptions.



config BUILTIN_DTB

config BUILTIN_DTB_SOURCE

	string "DTB to build into the kernel image"

	depends on OF

arch/xtensa/boot/dts/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 
#

#



BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o

ifneq ($(CONFIG_BUILTIN_DTB),"")

obj-$(CONFIG_OF) += $(BUILTIN_DTB)

BUILTIN_DTB_SOURCE := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o

ifneq ($(CONFIG_BUILTIN_DTB_SOURCE),"")

obj-$(CONFIG_OF) += $(BUILTIN_DTB_SOURCE)

endif



# for CONFIG_OF_ALL_DTBS test

arch/xtensa/configs/audio_kc705_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ CONFIG_XTENSA_PLATFORM_XTFPGA=y 
CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="kc705"

CONFIG_BUILTIN_DTB_SOURCE="kc705"

# CONFIG_COMPACTION is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM=y

arch/xtensa/configs/cadence_csp_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ CONFIG_HIGHMEM=y 
# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="csp"

CONFIG_BUILTIN_DTB_SOURCE="csp"

# CONFIG_COMPACTION is not set

CONFIG_XTFPGA_LCD=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

arch/xtensa/configs/generic_kc705_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ CONFIG_XTENSA_PLATFORM_XTFPGA=y 
CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="kc705"

CONFIG_BUILTIN_DTB_SOURCE="kc705"

# CONFIG_COMPACTION is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE