2009-10-26 18:04:28 +01:00
|
|
|
/*
|
|
|
|
* This file is part of the coreboot project.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2009 coresystems GmbH
|
2013-03-13 18:41:44 +01:00
|
|
|
* Copyright (C) 2013 Google, Inc.
|
2009-10-26 18:04:28 +01:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _CBMEM_H_
|
|
|
|
#define _CBMEM_H_
|
|
|
|
|
2015-09-08 20:34:43 +02:00
|
|
|
#include <commonlib/cbmem_id.h>
|
cbmem: Unify CBMEM init tasks with CBMEM_INIT_HOOK() API
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>
2015-01-07 03:48:43 +01:00
|
|
|
#include <rules.h>
|
2014-01-31 00:19:46 +01:00
|
|
|
#include <stddef.h>
|
2013-03-13 18:41:44 +01:00
|
|
|
#include <stdint.h>
|
2015-09-30 19:26:54 +02:00
|
|
|
#include <boot/coreboot_tables.h>
|
2013-03-13 18:41:44 +01:00
|
|
|
|
2016-06-15 05:15:46 +02:00
|
|
|
#define CBMEM_FSP_HOB_PTR 0x614
|
|
|
|
|
2013-03-13 18:41:44 +01:00
|
|
|
struct cbmem_entry;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The dynamic cbmem infrastructure allows for growing cbmem dynamically as
|
|
|
|
* things are added. It requires an external function, cbmem_top(), to be
|
|
|
|
* implemented by the board or chipset to define the upper address where
|
|
|
|
* cbmem lives. This address is required to be a 32-bit address. Additionally,
|
|
|
|
* the address needs to be consistent in both romstage and ramstage. The
|
2013-07-10 05:46:01 +02:00
|
|
|
* dynamic cbmem infrastructure allocates new regions below the last allocated
|
2013-03-13 18:41:44 +01:00
|
|
|
* region. Regions are defined by a cbmem_entry struct that is opaque. Regions
|
|
|
|
* may be removed, but the last one added is the only that can be removed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define DYN_CBMEM_ALIGN_SIZE (4096)
|
2015-05-08 20:33:55 +02:00
|
|
|
#define CBMEM_ROOT_SIZE DYN_CBMEM_ALIGN_SIZE
|
|
|
|
|
|
|
|
/* The root region is at least DYN_CBMEM_ALIGN_SIZE . */
|
|
|
|
#define CBMEM_ROOT_MIN_SIZE DYN_CBMEM_ALIGN_SIZE
|
|
|
|
#define CBMEM_LG_ALIGN CBMEM_ROOT_MIN_SIZE
|
|
|
|
|
|
|
|
/* Small allocation parameters. */
|
|
|
|
#define CBMEM_SM_ROOT_SIZE 1024
|
|
|
|
#define CBMEM_SM_ALIGN 32
|
|
|
|
|
|
|
|
/* Determine the size for CBMEM root and the small allocations */
|
|
|
|
static inline size_t cbmem_overhead_size(void)
|
|
|
|
{
|
|
|
|
return 2 * CBMEM_ROOT_MIN_SIZE;
|
|
|
|
}
|
2013-03-13 18:41:44 +01:00
|
|
|
|
2014-01-06 16:20:31 +01:00
|
|
|
/* By default cbmem is attempted to be recovered. Returns 0 if cbmem was
|
|
|
|
* recovered or 1 if cbmem had to be reinitialized. */
|
|
|
|
int cbmem_initialize(void);
|
2015-05-08 20:33:55 +02:00
|
|
|
int cbmem_initialize_id_size(u32 id, u64 size);
|
|
|
|
|
2013-07-10 05:46:01 +02:00
|
|
|
/* Initialize cbmem to be empty. */
|
2013-03-13 18:41:44 +01:00
|
|
|
void cbmem_initialize_empty(void);
|
2015-05-08 20:33:55 +02:00
|
|
|
void cbmem_initialize_empty_id_size(u32 id, u64 size);
|
2013-03-13 18:41:44 +01:00
|
|
|
|
|
|
|
/* Return the top address for dynamic cbmem. The address returned needs to
|
|
|
|
* be consistent across romstage and ramstage, and it is required to be
|
2016-03-28 22:23:13 +02:00
|
|
|
* below 4GiB.
|
2016-08-20 01:20:40 +02:00
|
|
|
* x86 boards or chipsets must return NULL before the cbmem backing store has
|
|
|
|
* been initialized. */
|
2013-03-13 18:41:44 +01:00
|
|
|
void *cbmem_top(void);
|
|
|
|
|
|
|
|
/* Add a cbmem entry of a given size and id. These return NULL on failure. The
|
|
|
|
* add function performs a find first and do not check against the original
|
|
|
|
* size. */
|
|
|
|
const struct cbmem_entry *cbmem_entry_add(u32 id, u64 size);
|
|
|
|
|
|
|
|
/* Find a cbmem entry of a given id. These return NULL on failure. */
|
|
|
|
const struct cbmem_entry *cbmem_entry_find(u32 id);
|
|
|
|
|
|
|
|
/* Remove a region defined by a cbmem_entry. Returns 0 on success, < 0 on
|
|
|
|
* error. Note: A cbmem_entry cannot be removed unless it was the last one
|
|
|
|
* added. */
|
|
|
|
int cbmem_entry_remove(const struct cbmem_entry *entry);
|
|
|
|
|
|
|
|
/* cbmem_entry accessors to get pointer and size of a cbmem_entry. */
|
|
|
|
void *cbmem_entry_start(const struct cbmem_entry *entry);
|
|
|
|
u64 cbmem_entry_size(const struct cbmem_entry *entry);
|
|
|
|
|
2014-01-06 16:20:31 +01:00
|
|
|
/* Returns 0 if old cbmem was recovered. Recovery is only attempted if
|
|
|
|
* s3resume is non-zero. */
|
|
|
|
int cbmem_recovery(int s3resume);
|
2013-03-13 18:41:44 +01:00
|
|
|
/* Add a cbmem entry of a given size and id. These return NULL on failure. The
|
|
|
|
* add function performs a find first and do not check against the original
|
|
|
|
* size. */
|
2009-10-26 18:04:28 +01:00
|
|
|
void *cbmem_add(u32 id, u64 size);
|
2013-03-13 18:41:44 +01:00
|
|
|
/* Find a cbmem entry of a given id. These return NULL on failure. */
|
2009-10-26 18:04:28 +01:00
|
|
|
void *cbmem_find(u32 id);
|
2015-11-16 22:26:33 +01:00
|
|
|
/* Get location and size of CBMEM region in memory */
|
|
|
|
void cbmem_region_used(uintptr_t *base, size_t *size);
|
2013-03-13 18:41:44 +01:00
|
|
|
|
2015-06-09 20:54:10 +02:00
|
|
|
/* Indicate to each hook if cbmem is being recovered or not. */
|
|
|
|
typedef void (* const cbmem_init_hook_t)(int is_recovery);
|
|
|
|
void cbmem_run_init_hooks(int is_recovery);
|
2014-12-18 17:30:29 +01:00
|
|
|
void cbmem_fail_resume(void);
|
|
|
|
|
2013-03-13 18:41:44 +01:00
|
|
|
/* Ramstage only functions. */
|
2014-02-19 04:55:02 +01:00
|
|
|
/* Add the cbmem memory used to the memory map at boot. */
|
|
|
|
void cbmem_add_bootmem(void);
|
2009-10-27 15:29:29 +01:00
|
|
|
void cbmem_list(void);
|
2015-09-30 19:26:54 +02:00
|
|
|
void cbmem_add_records_to_cbtable(struct lb_header *header);
|
2009-10-26 18:04:28 +01:00
|
|
|
|
cbmem: Unify CBMEM init tasks with CBMEM_INIT_HOOK() API
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>
2015-01-07 03:48:43 +01:00
|
|
|
#if ENV_RAMSTAGE
|
|
|
|
#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused_ __attribute__((unused)) = init_fn_;
|
|
|
|
#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) \
|
|
|
|
static cbmem_init_hook_t init_fn_ ## _ptr_ __attribute__((used, \
|
|
|
|
section(".rodata.cbmem_init_hooks"))) = init_fn_;
|
2016-09-16 23:23:21 +02:00
|
|
|
#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused2_ __attribute__((unused)) = init_fn_;
|
cbmem: Unify CBMEM init tasks with CBMEM_INIT_HOOK() API
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>
2015-01-07 03:48:43 +01:00
|
|
|
#elif ENV_ROMSTAGE
|
|
|
|
#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) \
|
|
|
|
static cbmem_init_hook_t init_fn_ ## _ptr_ __attribute__((used, \
|
|
|
|
section(".rodata.cbmem_init_hooks"))) = init_fn_;
|
|
|
|
#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused_ __attribute__((unused)) = init_fn_;
|
2016-09-16 23:23:21 +02:00
|
|
|
#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused2_ __attribute__((unused)) = init_fn_;
|
|
|
|
#elif ENV_POSTCAR
|
|
|
|
#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused2_ __attribute__((unused)) = init_fn_;
|
|
|
|
#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused_ __attribute__((unused)) = init_fn_;
|
|
|
|
#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) \
|
|
|
|
static cbmem_init_hook_t init_fn_ ## _ptr_ __attribute__((used, \
|
|
|
|
section(".rodata.cbmem_init_hooks"))) = init_fn_;
|
cbmem: Unify CBMEM init tasks with CBMEM_INIT_HOOK() API
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>
2015-01-07 03:48:43 +01:00
|
|
|
#else
|
|
|
|
#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused_ __attribute__((unused)) = init_fn_;
|
|
|
|
#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused2_ __attribute__((unused)) = init_fn_;
|
2016-09-16 23:23:21 +02:00
|
|
|
#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
|
|
|
|
init_fn_ ## _unused3_ __attribute__((unused)) = init_fn_;
|
cbmem: Unify CBMEM init tasks with CBMEM_INIT_HOOK() API
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>
2015-01-07 03:48:43 +01:00
|
|
|
#endif /* ENV_RAMSTAGE */
|
|
|
|
|
|
|
|
|
2014-12-19 07:20:45 +01:00
|
|
|
/* These are for compatibility with old boards only. Any new chipset and board
|
|
|
|
* must implement cbmem_top() for both romstage and ramstage to support
|
|
|
|
* early features like COLLECT_TIMESTAMPS and CBMEM_CONSOLE.
|
|
|
|
*/
|
|
|
|
#if IS_ENABLED(CONFIG_ARCH_X86) && IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
|
2015-05-26 18:15:45 +02:00
|
|
|
/* Note that many of the current providers of get_top_of_ram() conditionally
|
|
|
|
* return 0 when the sleep type is non S3. i.e. cold and warm boots would
|
|
|
|
* return 0 from get_top_of_ram(). */
|
2014-12-19 07:20:45 +01:00
|
|
|
unsigned long get_top_of_ram(void);
|
|
|
|
void set_top_of_ram(uint64_t ramtop);
|
|
|
|
void backup_top_of_ram(uint64_t ramtop);
|
|
|
|
#endif
|
|
|
|
|
2013-03-13 18:41:44 +01:00
|
|
|
#endif /* _CBMEM_H_ */
|