From 4da4d3c9448a40a6e97d56cd6dc5db8d416e40b4 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Sat, 6 Sep 2014 01:04:09 -0500 Subject: [PATCH] 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 Original-Commit-Id: 6ec672e52eda69f2b5abb747807a496bb973088f Original-Change-Id: I247caac410894fb896dfb25a27c3a3213ef7f020 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/216429 Original-Reviewed-by: Furquan Shaikh Reviewed-on: http://review.coreboot.org/9036 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/soc/nvidia/tegra132/addressmap.c | 1 - src/soc/nvidia/tegra132/mmu_operations.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/src/soc/nvidia/tegra132/addressmap.c b/src/soc/nvidia/tegra132/addressmap.c index 4933484a7a..d7ade2f6d4 100644 --- a/src/soc/nvidia/tegra132/addressmap.c +++ b/src/soc/nvidia/tegra132/addressmap.c @@ -47,7 +47,6 @@ int sdram_size_mb(void) total_size = (read32(&mc->emem_cfg) >> MC_EMEM_CFG_SIZE_MB_SHIFT) & MC_EMEM_CFG_SIZE_MB_MASK; - printk(BIOS_DEBUG, "%s: Total SDRAM (MB): %u\n", __func__, total_size); return total_size; } diff --git a/src/soc/nvidia/tegra132/mmu_operations.c b/src/soc/nvidia/tegra132/mmu_operations.c index 6d6869849c..b2e1077f99 100644 --- a/src/soc/nvidia/tegra132/mmu_operations.c +++ b/src/soc/nvidia/tegra132/mmu_operations.c @@ -21,9 +21,6 @@ #include #include -#include -#include - #include #include "mmu_operations.h" #include @@ -31,19 +28,6 @@ /* This structure keeps track of all the mmap memory ranges for t132 */ 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) { uint64_t start,end; @@ -89,7 +73,6 @@ void tegra132_mmu_init(void) tegra132_memrange_init(map); mainboard_add_memory_ranges(map); - print_memranges(map); /* Place page tables at the base of the trust zone region. */ carveout_range(CARVEOUT_TZ, &tz_base_mib, &tz_size_mib); tz_base_mib *= MiB;