7a2ce81722
Now that we have timestamps in pre-RAM stages, let's actually make use of them. This patch adds several timestamps to both the bootblock and especially the verstage to allow more fine-grained boot time tracking. Some of the introduced timestamps can appear more than once per boot. This doesn't seem to be a problem for both coreboot and the cbmem utility, and the context makes it clear which operation was timestamped at what point. Also simplifies cbmem's timestamp printing routine a bit, fixing a display bug when a timestamp had a section of exactly ",000," in it (e.g. 1,000,185). BRANCH=None BUG=None TEST=Booted Pinky, Blaze and Falco, confirmed that all timestamps show up and contained sane values. Booted Storm (no timestamps here since it doesn't support pre-RAM timestamps yet). Change-Id: I5979bfa9445a9e0aba98ffdf8006c21096743456 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/234063 Reviewed-by: Aaron Durbin <adurbin@chromium.org>
112 lines
3.6 KiB
C
112 lines
3.6 KiB
C
/*
|
|
* This file is part of the coreboot project.
|
|
*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/* This file contains macro definitions for memlayout.ld linker scripts. */
|
|
|
|
#ifndef __MEMLAYOUT_H
|
|
#define __MEMLAYOUT_H
|
|
|
|
#include <arch/memlayout.h>
|
|
|
|
#define STR(x) #x
|
|
|
|
#define SET_COUNTER(name, addr) \
|
|
_ = ASSERT(. <= addr, STR(name overlaps the previous region!)); \
|
|
. = addr;
|
|
|
|
#define SYMBOL(name, addr) \
|
|
SET_COUNTER(name, addr) \
|
|
_##name = .;
|
|
|
|
#define REGION(name, addr, size, expected_align) \
|
|
SYMBOL(name, addr) \
|
|
_ = ASSERT(. == ALIGN(expected_align), \
|
|
STR(name must be aligned to expected_align!)); \
|
|
SYMBOL(e##name, addr + size)
|
|
|
|
/* Declare according to SRAM/DRAM ranges in SoC hardware-defined address map. */
|
|
#define SRAM_START(addr) SYMBOL(sram, addr)
|
|
|
|
#define SRAM_END(addr) SYMBOL(esram, addr)
|
|
|
|
#define DRAM_START(addr) SYMBOL(dram, addr)
|
|
|
|
/* Coordinate asserted minimum size with timestamp.c and x86 romstage.ld! */
|
|
#define TIMESTAMP(addr, size) \
|
|
REGION(timestamp, addr, size, 8) \
|
|
_ = ASSERT(size >= 0x180, "Timestamp region must fit timestamp_cache!");
|
|
|
|
#define PRERAM_CBMEM_CONSOLE(addr, size) \
|
|
REGION(preram_cbmem_console, addr, size, 4) \
|
|
_ = ASSERT(size <= CONFIG_CONSOLE_CBMEM_BUFFER_SIZE, \
|
|
"pre-RAM CBMEM console size must not be larger than post-RAM!");
|
|
|
|
/* Use either CBFS_CACHE (unified) or both (PRERAM|POSTRAM)_CBFS_CACHE */
|
|
#define CBFS_CACHE(addr, size) REGION(cbfs_cache, addr, size, 4)
|
|
|
|
/* TODO: This only works if you never access CBFS in romstage before RAM is up!
|
|
* If you need to change that assumption, you have some work ahead of you... */
|
|
#if defined(__PRE_RAM__) && !defined(__ROMSTAGE__)
|
|
#define PRERAM_CBFS_CACHE(addr, size) CBFS_CACHE(addr, size)
|
|
#define POSTRAM_CBFS_CACHE(addr, size) \
|
|
REGION(unused_cbfs_cache, addr, size, 4)
|
|
#else
|
|
#define PRERAM_CBFS_CACHE(addr, size) \
|
|
REGION(unused_cbfs_cache, addr, size, 4)
|
|
#define POSTRAM_CBFS_CACHE(addr, size) CBFS_CACHE(addr, size)
|
|
#endif
|
|
|
|
/* Careful: 'INCLUDE <filename>' must always be at the end of the output line */
|
|
#ifdef __BOOTBLOCK__
|
|
#define BOOTBLOCK(addr, sz) \
|
|
SET_COUNTER(bootblock, addr) \
|
|
_ = ASSERT(_ebootblock - _bootblock <= sz, \
|
|
STR(Bootblock exceeded its allotted size! (sz))); \
|
|
INCLUDE "lib/bootblock.bootblock.ld"
|
|
#else
|
|
#define BOOTBLOCK(addr, sz) \
|
|
SET_COUNTER(bootblock, addr) \
|
|
. += sz;
|
|
#endif
|
|
|
|
#ifdef __ROMSTAGE__
|
|
#define ROMSTAGE(addr, sz) \
|
|
SET_COUNTER(romstage, addr) \
|
|
_ = ASSERT(_eromstage - _romstage <= sz, \
|
|
STR(Romstage exceeded its allotted size! (sz))); \
|
|
INCLUDE "lib/romstage.romstage.ld"
|
|
#else
|
|
#define ROMSTAGE(addr, sz) \
|
|
SET_COUNTER(romstage, addr) \
|
|
. += sz;
|
|
#endif
|
|
|
|
#ifdef __RAMSTAGE__
|
|
#define RAMSTAGE(addr, sz) \
|
|
SET_COUNTER(ramstage, addr) \
|
|
_ = ASSERT(_eramstage - _ramstage <= sz, \
|
|
STR(Ramstage exceeded its allotted size! (sz))); \
|
|
INCLUDE "lib/ramstage.ramstage.ld"
|
|
#else
|
|
#define RAMSTAGE(addr, sz) \
|
|
SET_COUNTER(ramstage, addr) \
|
|
. += sz;
|
|
#endif
|
|
|
|
#endif /* __MEMLAYOUT_H */
|