mirror of
https://github.com/fail0verflow/switch-coreboot.git
synced 2025-05-04 01:39:18 -04:00
4fbac46524
Squashed and adjusted two changes from chromium.git. Covers CBMEM init for ROMTAGE and RAMSTAGE. cbmem: Unify random on-CBMEM-init tasks under common CBMEM_INIT_HOOK() API There are several use cases for performing a certain task when CBMEM is first set up (usually to migrate some data into it that was previously kept in BSS/SRAM/hammerspace), and unfortunately we handle each of them differently: timestamp migration is called explicitly from cbmem_initialize(), certain x86-chipset-specific tasks use the CAR_MIGRATION() macro to register a hook, and the CBMEM console is migrated through a direct call from romstage (on non-x86 and SandyBridge boards). This patch decouples the CAR_MIGRATION() hook mechanism from cache-as-RAM and rechristens it to CBMEM_INIT_HOOK(), which is a clearer description of what it really does. All of the above use cases are ported to this new, consistent model, allowing us to have one less line of boilerplate in non-CAR romstages. BRANCH=None BUG=None TEST=Built and booted on Nyan_Blaze and Falco with and without CONFIG_CBMEM_CONSOLE. Confirmed that 'cbmem -c' shows the full log after boot (and the resume log after S3 resume on Falco). Compiled for Parrot, Stout and Lumpy. Original-Change-Id: I1681b372664f5a1f15c3733cbd32b9b11f55f8ea Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/232612 Reviewed-by: Aaron Durbin <adurbin@chromium.org> cbmem: Extend hooks to ramstage, fix timestamp synching Commit 7dd5bbd71 (cbmem: Unify random on-CBMEM-init tasks under common CBMEM_INIT_HOOK() API) inadvertently broke ramstage timestamps since timestamp_sync() was no longer called there. Oops. This patch fixes the issue by extending the CBMEM_INIT_HOOK() mechanism to the cbmem_initialize() call in ramstage. The macro is split into explicit ROMSTAGE_/RAMSTAGE_ versions to make the behavior as clear as possible and prevent surprises (although just using a single macro and relying on the Makefiles to link an object into all appropriate stages would also work). This allows us to get rid of the explicit cbmemc_reinit() in ramstage (which I somehow accounted for in the last patch without realizing that timestamps work exactly the same way...), and replace the older and less flexible cbmem_arch_init() mechanism. Also added a size assertion for the pre-RAM CBMEM console to memlayout that could prevent a very unlikely buffer overflow I just noticed. BRANCH=None BUG=None TEST=Booted on Pinky and Falco, confirmed that ramstage timestamps once again show up. Compile-tested for Rambi and Samus. Original-Change-Id: If907266c3f20dc3d599b5c968ea5b39fe5c00e9c Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/233533 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Change-Id: I1be89bafacfe85cba63426e2d91f5d8d4caa1800 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Signed-off-by: Marc Jones <marc.jones@se-eng.com> Reviewed-on: http://review.coreboot.org/7878 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
88 lines
2.4 KiB
C
88 lines
2.4 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.
|
|
*/
|
|
|
|
#ifndef __SYMBOLS_H
|
|
#define __SYMBOLS_H
|
|
|
|
#include <types.h>
|
|
|
|
extern u8 _sram[];
|
|
extern u8 _esram[];
|
|
#define _sram_size (_esram - _sram)
|
|
|
|
extern u8 _dram[];
|
|
|
|
extern u8 _preram_cbmem_console[];
|
|
extern u8 _epreram_cbmem_console[];
|
|
#define _preram_cbmem_console_size \
|
|
(_epreram_cbmem_console - _preram_cbmem_console)
|
|
|
|
extern u8 _cbmem_init_hooks[];
|
|
extern u8 _ecbmem_init_hooks[];
|
|
#define _cbmem_init_hooks_size (_ecbmem_init_hooks - _cbmem_init_hooks)
|
|
|
|
extern u8 _stack[];
|
|
extern u8 _estack[];
|
|
#define _stack_size (_estack - _stack)
|
|
|
|
extern u8 _cbfs_cache[];
|
|
extern u8 _ecbfs_cache[];
|
|
#define _cbfs_cache_size (_ecbfs_cache - _cbfs_cache)
|
|
|
|
extern u8 _payload[];
|
|
extern u8 _epayload[];
|
|
#define _payload_size (_epayload - _payload)
|
|
|
|
/* Careful: _e<stage> and _<stage>_size only defined for the current stage! */
|
|
extern u8 _bootblock[];
|
|
extern u8 _ebootblock[];
|
|
#define _bootblock_size (_ebootblock - _bootblock)
|
|
|
|
extern u8 _romstage[];
|
|
extern u8 _eromstage[];
|
|
#define _romstage_size (_eromstage - _romstage)
|
|
|
|
extern u8 _ramstage[];
|
|
extern u8 _eramstage[];
|
|
#define _ramstage_size (_eramstage - _ramstage)
|
|
|
|
/* "program" always refers to the current execution unit, except for x86 ROM. */
|
|
extern u8 _program[];
|
|
extern u8 _eprogram[];
|
|
#define _program_size (_eprogram - _program)
|
|
|
|
/* Arch-specific, move to <arch/symbols.h> if they become too many. */
|
|
|
|
extern u8 _ttb[];
|
|
extern u8 _ettb[];
|
|
#define _ttb_size (_ettb - _ttb)
|
|
|
|
extern u8 _ttb_subtables[];
|
|
extern u8 _ettb_subtables[];
|
|
#define _ttb_subtables_size (_ettb_subtables - _ttb_subtables)
|
|
|
|
extern u8 _dma_coherent[];
|
|
extern u8 _edma_coherent[];
|
|
#define _dma_coherent_size (_edma_coherent - _dma_coherent)
|
|
|
|
extern u8 _framebuffer[];
|
|
extern u8 _eframebuffer[];
|
|
#define _framebuffer_size (_eframebuffer - _framebuffer)
|
|
|
|
#endif /* __SYMBOLS_H */
|