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

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

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

Pull ARM fixes from Russell King:
 "Three relatively small fixes for ARM:

   - Roger noticed that dma_max_pfn() was calculating the upper limit
     wrongly, by adding the PFN offset of memory twice.

   - A fix from Robin to correct parsing of MPIDR values when the
     address size is larger than one BE32 unit.

   - A fix from Srinivas to ensure that we do not rely on the boot
     loader (or previous Linux kernel) setting the translation table
     base register a certain way in the decompressor, which can lead to
     crashes"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8618/1: decompressor: reset ttbcr fields to use TTBR0 on ARMv7
  ARM: 8617/1: dma: fix dma_max_pfn()
  ARM: 8616/1: dt: Respect property size when parsing CPUs
parents be67d60b 117e5e9c

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ __armv7_mmu_cache_on: 
		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

		bic     r6, r6, #(7 << 0) | (1 << 4)	@ 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

arch/arm/include/asm/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) 
/* The ARM override for dma_max_pfn() */

static inline unsigned long dma_max_pfn(struct device *dev)

{

	return PHYS_PFN_OFFSET + dma_to_pfn(dev, *dev->dma_mask);

	return dma_to_pfn(dev, *dev->dma_mask);

}

#define dma_max_pfn(dev) dma_max_pfn(dev)

arch/arm/kernel/devtree.c

+11 −3
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ void __init arm_dt_init_cpu_maps(void) 
		return;



	for_each_child_of_node(cpus, cpu) {

		const __be32 *cell;

		int prop_bytes;

		u32 hwid;



		if (of_node_cmp(cpu->type, "cpu"))
@@ -99,7 +101,8 @@ void __init arm_dt_init_cpu_maps(void) 
		 * properties is considered invalid to build the

		 * cpu_logical_map.

		 */

		if (of_property_read_u32(cpu, "reg", &hwid)) {

		cell = of_get_property(cpu, "reg", &prop_bytes);

		if (!cell || prop_bytes < sizeof(*cell)) {

			pr_debug(" * %s missing reg property\n",

				     cpu->full_name);

			of_node_put(cpu);
@@ -107,10 +110,15 @@ void __init arm_dt_init_cpu_maps(void) 
		}



		/*

		 * 8 MSBs must be set to 0 in the DT since the reg property

		 * Bits n:24 must be set to 0 in the DT since the reg property

		 * defines the MPIDR[23:0].

		 */

		if (hwid & ~MPIDR_HWID_BITMASK) {

		do {

			hwid = be32_to_cpu(*cell++);

			prop_bytes -= sizeof(*cell);

		} while (!hwid && prop_bytes > 0);



		if (prop_bytes || (hwid & ~MPIDR_HWID_BITMASK)) {

			of_node_put(cpu);

			return;

		}