Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/44x: boot wrapper: allow kernel to load into non-zero address

For AMP, different kernel instances load into separate memory regions.
Read the start of memory from the device tree and limit the memory to what's
specified in the device tree.

Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

authored by

Dave Kleikamp and committed by
Josh Boyer
e817513b 91b191c7

+22 -1
+22 -1
arch/powerpc/boot/treeboot-iss4xx.c
··· 34 34 35 35 BSS_STACK(4096); 36 36 37 + static u32 ibm4xx_memstart; 38 + 37 39 static void iss_4xx_fixups(void) 38 40 { 39 - ibm4xx_sdram_fixup_memsize(); 41 + void *memory; 42 + u32 reg[3]; 43 + 44 + memory = finddevice("/memory"); 45 + if (!memory) 46 + fatal("Can't find memory node\n"); 47 + /* This assumes #address-cells = 2, #size-cells =1 and that */ 48 + getprop(memory, "reg", reg, sizeof(reg)); 49 + if (reg[2]) 50 + /* If the device tree specifies the memory range, use it */ 51 + ibm4xx_memstart = reg[1]; 52 + else 53 + /* othersize, read it from the SDRAM controller */ 54 + ibm4xx_sdram_fixup_memsize(); 55 + } 56 + 57 + static void *iss_4xx_vmlinux_alloc(unsigned long size) 58 + { 59 + return (void *)ibm4xx_memstart; 40 60 } 41 61 42 62 #define SPRN_PIR 0x11E /* Processor Indentification Register */ ··· 68 48 69 49 simple_alloc_init(_end, avail_ram, 128, 64); 70 50 platform_ops.fixups = iss_4xx_fixups; 51 + platform_ops.vmlinux_alloc = iss_4xx_vmlinux_alloc; 71 52 platform_ops.exit = ibm44x_dbcr_reset; 72 53 pir_reg = mfspr(SPRN_PIR); 73 54 fdt_set_boot_cpuid_phys(_dtb_start, pir_reg);