ARM: bootm: don't assume sp is in DRAM bank 0

arch_lmb_reserve() currently assumes that the stack pointer is within DRAM
bank 0. This is not necessarily true. Enhance the code to search through
DRAM banks until the bank that does contain SP is found, and then reserve
the tail of that bank.

Fixes: 2d1916e48b ("ARM: add flat device tree support")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
master
Stephen Warren 7 years ago committed by Tom Warren
parent f697471217
commit 15751403b6
  1. 15
      arch/arm/lib/bootm.c

@ -47,7 +47,8 @@ static ulong get_sp(void)
void arch_lmb_reserve(struct lmb *lmb) void arch_lmb_reserve(struct lmb *lmb)
{ {
ulong sp; ulong sp, bank_end;
int bank;
/* /*
* Booting a (Linux) kernel image * Booting a (Linux) kernel image
@ -63,8 +64,16 @@ void arch_lmb_reserve(struct lmb *lmb)
/* adjust sp by 4K to be safe */ /* adjust sp by 4K to be safe */
sp -= 4096; sp -= 4096;
lmb_reserve(lmb, sp, for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size - sp); if (sp < gd->bd->bi_dram[bank].start)
continue;
bank_end = gd->bd->bi_dram[bank].start +
gd->bd->bi_dram[bank].size;
if (sp >= bank_end)
continue;
lmb_reserve(lmb, sp, bank_end - sp);
break;
}
} }
__weak void board_quiesce_devices(void) __weak void board_quiesce_devices(void)

Loading…
Cancel
Save