Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1308fd75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC updates from Vineet Gupta:

 - support IDU intc for UP builds

 - support gz, lzma compressed uImage [Daniel Mentz]

 - adjust /proc/cpuinfo for non-continuous cpu ids [Noam Camus]

 - syscall for userspace cmpxchg assist for configs lacking hardware atomics

 - rework of boot log printing mainly for identifying older arc700 cores

 - retiring some old code, build toggles

* tag 'arc-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: module: print pretty section names
  ARC: module: elide loop to save reference to .eh_frame
  ARC: mm: retire ARC_DBG_TLB_MISS_COUNT...
  ARC: build: retire old toggles
  ARC: boot log: refactor cpu name/release printing
  ARC: boot log: remove awkward space comma from MMU line
  ARC: boot log: don't assume SWAPE instruction support
  ARC: boot log: refactor printing abt features not captured in BCRs
  ARCv2: boot log: print IOC exists as well as enabled status
  ARCv2: IOC: use @ioc_enable not @ioc_exist where intended
  ARC: syscall for userspace cmpxchg assist
  ARC: fix build warning in elf.h
  ARC: Adjust cpuinfo for non-continuous cpu ids
  ARC: [build] Support gz, lzma compressed uImage
  ARCv2: intc: untangle SMP, MCIP and IDU
parents 6fcc8cea b75dcd9c

arch/arc/Kconfig

+11 −16
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ config ARC 
	select PERF_USE_VMALLOC

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA



config MIGHT_HAVE_PCI

	bool
@@ -186,14 +188,6 @@ if SMP 
config ARC_HAS_COH_CACHES

	def_bool n



config ARC_MCIP

	bool "ARConnect Multicore IP (MCIP) Support "

	depends on ISA_ARCV2

	help

	  This IP block enables SMP in ARC-HS38 cores.

	  It provides for cross-core interrupts, multi-core debug

	  hardware semaphores, shared memory,....



config NR_CPUS

	int "Maximum number of CPUs (2-4096)"

	range 2 4096
@@ -211,6 +205,15 @@ config ARC_SMP_HALT_ON_RESET 


endif	#SMP



config ARC_MCIP

	bool "ARConnect Multicore IP (MCIP) Support "

	depends on ISA_ARCV2

	default y if SMP

	help

	  This IP block enables SMP in ARC-HS38 cores.

	  It provides for cross-core interrupts, multi-core debug

	  hardware semaphores, shared memory,....



menuconfig ARC_CACHE

	bool "Enable Cache Support"

	default y
@@ -537,14 +540,6 @@ config ARC_DBG_TLB_PARANOIA 
	bool "Paranoia Checks in Low Level TLB Handlers"

	default n



config ARC_DBG_TLB_MISS_COUNT

	bool "Profile TLB Misses"

	default n

	select DEBUG_FS

	help

	  Counts number of I and D TLB Misses and exports them via Debugfs

	  The counters can be cleared via Debugfs as well



endif



config ARC_UBOOT_SUPPORT

arch/arc/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ atleast_gcc44 := $(call cc-ifversion, -ge, 0404, y) 


cflags-$(atleast_gcc44)			+= -fsection-anchors



cflags-$(CONFIG_ARC_HAS_LLSC)		+= -mlock

cflags-$(CONFIG_ARC_HAS_SWAPE)		+= -mswape



ifdef CONFIG_ISA_ARCV2



ifndef CONFIG_ARC_HAS_LL64

arch/arc/boot/Makefile

+14 −2
Original line number Diff line number Diff line
@@ -14,9 +14,15 @@ UIMAGE_ENTRYADDR = $(LINUX_START_TEXT) 


suffix-y := bin

suffix-$(CONFIG_KERNEL_GZIP)	:= gz

suffix-$(CONFIG_KERNEL_LZMA)	:= lzma



targets += uImage uImage.bin uImage.gz

extra-y += vmlinux.bin vmlinux.bin.gz

targets += uImage

targets += uImage.bin

targets += uImage.gz

targets += uImage.lzma

extra-y += vmlinux.bin

extra-y += vmlinux.bin.gz

extra-y += vmlinux.bin.lzma



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)
@@ -24,12 +30,18 @@ $(obj)/vmlinux.bin: vmlinux FORCE 
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzma)



$(obj)/uImage.bin: $(obj)/vmlinux.bin FORCE

	$(call if_changed,uimage,none)



$(obj)/uImage.gz: $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,uimage,gzip)



$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma FORCE

	$(call if_changed,uimage,lzma)



$(obj)/uImage: $(obj)/uImage.$(suffix-y)

	@ln -sf $(notdir $<) $@

	@echo '  Image $@ is ready'

arch/arc/include/asm/arcregs.h

+2 −1
Original line number Diff line number Diff line
@@ -349,10 +349,11 @@ struct cpuinfo_arc { 
	struct cpuinfo_arc_bpu bpu;

	struct bcr_identity core;

	struct bcr_isa isa;

	const char *details, *name;

	unsigned int vec_base;

	struct cpuinfo_arc_ccm iccm, dccm;

	struct {

		unsigned int swap:1, norm:1, minmax:1, barrel:1, crc:1, pad1:3,

		unsigned int swap:1, norm:1, minmax:1, barrel:1, crc:1, swape:1, pad1:2,

			     fpu_sp:1, fpu_dp:1, pad2:6,

			     debug:1, ap:1, smart:1, rtt:1, pad3:4,

			     timer0:1, timer1:1, rtc:1, gfrc:1, pad4:4;

arch/arc/include/asm/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ extern void arc_cache_init(void); 
extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len);

extern void read_decode_cache_bcr(void);



extern int ioc_exists;

extern int ioc_enable;

extern unsigned long perip_base, perip_end;



#endif	/* !__ASSEMBLY__ */