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

Commit 8507876a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM fixes from Russell King:
 "It's been a while...  so there's a little more here than normal.

  Mostly updates from Will for the breakpoint stuff, and plugging a few
  holes in the user access functions which crept in when domain support
  was disabled for ARMv7 CPUs."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7529/1: delay: set loops_per_jiffy when moving to timer-based loop
  ARM: 7528/1: uaccess: annotate [__]{get,put}_user functions with might_fault()
  ARM: 7527/1: uaccess: explicitly check __user pointer when !CPU_USE_DOMAINS
  ARM: 7526/1: traps: send SIGILL if get_user fails on undef handling path
  ARM: 7521/1: Fix semihosting Kconfig text
  ARM: 7513/1: Make sure dtc is built before running it
  ARM: 7512/1: Fix XIP build due to PHYS_OFFSET definition moving
  ARM: 7499/1: mm: Fix vmalloc overlap check for !HIGHMEM
  ARM: 7503/1: mm: only flush both pmd entries for classic MMU
  ARM: 7502/1: contextidr: avoid using bfi instruction during notifier
  ARM: 7501/1: decompressor: reset ttbcr for VMSA ARMv7 cores
  ARM: 7497/1: hw_breakpoint: allow single-byte watchpoints on all addresses
  ARM: 7496/1: hw_breakpoint: don't rely on dfsr to show watchpoint access type
  ARM: Fix ioremap() of address zero
parents 22b4e63e beafa0de

arch/arm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -356,11 +356,11 @@ choice 
		  is nothing connected to read from the DCC.



	config DEBUG_SEMIHOSTING

		bool "Kernel low-level debug output via semihosting I"

		bool "Kernel low-level debug output via semihosting I/O"

		help

		  Semihosting enables code running on an ARM target to use

		  the I/O facilities on a host debugger/emulator through a

		  simple SVC calls. The host debugger or emulator must have

		  simple SVC call. The host debugger or emulator must have

		  semihosting enabled for the special svc call to be trapped

		  otherwise the kernel will crash.

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -284,10 +284,10 @@ zImage Image xipImage bootpImage uImage: vmlinux 
zinstall uinstall install: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



%.dtb:

%.dtb: scripts

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@



dtbs:

dtbs: scripts

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@



# We use MRPROPER_FILES and CLEAN_FILES now

arch/arm/boot/compressed/head.S

+4 −0
Original line number Diff line number Diff line
@@ -659,10 +659,14 @@ __armv7_mmu_cache_on: 
#ifdef CONFIG_CPU_ENDIAN_BE8

		orr	r0, r0, #1 << 25	@ big-endian page tables

#endif

		mrcne   p15, 0, r6, c2, c0, 2   @ read ttb control reg

		orrne	r0, r0, #1		@ MMU enabled

		movne	r1, #0xfffffffd		@ domain 0 = client

		bic     r6, r6, #1 << 31        @ 32-bit translation system

		bic     r6, r6, #3 << 0         @ use only ttbr0

		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer

		mcrne	p15, 0, r1, c3, c0, 0	@ load domain access control

		mcrne   p15, 0, r6, c2, c0, 2   @ load ttb control

#endif

		mcr	p15, 0, r0, c7, c5, 4	@ ISB

		mcr	p15, 0, r0, c1, c0, 0	@ load control register

arch/arm/include/asm/assembler.h

+8 −0
Original line number Diff line number Diff line
@@ -320,4 +320,12 @@ 
	.size \name , . - \name

	.endm



	.macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req

#ifndef CONFIG_CPU_USE_DOMAINS

	adds	\tmp, \addr, #\size - 1

	sbcccs	\tmp, \tmp, \limit

	bcs	\bad

#endif

	.endm



#endif /* __ASM_ASSEMBLER_H__ */

arch/arm/include/asm/memory.h

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ static inline unsigned long __phys_to_virt(unsigned long x) 
#define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)

#endif

#endif

#endif /* __ASSEMBLY__ */



#ifndef PHYS_OFFSET

#ifdef PLAT_PHYS_OFFSET
@@ -196,6 +197,8 @@ static inline unsigned long __phys_to_virt(unsigned long x) 
#endif

#endif



#ifndef __ASSEMBLY__



/*

 * PFNs are used to describe any physical page; this means

 * PFN 0 == physical address 0.