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

Commit d4f4cf77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM updates from Russell King:

 - nommu updates from Afzal Mohammed cleaning up the vectors support

 - allow DMA memory "mapping" for nommu Benjamin Gaignard

 - fixing a correctness issue with R_ARM_PREL31 relocations in the
   module linker

 - add strlen() prototype for the decompressor

 - support for DEBUG_VIRTUAL from Florian Fainelli

 - adjusting memory bounds after memory reservations have been
   registered

 - unipher cache handling updates from Masahiro Yamada

 - initrd and Thumb Kconfig cleanups

* 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (23 commits)
  ARM: mm: round the initrd reservation to page boundaries
  ARM: mm: clean up initrd initialisation
  ARM: mm: move initrd init code out of arm_memblock_init()
  ARM: 8655/1: improve NOMMU definition of pgprot_*()
  ARM: 8654/1: decompressor: add strlen prototype
  ARM: 8652/1: cache-uniphier: clean up active way setup code
  ARM: 8651/1: cache-uniphier: include <linux/errno.h> instead of <linux/types.h>
  ARM: 8650/1: module: handle negative R_ARM_PREL31 addends correctly
  ARM: 8649/2: nommu: remove Hivecs configuration is asm
  ARM: 8648/2: nommu: display vectors base
  ARM: 8647/2: nommu: dynamic exception base address setting
  ARM: 8646/1: mmu: decouple VECTORS_BASE from Kconfig
  ARM: 8644/1: Reduce "CPU: shutdown" message to debug level
  ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol
  ARM: 8640/1: Add support for CONFIG_DEBUG_VIRTUAL
  ARM: 8639/1: Define KERNEL_START and KERNEL_END
  ARM: 8638/1: mtd: lart: Rename partition defines to be prefixed with PART_
  ARM: 8637/1: Adjust memory boundaries after reservations
  ARM: 8636/1: Cleanup sanity_check_meminfo
  ARM: add CPU_THUMB_CAPABLE to indicate possible Thumb support
  ...
parents f89db789 17a870be

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config ARM 
	bool

	default y

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_SET_MEMORY

arch/arm/Kconfig-nommu

+1 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ config PROCESSOR_ID 
	  used instead of the auto-probing which utilizes the register.



config REMAP_VECTORS_TO_RAM

	bool 'Install vectors to the beginning of RAM' if DRAM_BASE

	depends on DRAM_BASE

	bool 'Install vectors to the beginning of RAM'

	help

	  The kernel needs to change the hardware exception vectors.

	  In nommu mode, the hardware exception vectors are normally

arch/arm/boot/compressed/decompress.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern void error(char *); 


/* Not needed, but used in some headers pulled in by decompressors */

extern char * strstr(const char * s1, const char *s2);

extern size_t strlen(const char *s);



#ifdef CONFIG_KERNEL_GZIP

#include "../../../../lib/decompress_inflate.c"

arch/arm/common/mcpm_entry.c

+6 −6
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ extern unsigned long mcpm_entry_vectors[MAX_NR_CLUSTERS][MAX_CPUS_PER_CLUSTER]; 


void mcpm_set_entry_vector(unsigned cpu, unsigned cluster, void *ptr)

{

	unsigned long val = ptr ? virt_to_phys(ptr) : 0;

	unsigned long val = ptr ? __pa_symbol(ptr) : 0;

	mcpm_entry_vectors[cluster][cpu] = val;

	sync_cache_w(&mcpm_entry_vectors[cluster][cpu]);

}
@@ -299,8 +299,8 @@ void mcpm_cpu_power_down(void) 
	 * the kernel as if the power_up method just had deasserted reset

	 * on the CPU.

	 */

	phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);

	phys_reset(virt_to_phys(mcpm_entry_point));

	phys_reset = (phys_reset_t)(unsigned long)__pa_symbol(cpu_reset);

	phys_reset(__pa_symbol(mcpm_entry_point));



	/* should never get here */

	BUG();
@@ -388,8 +388,8 @@ static int __init nocache_trampoline(unsigned long _arg) 
	__mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN);

	__mcpm_cpu_down(cpu, cluster);



	phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);

	phys_reset(virt_to_phys(mcpm_entry_point));

	phys_reset = (phys_reset_t)(unsigned long)__pa_symbol(cpu_reset);

	phys_reset(__pa_symbol(mcpm_entry_point));

	BUG();

}
@@ -449,7 +449,7 @@ int __init mcpm_sync_init( 
	sync_cache_w(&mcpm_sync);



	if (power_up_setup) {

		mcpm_power_up_setup_phys = virt_to_phys(power_up_setup);

		mcpm_power_up_setup_phys = __pa_symbol(power_up_setup);

		sync_cache_w(&mcpm_power_up_setup_phys);

	}

arch/arm/include/asm/hardware/cache-uniphier.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#ifndef __CACHE_UNIPHIER_H

#define __CACHE_UNIPHIER_H



#include <linux/types.h>

#include <linux/errno.h>



#ifdef CONFIG_CACHE_UNIPHIER

int uniphier_cache_init(void);