From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Nov 2013 23:51:29 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: v3.13-rc1~103
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=f47671e2d861a2093179cd64dda22016664b2015;p=~andy%2Flinux

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM updates from Russell King:
 "Included in this series are:

   1. BE8 (modern big endian) changes for ARM from Ben Dooks
   2. big.Little support from Nicolas Pitre and Dave Martin
   3. support for LPAE systems with all system memory above 4GB
   4. Perf updates from Will Deacon
   5. Additional prefetching and other performance improvements from Will.
   6. Neon-optimised AES implementation fro Ard.
   7. A number of smaller fixes scattered around the place.

  There is a rather horrid merge conflict in tools/perf - I was never
  notified of the conflict because it originally occurred between Will's
  tree and other stuff.  Consequently I have a resolution which Will
  forwarded me, which I'll forward on immediately after sending this
  mail.

  The other notable thing is I'm expecting some build breakage in the
  crypto stuff on ARM only with Ard's AES patches.  These were merged
  into a stable git branch which others had already pulled, so there's
  little I can do about this.  The problem is caused because these
  patches have a dependency on some code in the crypto git tree - I
  tried requesting a branch I can pull to resolve these, and all I got
  each time from the crypto people was "we'll revert our patches then"
  which would only make things worse since I still don't have the
  dependent patches.  I've no idea what's going on there or how to
  resolve that, and since I can't split these patches from the rest of
  this pull request, I'm rather stuck with pushing this as-is or
  reverting Ard's patches.

  Since it should "come out in the wash" I've left them in - the only
  build problems they seem to cause at the moment are with randconfigs,
  and since it's a new feature anyway.  However, if by -rc1 the
  dependencies aren't in, I think it'd be best to revert Ard's patches"

I resolved the perf conflict roughly as per the patch sent by Russell,
but there may be some differences.  Any errors are likely mine.  Let's
see how the crypto issues work out..

* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (110 commits)
  ARM: 7868/1: arm/arm64: remove atomic_clear_mask() in "include/asm/atomic.h"
  ARM: 7867/1: include: asm: use 'int' instead of 'unsigned long' for 'oldval' in atomic_cmpxchg().
  ARM: 7866/1: include: asm: use 'long long' instead of 'u64' within atomic.h
  ARM: 7871/1: amba: Extend number of IRQS
  ARM: 7887/1: Don't smp_cross_call() on UP devices in arch_irq_work_raise()
  ARM: 7872/1: Support arch_irq_work_raise() via self IPIs
  ARM: 7880/1: Clear the IT state independent of the Thumb-2 mode
  ARM: 7878/1: nommu: Implement dummy early_paging_init()
  ARM: 7876/1: clear Thumb-2 IT state on exception handling
  ARM: 7874/2: bL_switcher: Remove cpu_hotplug_driver_{lock,unlock}()
  ARM: footbridge: fix build warnings for netwinder
  ARM: 7873/1: vfp: clear vfp_current_hw_state for dying cpu
  ARM: fix misplaced arch_virt_to_idmap()
  ARM: 7848/1: mcpm: Implement cpu_kill() to synchronise on powerdown
  ARM: 7847/1: mcpm: Factor out logical-to-physical CPU translation
  ARM: 7869/1: remove unused XSCALE_PMU Kconfig param
  ARM: 7864/1: Handle 64-bit memory in case of 32-bit phys_addr_t
  ARM: 7863/1: Let arm_add_memory() always use 64-bit arguments
  ARM: 7862/1: pcpu: replace __get_cpu_var_uses
  ARM: 7861/1: cacheflush: consolidate single-CPU ARMv7 cache disabling code
  ...
---

f47671e2d861a2093179cd64dda22016664b2015
diff --cc arch/arm/mach-highbank/Kconfig
index fe98df44579,0ca7377746c..08332d84144
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@@ -8,11 -9,11 +9,11 @@@ config ARCH_HIGHBAN
  	select ARM_AMBA
  	select ARM_ERRATA_764369
  	select ARM_ERRATA_775420
- 	select ARM_ERRATA_798181
+ 	select ARM_ERRATA_798181 if SMP
  	select ARM_GIC
 +	select ARM_PSCI
  	select ARM_TIMER_SP804
  	select CACHE_L2X0
 -	select CLKDEV_LOOKUP
  	select COMMON_CLK
  	select CPU_V7
  	select GENERIC_CLOCKEVENTS
diff --cc arch/arm/mach-tegra/Kconfig
index 0bf04a0bca9,f26428d8b62..09e740f58b2
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -51,9 -53,9 +51,9 @@@ config ARCH_TEGRA_3x_SO
  
  config ARCH_TEGRA_114_SOC
  	bool "Enable support for Tegra114 family"
- 	select ARM_ERRATA_798181
 -	select HAVE_ARM_ARCH_TIMER
+ 	select ARM_ERRATA_798181 if SMP
  	select ARM_L1_CACHE_SHIFT_6
 +	select HAVE_ARM_ARCH_TIMER
  	select PINCTRL_TEGRA114
  	help
  	  Support for NVIDIA Tegra T114 processor family, based on the
diff --cc tools/perf/config/Makefile
index 58b2d37ae23,75b93d7f786..f5905f2b197
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@@ -23,17 -23,19 +23,21 @@@ ifeq ($(ARCH),x86_64
    endif
    ifeq (${IS_X86_64}, 1)
      RAW_ARCH := x86_64
 -    CFLAGS += -DARCH_X86_64
 +    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT
      ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
 +    LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
 +  else
 +    LIBUNWIND_LIBS = -lunwind -lunwind-x86
    endif
    NO_PERF_REGS := 0
 -  LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
  endif
+ ifeq ($(ARCH),arm)
+   NO_PERF_REGS := 0
+   LIBUNWIND_LIBS = -lunwind -lunwind-arm
+ endif
  
  ifeq ($(NO_PERF_REGS),0)
 -  CFLAGS += -DHAVE_PERF_REGS
 +  CFLAGS += -DHAVE_PERF_REGS_SUPPORT
  endif
  
  ifeq ($(src-perf),)
@@@ -280,55 -179,64 +284,59 @@@ els
  endif # NO_LIBELF
  
  ifndef NO_LIBELF
 -CFLAGS += -DLIBELF_SUPPORT
 -FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
 -ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y)
 -  CFLAGS += -DLIBELF_MMAP
 -endif
 -ifeq ($(call try-cc,$(SOURCE_ELF_GETPHDRNUM),$(FLAGS_LIBELF),-DHAVE_ELF_GETPHDRNUM),y)
 -  CFLAGS += -DHAVE_ELF_GETPHDRNUM
 -endif
 +  CFLAGS += -DHAVE_LIBELF_SUPPORT
  
 -# include ARCH specific config
 --include $(src-perf)/arch/$(ARCH)/Makefile
 +  ifeq ($(feature-libelf-mmap), 1)
 +    CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
 +  endif
  
 -ifndef NO_DWARF
 -ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)
 -  msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);
 -  NO_DWARF := 1
 -else
 -  CFLAGS += -DDWARF_SUPPORT $(LIBDW_CFLAGS)
 -  LDFLAGS += $(LIBDW_LDFLAGS)
 -  EXTLIBS += -lelf -ldw
 -endif # PERF_HAVE_DWARF_REGS
 -endif # NO_DWARF
 +  ifeq ($(feature-libelf-getphdrnum), 1)
 +    CFLAGS += -DHAVE_ELF_GETPHDRNUM_SUPPORT
 +  endif
  
 -endif # NO_LIBELF
 +  # include ARCH specific config
 +  -include $(src-perf)/arch/$(ARCH)/Makefile
  
 -ifndef NO_LIBELF
 -CFLAGS += -DLIBELF_SUPPORT
 -FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
 -ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y)
 -  CFLAGS += -DLIBELF_MMAP
 -endif # try-cc
 +  ifndef NO_DWARF
 +    ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)
 +      msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);
 +      NO_DWARF := 1
 +    else
 +      CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)
 +      LDFLAGS += $(LIBDW_LDFLAGS)
 +      EXTLIBS += -lelf -ldw
 +    endif # PERF_HAVE_DWARF_REGS
 +  endif # NO_DWARF
  endif # NO_LIBELF
  
- # There's only x86 (both 32 and 64) support for CFI unwind so far
- ifneq ($(ARCH),x86)
+ ifeq ($(LIBUNWIND_LIBS),)
    NO_LIBUNWIND := 1
  endif
  
  ifndef NO_LIBUNWIND
 -# for linking with debug library, run like:
 -# make DEBUG=1 LIBUNWIND_DIR=/opt/libunwind/
 -ifdef LIBUNWIND_DIR
 -  LIBUNWIND_CFLAGS  := -I$(LIBUNWIND_DIR)/include
 -  LIBUNWIND_LDFLAGS := -L$(LIBUNWIND_DIR)/lib
 -endif
 +  #
 +  # For linking with debug library, run like:
 +  #
 +  #   make DEBUG=1 LIBUNWIND_DIR=/opt/libunwind/
 +  #
 +  ifdef LIBUNWIND_DIR
 +    LIBUNWIND_CFLAGS  := -I$(LIBUNWIND_DIR)/include
 +    LIBUNWIND_LDFLAGS := -L$(LIBUNWIND_DIR)/lib
 +  endif
  
 -FLAGS_UNWIND=$(LIBUNWIND_CFLAGS) $(CFLAGS) $(LIBUNWIND_LDFLAGS) $(LDFLAGS) $(EXTLIBS) $(LIBUNWIND_LIBS)
 -ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND),libunwind),y)
 -  msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 1.1);
 -  NO_LIBUNWIND := 1
 -endif # Libunwind support
 -ifneq ($(call try-cc,$(SOURCE_LIBUNWIND_DEBUG_FRAME),$(FLAGS_UNWIND),libunwind debug_frame),y)
 -  msg := $(warning No debug_frame support found in libunwind);
 -CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME
 -endif # debug_frame support in libunwind
 -endif # NO_LIBUNWIND
 +  ifneq ($(feature-libunwind), 1)
-     msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 0.99);
++    msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 1.1);
 +    NO_LIBUNWIND := 1
++  else
++    ifneq ($(feature-libunwind-debug-frame), 1)
++      msg := $(warning No debug_frame support found in libunwind);
++      CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME
++    endif
 +  endif
 +endif
  
  ifndef NO_LIBUNWIND
 -  CFLAGS += -DLIBUNWIND_SUPPORT
 +  CFLAGS += -DHAVE_LIBUNWIND_SUPPORT
    EXTLIBS += $(LIBUNWIND_LIBS)
    CFLAGS += $(LIBUNWIND_CFLAGS)
    LDFLAGS += $(LIBUNWIND_LDFLAGS)
diff --cc tools/perf/config/feature-checks/Makefile
index c803f17fb98,00000000000..e8e195f49a4
mode 100644,000000..100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@@ -1,148 -1,0 +1,149 @@@
 +
 +FILES=					\
 +	test-all			\
 +	test-backtrace			\
 +	test-bionic			\
 +	test-dwarf			\
 +	test-fortify-source		\
 +	test-glibc			\
 +	test-gtk2			\
 +	test-gtk2-infobar		\
 +	test-hello			\
 +	test-libaudit			\
 +	test-libbfd			\
 +	test-liberty			\
 +	test-liberty-z			\
 +	test-cplus-demangle		\
 +	test-libelf			\
 +	test-libelf-getphdrnum		\
 +	test-libelf-mmap		\
 +	test-libnuma			\
 +	test-libperl			\
 +	test-libpython			\
 +	test-libpython-version		\
 +	test-libslang			\
 +	test-libunwind			\
++	test-libunwind-debug-frame	\
 +	test-on-exit			\
 +	test-stackprotector-all		\
 +	test-stackprotector		\
 +	test-timerfd
 +
 +CC := $(CC) -MD
 +
 +all: $(FILES)
 +
 +BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
 +
 +###############################
 +
 +test-all:
 +	$(BUILD) -Werror -fstack-protector -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma $(LIBUNWIND_LIBS) -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl
 +
 +test-hello:
 +	$(BUILD)
 +
 +test-stackprotector-all:
 +	$(BUILD) -Werror -fstack-protector-all
 +
 +test-stackprotector:
 +	$(BUILD) -Werror -fstack-protector -Wstack-protector
 +
 +test-fortify-source:
 +	$(BUILD) -O2 -Werror -D_FORTIFY_SOURCE=2
 +
 +test-bionic:
 +	$(BUILD)
 +
 +test-libelf:
 +	$(BUILD) -lelf
 +
 +test-glibc:
 +	$(BUILD)
 +
 +test-dwarf:
 +	$(BUILD) -ldw
 +
 +test-libelf-mmap:
 +	$(BUILD) -lelf
 +
 +test-libelf-getphdrnum:
 +	$(BUILD) -lelf
 +
 +test-libnuma:
 +	$(BUILD) -lnuma
 +
 +test-libunwind:
 +	$(BUILD) $(LIBUNWIND_LIBS) -lelf
 +
 +test-libaudit:
 +	$(BUILD) -laudit
 +
 +test-libslang:
 +	$(BUILD) -I/usr/include/slang -lslang
 +
 +test-gtk2:
 +	$(BUILD) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null)
 +
 +test-gtk2-infobar:
 +	$(BUILD) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null)
 +
 +grep-libs  = $(filter -l%,$(1))
 +strip-libs = $(filter-out -l%,$(1))
 +
 +PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null)
 +PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
 +PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
 +PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`
 +FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
 +
 +test-libperl:
 +	$(BUILD) $(FLAGS_PERL_EMBED)
 +
 +override PYTHON := python
 +override PYTHON_CONFIG := python-config
 +
 +escape-for-shell-sq =  $(subst ','\'',$(1))
 +shell-sq = '$(escape-for-shell-sq)'
 +
 +PYTHON_CONFIG_SQ = $(call shell-sq,$(PYTHON_CONFIG))
 +
 +PYTHON_EMBED_LDOPTS = $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null)
 +PYTHON_EMBED_LDFLAGS = $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
 +PYTHON_EMBED_LIBADD = $(call grep-libs,$(PYTHON_EMBED_LDOPTS))
 +PYTHON_EMBED_CCOPTS = $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)
 +FLAGS_PYTHON_EMBED = $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
 +
 +test-libpython:
 +	$(BUILD) $(FLAGS_PYTHON_EMBED)
 +
 +test-libpython-version:
 +	$(BUILD) $(FLAGS_PYTHON_EMBED)
 +
 +test-libbfd:
 +	$(BUILD) -DPACKAGE='"perf"' -lbfd -ldl
 +
 +test-liberty:
 +	$(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='"perf"' -lbfd -ldl -liberty
 +
 +test-liberty-z:
 +	$(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='"perf"' -lbfd -ldl -liberty -lz
 +
 +test-cplus-demangle:
 +	$(BUILD) -liberty
 +
 +test-on-exit:
 +	$(BUILD)
 +
 +test-backtrace:
 +	$(BUILD)
 +
 +test-timerfd:
 +	$(BUILD)
 +
 +-include *.d
 +
 +###############################
 +
 +clean:
 +	rm -f $(FILES) *.d
diff --cc tools/perf/config/feature-checks/test-all.c
index 59e7a705e14,00000000000..799865b6077
mode 100644,000000..100644
--- a/tools/perf/config/feature-checks/test-all.c
+++ b/tools/perf/config/feature-checks/test-all.c
@@@ -1,111 -1,0 +1,115 @@@
 +/*
 + * test-all.c: Try to build all the main testcases at once.
 + *
 + * A well-configured system will have all the prereqs installed, so we can speed
 + * up auto-detection on such systems.
 + */
 +
 +/*
 + * Quirk: Python and Perl headers cannot be in arbitrary places, so keep
 + * these 3 testcases at the top:
 + */
 +#define main main_test_libpython
 +# include "test-libpython.c"
 +#undef main
 +
 +#define main main_test_libpython_version
 +# include "test-libpython-version.c"
 +#undef main
 +
 +#define main main_test_libperl
 +# include "test-libperl.c"
 +#undef main
 +
 +#define main main_test_hello
 +# include "test-hello.c"
 +#undef main
 +
 +#define main main_test_libelf
 +# include "test-libelf.c"
 +#undef main
 +
 +#define main main_test_libelf_mmap
 +# include "test-libelf-mmap.c"
 +#undef main
 +
 +#define main main_test_glibc
 +# include "test-glibc.c"
 +#undef main
 +
 +#define main main_test_dwarf
 +# include "test-dwarf.c"
 +#undef main
 +
 +#define main main_test_libelf_getphdrnum
 +# include "test-libelf-getphdrnum.c"
 +#undef main
 +
 +#define main main_test_libunwind
 +# include "test-libunwind.c"
 +#undef main
 +
++#define main main_test_libunwind_debug_frame
++# include "test-libunwind-debug-frame.c"
++#undef main
++
 +#define main main_test_libaudit
 +# include "test-libaudit.c"
 +#undef main
 +
 +#define main main_test_libslang
 +# include "test-libslang.c"
 +#undef main
 +
 +#define main main_test_gtk2
 +# include "test-gtk2.c"
 +#undef main
 +
 +#define main main_test_gtk2_infobar
 +# include "test-gtk2-infobar.c"
 +#undef main
 +
 +#define main main_test_libbfd
 +# include "test-libbfd.c"
 +#undef main
 +
 +#define main main_test_on_exit
 +# include "test-on-exit.c"
 +#undef main
 +
 +#define main main_test_backtrace
 +# include "test-backtrace.c"
 +#undef main
 +
 +#define main main_test_libnuma
 +# include "test-libnuma.c"
 +#undef main
 +
 +#define main main_test_timerfd
 +# include "test-timerfd.c"
 +#undef main
 +
 +int main(int argc, char *argv[])
 +{
 +	main_test_libpython();
 +	main_test_libpython_version();
 +	main_test_libperl();
 +	main_test_hello();
 +	main_test_libelf();
 +	main_test_libelf_mmap();
 +	main_test_glibc();
 +	main_test_dwarf();
 +	main_test_libelf_getphdrnum();
 +	main_test_libunwind();
 +	main_test_libaudit();
 +	main_test_libslang();
 +	main_test_gtk2(argc, argv);
 +	main_test_gtk2_infobar(argc, argv);
 +	main_test_libbfd();
 +	main_test_on_exit();
 +	main_test_backtrace();
 +	main_test_libnuma();
 +	main_test_timerfd();
 +
 +	return 0;
 +}
diff --cc tools/perf/config/feature-checks/test-libunwind-debug-frame.c
index 00000000000,00000000000..0ef8087a104
new file mode 100644
--- /dev/null
+++ b/tools/perf/config/feature-checks/test-libunwind-debug-frame.c
@@@ -1,0 -1,0 +1,16 @@@
++#include <libunwind.h>
++#include <stdlib.h>
++
++extern int
++UNW_OBJ(dwarf_find_debug_frame) (int found, unw_dyn_info_t *di_debug,
++				 unw_word_t ip, unw_word_t segbase,
++				 const char *obj_name, unw_word_t start,
++				 unw_word_t end);
++
++#define dwarf_find_debug_frame UNW_OBJ(dwarf_find_debug_frame)
++
++int main(void)
++{
++	dwarf_find_debug_frame(0, NULL, 0, 0, NULL, 0, 0);
++	return 0;
++}