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

Commit c489d98c 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:
 "Included in this update:

   - perf updates from Will Deacon:

     The main changes are callchain stability fixes from Jean Pihet and
     event mapping and PMU name rework from Mark Rutland

     The latter is preparatory work for enabling some code re-use with
     arm64 in the future.

   - updates for nommu from Uwe Kleine-König:

     Two different fixes for the same problem making some ARM nommu
     configurations not boot since 3.6-rc1.  The problem is that
     user_addr_max returned the biggest available RAM address which
     makes some copy_from_user variants fail to read from XIP memory.

   - deprecate legacy OMAP DMA API, in preparation for it's removal.

     The popular drivers have been converted over, leaving a very small
     number of rarely used drivers, which hopefully can be converted
     during the next cycle with a bit more visibility (and hopefully
     people popping out of the woodwork to help test)

   - more tweaks for BE systems, particularly with the kernel image
     format.  In connection with this, I've cleaned up the way we
     generate the linker script for the decompressor.

   - removal of hard-coded assumptions of the kernel stack size, making
     everywhere depend on the value of THREAD_SIZE_ORDER.

   - MCPM updates from Nicolas Pitre.

   - Make it easier for proper CPU part number checks (which should
     always include the vendor field).

   - Assembly code optimisation - use the "bx" instruction when
     returning from a function on ARMv6+ rather than "mov pc, reg".

   - Save the last kernel misaligned fault location and report it via
     the procfs alignment file.

   - Clean up the way we create the initial stack frame, which is a
     repeated pattern in several different locations.

   - Support for 8-byte get_user(), needed for some DRM implementations.

   - mcs locking from Will Deacon.

   - Save and restore a few more Cortex-A9 registers (for errata
     workarounds)

   - Fix various aspects of the SWP emulation, and the ELF hwcap for the
     SWP instruction.

   - Update LPAE logic for pte_write and pmd_write to make it more
     correct.

   - Support for Broadcom Brahma15 CPU cores.

   - ARM assembly crypto updates from Ard Biesheuvel"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (53 commits)
  ARM: add comments to the early page table remap code
  ARM: 8122/1: smp_scu: enable SCU standby support
  ARM: 8121/1: smp_scu: use macro for SCU enable bit
  ARM: 8120/1: crypto: sha512: add ARM NEON implementation
  ARM: 8119/1: crypto: sha1: add ARM NEON implementation
  ARM: 8118/1: crypto: sha1/make use of common SHA-1 structures
  ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>
  ARM: 8111/1: Enable erratum 798181 for Broadcom Brahma-B15
  ARM: 8110/1: do CPU-specific init for Broadcom Brahma15 cores
  ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE
  ARM: 8108/1: mm: Introduce {pte,pmd}_isset and {pte,pmd}_isclear
  ARM: hwcap: disable HWCAP_SWP if the CPU advertises it has exclusives
  ARM: SWP emulation: only initialise on ARMv7 CPUs
  ARM: SWP emulation: always enable when SMP is enabled
  ARM: 8103/1: save/restore Cortex-A9 CP15 registers on suspend/resume
  ARM: 8098/1: mcs lock: implement wfe-based polling for MCS locking
  ARM: 8091/2: add get_user() support for 8 byte types
  ARM: 8097/1: unistd.h: relocate comments back to place
  ARM: 8096/1: Describe required sort order for textofs-y (TEXT_OFFSET)
  ARM: 8090/1: add revision info for PL310 errata 588369 and 727915
  ...
parents f67d251a f15bdfe4

arch/arm/Kconfig

+15 −2
Original line number Diff line number Diff line
@@ -263,8 +263,22 @@ config NEED_MACH_MEMORY_H 


config PHYS_OFFSET

	hex "Physical address of main memory" if MMU

	depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H

	depends on !ARM_PATCH_PHYS_VIRT

	default DRAM_BASE if !MMU

	default 0x00000000 if ARCH_EBSA110 || \

			EP93XX_SDCE3_SYNC_PHYS_OFFSET || \

			ARCH_FOOTBRIDGE || \

			ARCH_INTEGRATOR || \

			ARCH_IOP13XX || \

			ARCH_KS8695 || \

			(ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET)

	default 0x10000000 if ARCH_OMAP1 || ARCH_RPC

	default 0x20000000 if ARCH_S5PV210

	default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET

	default 0xc0000000 if EP93XX_SDCE0_PHYS_OFFSET || ARCH_SA1100

	default 0xd0000000 if EP93XX_SDCE1_PHYS_OFFSET

	default 0xe0000000 if EP93XX_SDCE2_PHYS_OFFSET

	default 0xf0000000 if EP93XX_SDCE3_ASYNC_PHYS_OFFSET

	help

	  Please provide the physical address corresponding to the

	  location of main memory in your system.
@@ -436,7 +450,6 @@ config ARCH_EP93XX 
	select ARM_VIC

	select CLKDEV_LOOKUP

	select CPU_ARM920T

	select NEED_MACH_MEMORY_H

	help

	  This enables support for the Cirrus EP93xx series of CPUs.

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ CHECKFLAGS += -D__arm__ 


#Default value

head-y		:= arch/arm/kernel/head$(MMUEXT).o



# Text offset. This list is sorted numerically by address in order to

# provide a means to avoid/resolve conflicts in multi-arch kernels.

textofs-y	:= 0x00008000

textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000

# We don't want the htc bootloader to corrupt kernel during resume

arch/arm/boot/compressed/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ ZTEXTADDR := 0 
ZBSSADDR	:= ALIGN(8)

endif



SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/

CPPFLAGS_vmlinux.lds := -DTEXT_START="$(ZTEXTADDR)" -DBSS_START="$(ZBSSADDR)"



suffix_$(CONFIG_KERNEL_GZIP) = gzip

suffix_$(CONFIG_KERNEL_LZO)  = lzo
@@ -199,8 +199,5 @@ CFLAGS_font.o := -Dstatic= 
$(obj)/font.c: $(FONTC)

	$(call cmd,shipped)



$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KCONFIG_CONFIG)

	@sed "$(SEDFLAGS)" < $< > $@



$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S

	$(call cmd,shipped)

arch/arm/boot/compressed/head.S

+5 −3
Original line number Diff line number Diff line
@@ -125,9 +125,11 @@ start: 
 THUMB(		adr	r12, BSYM(1f)	)

 THUMB(		bx	r12		)



		.word	0x016f2818		@ Magic numbers to help the loader

		.word	start			@ absolute load/run zImage address

		.word	_edata			@ zImage end address

		.word	_magic_sig	@ Magic numbers to help the loader

		.word	_magic_start	@ absolute load/run zImage address

		.word	_magic_end	@ zImage end address

		.word	0x04030201	@ endianness flag



 THUMB(		.thumb			)

1:

 ARM_BE8(	setend	be )			@ go BE8 if compiled for BE8

arch/arm/boot/compressed/vmlinux.lds.in→arch/arm/boot/compressed/vmlinux.lds.S

+14 −3
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/boot/compressed/vmlinux.lds.in

 *

 *  Copyright (C) 2000 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifdef CONFIG_CPU_ENDIAN_BE8

#define ZIMAGE_MAGIC(x) ( (((x) >> 24) & 0x000000ff) | \

			  (((x) >>  8) & 0x0000ff00) | \

			  (((x) <<  8) & 0x00ff0000) | \

			  (((x) << 24) & 0xff000000) )

#else

#define ZIMAGE_MAGIC(x) (x)

#endif



OUTPUT_ARCH(arm)

ENTRY(_start)

SECTIONS
@@ -57,6 +65,10 @@ SECTIONS 
  .pad			: { BYTE(0); . = ALIGN(8); }

  _edata = .;



  _magic_sig = ZIMAGE_MAGIC(0x016f2818);

  _magic_start = ZIMAGE_MAGIC(_start);

  _magic_end = ZIMAGE_MAGIC(_edata);



  . = BSS_START;

  __bss_start = .;

  .bss			: { *(.bss) }
@@ -73,4 +85,3 @@ SECTIONS 
  .stab.indexstr 0	: { *(.stab.indexstr) }

  .comment 0		: { *(.comment) }

}