Commit 2d1eb87a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM changes from Russell King:

 - Perf updates from Will Deacon:
   - Support for Qualcomm Krait processors (run perf on your phone!)
   - Support for Cortex-A12 (run perf stat on your FPGA!)
   - Support for perf_sample_event_took, allowing us to automatically decrease
     the sample rate if we can't handle the PMU interrupts quickly enough
     (run perf record on your FPGA!).

 - Basic uprobes support from David Long:
     This patch series adds basic uprobes support to ARM. It is based on
     patches developed earlier by Rabin Vincent. That approach of adding
     hooks into the kprobes instruction parsing code was not well received.
     This approach separates the ARM instruction parsing code in kprobes out
     into a separate set of functions which can be used by both kprobes and
     uprobes. Both kprobes and uprobes then provide their own semantic action
     tables to process the results of the parsing.

 - ARMv7M (microcontroller) updates from Uwe Kleine-König

 - OMAP DMA updates (recently added Vinod's Ack even though they've been
   sitting in linux-next for a few months) to reduce the reliance of
   omap-dma on the code in arch/arm.

 - SA11x0 changes from Dmitry Eremin-Solenikov and Alexander Shiyan

 - Support for Cortex-A12 CPU

 - Align support for ARMv6 with ARMv7 so they can cooperate better in a
   single zImage.

 - Addition of first AT_HWCAP2 feature bits for ARMv8 crypto support.

 - Removal of IRQ_DISABLED from various ARM files

 - Improved efficiency of virt_to_page() for single zImage

 - Patch from Ulf Hansson to permit runtime PM callbacks to be available for
   AMBA devices for suspend/resume as well.

 - Finally kill asm/system.h on ARM.

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (89 commits)
  dmaengine: omap-dma: more consolidation of CCR register setup
  dmaengine: omap-dma: move IRQ handling to omap-dma
  dmaengine: omap-dma: move register read/writes into omap-dma.c
  ARM: omap: dma: get rid of 'p' allocation and clean up
  ARM: omap: move dma channel allocation into plat-omap code
  ARM: omap: dma: get rid of errata global
  ARM: omap: clean up DMA register accesses
  ARM: omap: remove almost-const variables
  ARM: omap: remove references to disable_irq_lch
  dmaengine: omap-dma: cleanup errata 3.3 handling
  dmaengine: omap-dma: provide register read/write functions
  dmaengine: omap-dma: use cached CCR value when enabling DMA
  dmaengine: omap-dma: move barrier to omap_dma_start_desc()
  dmaengine: omap-dma: move clnk_ctrl setting to preparation functions
  dmaengine: omap-dma: improve efficiency loading C.SA/C.EI/C.FI registers
  dmaengine: omap-dma: consolidate clearing channel status register
  dmaengine: omap-dma: move CCR buffering disable errata out of the fast path
  dmaengine: omap-dma: provide register definitions
  dmaengine: omap-dma: consolidate setup of CCR
  dmaengine: omap-dma: consolidate setup of CSDP
  ...
parents 2f997759 bce5669b

Documentation/devicetree/bindings/arm/pmu.txt

+9 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
- compatible : should be one of

	"arm,armv8-pmuv3"

	"arm,cortex-a15-pmu"

	"arm,cortex-a12-pmu"

	"arm,cortex-a9-pmu"

	"arm,cortex-a8-pmu"

	"arm,cortex-a7-pmu"
@@ -16,7 +17,14 @@ Required properties: 
	"arm,arm11mpcore-pmu"

	"arm,arm1176-pmu"

	"arm,arm1136-pmu"

- interrupts : 1 combined interrupt or 1 per core.

	"qcom,krait-pmu"

- interrupts : 1 combined interrupt or 1 per core. If the interrupt is a per-cpu

               interrupt (PPI) then 1 interrupt should be specified.



Optional properties:



- qcom,no-pc-write : Indicates that this PMU doesn't support the 0xc and 0xd

                     events.



Example:

arch/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -86,9 +86,7 @@ config KPROBES_ON_FTRACE 
	 optimize on top of function tracing.



config UPROBES

	bool "Transparent user-space probes (EXPERIMENTAL)"

	depends on UPROBE_EVENT && PERF_EVENTS

	default n

	def_bool n

	select PERCPU_RWSEM

	help

	  Uprobes is the user-space counterpart to kprobes: they
@@ -101,8 +99,6 @@ config UPROBES 
	    managed by the kernel and kept transparent to the probed

	    application. )



	  If in doubt, say "N".



config HAVE_64BIT_ALIGNED_ACCESS

	def_bool 64BIT && !HAVE_EFFICIENT_UNALIGNED_ACCESS

	help

arch/arm/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -207,6 +207,9 @@ config ZONE_DMA 
config NEED_DMA_MAP_STATE

       def_bool y



config ARCH_SUPPORTS_UPROBES

	def_bool y



config ARCH_HAS_DMA_SET_COHERENT_MASK

	bool
@@ -2271,7 +2274,7 @@ source "kernel/power/Kconfig" 
config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5PC100

	depends on CPU_ARM920T || CPU_ARM926T || CPU_FEROCEON || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_V7M || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK

	def_bool y



config ARM_CPU_SUSPEND

arch/arm/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o 
obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o

obj-$(CONFIG_ARM_TIMER_SP804)	+= timer-sp.o

obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o

CFLAGS_REMOVE_mcpm_entry.o	= -pg

AFLAGS_mcpm_head.o		:= -march=armv7-a

AFLAGS_vlock.o			:= -march=armv7-a

obj-$(CONFIG_TI_PRIV_EDMA)	+= edma.o

arch/arm/common/scoop.c

+0 −2
Original line number Diff line number Diff line
@@ -232,8 +232,6 @@ static int scoop_probe(struct platform_device *pdev) 


	return 0;



	if (devptr->gpio.base != -1)

		temp = gpiochip_remove(&devptr->gpio);

err_gpio:

	platform_set_drvdata(pdev, NULL);

err_ioremap:

CRA Git | Maintained and supported by SUSTech CRA and CCSE