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

Commit de06dbfa 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 updates from Russell King:
 "Another mixture of changes this time around:

   - Split XIP linker file from main linker file to make it more
     maintainable, and various XIP fixes, and clean up a resulting
     macro.

   - Decompressor cleanups from Masahiro Yamada

   - Avoid printing an error for a missing L2 cache

   - Remove some duplicated symbols in System.map, and move
     vectors/stubs back into kernel VMA

   - Various low priority fixes from Arnd

   - Updates to allow bus match functions to return negative errno
     values, touching some drivers and the driver core.  Greg has acked
     these changes.

   - Virtualisation platform udpates form Jean-Philippe Brucker.

   - Security enhancements from Kees Cook

   - Rework some Kconfig dependencies and move PSCI idle management code
     out of arch/arm into drivers/firmware/psci.c

   - ARM DMA mapping updates, touching media, acked by Mauro.

   - Fix places in ARM code which should be using virt_to_idmap() so
     that Keystone2 can work.

   - Fix Marvell Tauros2 to work again with non-DT boots.

   - Provide a delay timer for ARM Orion platforms"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (45 commits)
  ARM: 8546/1: dma-mapping: refactor to fix coherent+cma+gfp=0
  ARM: 8547/1: dma-mapping: store buffer information
  ARM: 8543/1: decompressor: rename suffix_y to compress-y
  ARM: 8542/1: decompressor: merge piggy.*.S and simplify Makefile
  ARM: 8541/1: decompressor: drop redundant FORCE in Makefile
  ARM: 8540/1: decompressor: use clean-files instead of extra-y to clean files
  ARM: 8539/1: decompressor: drop more unneeded assignments to "targets"
  ARM: 8538/1: decompressor: drop unneeded assignments to "targets"
  ARM: 8532/1: uncompress: mark putc as inline
  ARM: 8531/1: turn init_new_context into an inline function
  ARM: 8530/1: remove VIRT_TO_BUS
  ARM: 8537/1: drop unused DEBUG_RODATA from XIP_KERNEL
  ARM: 8536/1: mm: hide __start_rodata_section_aligned for non-debug builds
  ARM: 8535/1: mm: DEBUG_RODATA makes no sense with XIP_KERNEL
  ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs
  ARM: make the physical-relative calculation more obvious
  ARM: 8512/1: proc-v7.S: Adjust stack address when XIP_KERNEL
  ARM: 8411/1: Add default SPARSEMEM settings
  ARM: 8503/1: clk_register_clkdev: remove format string interface
  ARM: 8529/1: remove 'i' and 'zi' targets
  ...
parents b31a3bc3 1b3bf847

Documentation/DMA-attributes.txt

+26 −0
Original line number Diff line number Diff line
@@ -100,3 +100,29 @@ allocated by dma_alloc_attrs() function from individual pages if it can 
be mapped as contiguous chunk into device dma address space. By

specifying this attribute the allocated buffer is forced to be contiguous

also in physical memory.



DMA_ATTR_ALLOC_SINGLE_PAGES

---------------------------



This is a hint to the DMA-mapping subsystem that it's probably not worth

the time to try to allocate memory to in a way that gives better TLB

efficiency (AKA it's not worth trying to build the mapping out of larger

pages).  You might want to specify this if:

- You know that the accesses to this memory won't thrash the TLB.

  You might know that the accesses are likely to be sequential or

  that they aren't sequential but it's unlikely you'll ping-pong

  between many addresses that are likely to be in different physical

  pages.

- You know that the penalty of TLB misses while accessing the

  memory will be small enough to be inconsequential.  If you are

  doing a heavy operation like decryption or decompression this

  might be the case.

- You know that the DMA mapping is fairly transitory.  If you expect

  the mapping to have a short lifetime then it may be worth it to

  optimize allocation (avoid coming up with large pages) instead of

  getting the slight performance win of larger pages.

Setting this hint doesn't guarantee that you won't get huge pages, but it

means that we won't try quite as hard to get them.



NOTE: At the moment DMA_ATTR_ALLOC_SINGLE_PAGES is only implemented on ARM,

though ARM64 patches will likely be posted soon.

Documentation/driver-model/porting.txt

+4 −2
Original line number Diff line number Diff line
@@ -340,8 +340,10 @@ comparison: 


  int (*match)(struct device * dev, struct device_driver * drv);



match should return '1' if the driver supports the device, and '0'

otherwise. 

match should return positive value if the driver supports the device,

and zero otherwise. It may also return error code (for example

-EPROBE_DEFER) if determining that given driver supports the device is

not possible.



When a device is registered, the bus's list of drivers is iterated

over. bus->match() is called for each one until a match is found.

arch/arm/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -572,7 +572,6 @@ config ARCH_RPC 
	select NEED_MACH_IO_H

	select NEED_MACH_MEMORY_H

	select NO_IOPORT_MAP

	select VIRT_TO_BUS

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -1336,7 +1335,6 @@ config BIG_LITTLE 
config BL_SWITCHER

	bool "big.LITTLE switcher support"

	depends on BIG_LITTLE && MCPM && HOTPLUG_CPU && ARM_GIC

	select ARM_CPU_SUSPEND

	select CPU_PM

	help

	  The big.LITTLE "switcher" provides the core functionality to
@@ -2110,7 +2108,8 @@ config ARCH_SUSPEND_POSSIBLE 
	def_bool y



config ARM_CPU_SUSPEND

	def_bool PM_SLEEP

	def_bool PM_SLEEP || BL_SWITCHER || ARM_PSCI_FW

	depends on ARCH_SUSPEND_POSSIBLE



config ARCH_HIBERNATION_POSSIBLE

	bool

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ archclean: 


# My testing targets (bypasses dependencies)

bp:;	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage

i zi:;	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@





define archhelp

arch/arm/boot/Makefile

+1 −9
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ $(obj)/bootpImage: $(obj)/bootp/bootp FORCE 
	$(call if_changed,objcopy)

	@$(kecho) '  Kernel: $@ is ready'



PHONY += initrd FORCE

PHONY += initrd

initrd:

	@test "$(INITRD_PHYS)" != "" || \

	(echo This machine does not support INITRD; exit -1)
@@ -107,12 +107,4 @@ uinstall: 
	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/uImage System.map "$(INSTALL_PATH)"



zi:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/zImage System.map "$(INSTALL_PATH)"



i:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/Image System.map "$(INSTALL_PATH)"



subdir-	    := bootp compressed dts