tegra132: remove printk() before console_init()
printk() shouldn't be called until the consoles have been initialized. This just so happened to work by luck. Once CONFIG_SMP is enabled that breaks because of spinlock usage in uncached memory. BUG=chrome-os-partner:31761 BRANCH=None TEST=Built with CONFIG_SMP and ramstage doesn't hang early. Change-Id: I4bf5d98e409840cf07a7759e9273d770f3bbf8bb Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 6ec672e52eda69f2b5abb747807a496bb973088f Original-Change-Id: I247caac410894fb896dfb25a27c3a3213ef7f020 Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/216429 Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: http://review.coreboot.org/9036 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
parent
0b0a1e3213
commit
4da4d3c944
|
@ -47,7 +47,6 @@ int sdram_size_mb(void)
|
||||||
total_size = (read32(&mc->emem_cfg) >> MC_EMEM_CFG_SIZE_MB_SHIFT) &
|
total_size = (read32(&mc->emem_cfg) >> MC_EMEM_CFG_SIZE_MB_SHIFT) &
|
||||||
MC_EMEM_CFG_SIZE_MB_MASK;
|
MC_EMEM_CFG_SIZE_MB_MASK;
|
||||||
|
|
||||||
printk(BIOS_DEBUG, "%s: Total SDRAM (MB): %u\n", __func__, total_size);
|
|
||||||
return total_size;
|
return total_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,6 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <memrange.h>
|
#include <memrange.h>
|
||||||
|
|
||||||
#include <cbmem.h>
|
|
||||||
#include <console/console.h>
|
|
||||||
|
|
||||||
#include <arch/mmu.h>
|
#include <arch/mmu.h>
|
||||||
#include "mmu_operations.h"
|
#include "mmu_operations.h"
|
||||||
#include <soc/addressmap.h>
|
#include <soc/addressmap.h>
|
||||||
|
@ -31,19 +28,6 @@
|
||||||
/* This structure keeps track of all the mmap memory ranges for t132 */
|
/* This structure keeps track of all the mmap memory ranges for t132 */
|
||||||
static struct memranges t132_mmap_ranges;
|
static struct memranges t132_mmap_ranges;
|
||||||
|
|
||||||
static void print_memranges(struct memranges *mmap_ranges)
|
|
||||||
{
|
|
||||||
struct range_entry *mmap_entry;
|
|
||||||
|
|
||||||
printk(BIOS_DEBUG,"printing mmap entries\n");
|
|
||||||
|
|
||||||
memranges_each_entry(mmap_entry, mmap_ranges) {
|
|
||||||
printk(BIOS_DEBUG,"0x%p 0x%p 0x%lx\n",
|
|
||||||
(void*)mmap_entry->begin,(void*)mmap_entry->end,mmap_entry->tag);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static void tegra132_memrange_init(struct memranges *map)
|
static void tegra132_memrange_init(struct memranges *map)
|
||||||
{
|
{
|
||||||
uint64_t start,end;
|
uint64_t start,end;
|
||||||
|
@ -89,7 +73,6 @@ void tegra132_mmu_init(void)
|
||||||
|
|
||||||
tegra132_memrange_init(map);
|
tegra132_memrange_init(map);
|
||||||
mainboard_add_memory_ranges(map);
|
mainboard_add_memory_ranges(map);
|
||||||
print_memranges(map);
|
|
||||||
/* Place page tables at the base of the trust zone region. */
|
/* Place page tables at the base of the trust zone region. */
|
||||||
carveout_range(CARVEOUT_TZ, &tz_base_mib, &tz_size_mib);
|
carveout_range(CARVEOUT_TZ, &tz_base_mib, &tz_size_mib);
|
||||||
tz_base_mib *= MiB;
|
tz_base_mib *= MiB;
|
||||||
|
|
Loading…
Reference in New Issue