erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cbmem: use a single id to name mapping table

Browse source 
CBMEM IDs are converted to symbolic names by both target and host
code. Keep the conversion table in one place to avoid getting out of
sync.

BUG=none
TEST=manual
  . the new firmware still displays proper CBMEM table entry descriptions:

    coreboot table: 276 bytes.
    CBMEM ROOT  0. 5ffff000 00001000
    COREBOOT    1. 5fffd000 00002000

  . running make in util/cbmem still succeeds

Change-Id: I0bd9d288f9e6432b531cea2ae011a6935a228c7a
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/199791
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Vadim Bendebury 2014-05-14 10:12:55 -07:00 • committed by chrome-internal-fetch
commit 5217446a53
3 changed files with 37 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/include/cbmem.h
View file

@ -80,6 +80,41 @@
#ifndef __ASSEMBLER__
#include <stdint.h>
struct cbmem_id_to_name {
u32 id;
const char *name;
};
#define CBMEM_ID_TO_NAME_TABLE \
{ CBMEM_ID_FREESPACE, "FREE SPACE " }, \
{ CBMEM_ID_GDT, "GDT " }, \
{ CBMEM_ID_ACPI, "ACPI " }, \
{ CBMEM_ID_CBTABLE, "COREBOOT " }, \
{ CBMEM_ID_PIRQ, "IRQ TABLE " }, \
{ CBMEM_ID_MPTABLE, "SMP TABLE " }, \
{ CBMEM_ID_RESUME, "ACPI RESUME" }, \
{ CBMEM_ID_RESUME_SCRATCH, "ACPISCRATCH" }, \
{ CBMEM_ID_ACPI_GNVS, "ACPI GNVS " }, \
{ CBMEM_ID_ACPI_GNVS_PTR, "GNVS PTR " }, \
{ CBMEM_ID_SMBIOS, "SMBIOS " }, \
{ CBMEM_ID_TIMESTAMP, "TIME STAMP " }, \
{ CBMEM_ID_MRCDATA, "MRC DATA " }, \
{ CBMEM_ID_CONSOLE, "CONSOLE " }, \
{ CBMEM_ID_ELOG, "ELOG " }, \
{ CBMEM_ID_COVERAGE, "COVERAGE " }, \
{ CBMEM_ID_ROMSTAGE_INFO, "ROMSTAGE " }, \
{ CBMEM_ID_ROMSTAGE_RAM_STACK, "ROMSTG STCK" }, \
{ CBMEM_ID_RAMSTAGE, "RAMSTAGE " }, \
{ CBMEM_ID_RAMSTAGE_CACHE, "RAMSTAGE $ " }, \
{ CBMEM_ID_ROOT, "CBMEM ROOT " }, \
{ CBMEM_ID_VBOOT_HANDOFF, "VBOOT " }, \
{ CBMEM_ID_CAR_GLOBALS, "CAR GLOBALS" }, \
{ CBMEM_ID_REFCODE, "REFCODE " }, \
{ CBMEM_ID_SMM_SAVE_SPACE, "SMM BACKUP " }, \
{ CBMEM_ID_REFCODE_CACHE, "REFCODE $ " }, \
{ CBMEM_ID_POWER_STATE, "POWER STATE" }, \
{ CBMEM_ID_RAM_OOPS, "RAMOOPS " },
struct cbmem_entry;
#if CONFIG_DYNAMIC_CBMEM

34
src/lib/cbmem_info.c
View file

@ -20,39 +20,7 @@
#include <cbmem.h>
#include <stdlib.h>
static struct cbmem_id_to_name {
u32 id;
const char *name;
} cbmem_ids[] = {
{ CBMEM_ID_FREESPACE, "FREE SPACE " },
{ CBMEM_ID_GDT, "GDT " },
{ CBMEM_ID_ACPI, "ACPI " },
{ CBMEM_ID_CBTABLE, "COREBOOT " },
{ CBMEM_ID_PIRQ, "IRQ TABLE " },
{ CBMEM_ID_MPTABLE, "SMP TABLE " },
{ CBMEM_ID_RESUME, "ACPI RESUME" },
{ CBMEM_ID_RESUME_SCRATCH, "ACPISCRATCH" },
{ CBMEM_ID_ACPI_GNVS, "ACPI GNVS " },
{ CBMEM_ID_ACPI_GNVS_PTR, "GNVS PTR " },
{ CBMEM_ID_SMBIOS, "SMBIOS " },
{ CBMEM_ID_TIMESTAMP, "TIME STAMP " },
{ CBMEM_ID_MRCDATA, "MRC DATA " },
{ CBMEM_ID_CONSOLE, "CONSOLE " },
{ CBMEM_ID_ELOG, "ELOG " },
{ CBMEM_ID_COVERAGE, "COVERAGE " },
{ CBMEM_ID_ROMSTAGE_INFO, "ROMSTAGE " },
{ CBMEM_ID_ROMSTAGE_RAM_STACK, "ROMSTG STCK" },
{ CBMEM_ID_RAMSTAGE, "RAMSTAGE " },
{ CBMEM_ID_RAMSTAGE_CACHE, "RAMSTAGE $ " },
{ CBMEM_ID_ROOT, "CBMEM ROOT " },
{ CBMEM_ID_VBOOT_HANDOFF, "VBOOT " },
{ CBMEM_ID_CAR_GLOBALS, "CAR GLOBALS" },
{ CBMEM_ID_REFCODE, "REFCODE " },
{ CBMEM_ID_SMM_SAVE_SPACE, "SMM BACKUP " },
{ CBMEM_ID_REFCODE_CACHE, "REFCODE $ " },
{ CBMEM_ID_POWER_STATE, "POWER STATE" },
{ CBMEM_ID_RAM_OOPS, "RAMOOPS " },
};
static const struct cbmem_id_to_name cbmem_ids[] = { CBMEM_ID_TO_NAME_TABLE };
void cbmem_print_entry(int n, u32 id, u64 base, u64 size)
{

29
util/cbmem/cbmem.c
View file

@ -556,34 +556,7 @@ struct cbmem_entry {
uint64_t size;
} __attribute__((packed));
static const struct cbmem_id_to_name {
u32 id;
const char *name;
} cbmem_ids[] = {
{ CBMEM_ID_FREESPACE, "FREE SPACE " },
{ CBMEM_ID_GDT, "GDT " },
{ CBMEM_ID_ACPI, "ACPI " },
{ CBMEM_ID_CBTABLE, "COREBOOT " },
{ CBMEM_ID_PIRQ, "IRQ TABLE " },
{ CBMEM_ID_MPTABLE, "SMP TABLE " },
{ CBMEM_ID_RESUME, "ACPI RESUME" },
{ CBMEM_ID_RESUME_SCRATCH, "ACPISCRATCH" },
{ CBMEM_ID_ACPI_GNVS, "ACPI GNVS " },
{ CBMEM_ID_ACPI_GNVS_PTR, "GNVS PTR " },
{ CBMEM_ID_SMBIOS, "SMBIOS " },
{ CBMEM_ID_TIMESTAMP, "TIME STAMP " },
{ CBMEM_ID_MRCDATA, "MRC DATA " },
{ CBMEM_ID_CONSOLE, "CONSOLE " },
{ CBMEM_ID_ELOG, "ELOG " },
{ CBMEM_ID_COVERAGE, "COVERAGE " },
{ CBMEM_ID_ROMSTAGE_INFO, "ROMSTAGE " },
{ CBMEM_ID_ROMSTAGE_RAM_STACK, "ROMSTG STCK" },
{ CBMEM_ID_RAMSTAGE, "RAMSTAGE " },
{ CBMEM_ID_RAMSTAGE_CACHE, "RAMSTAGE $ " },
{ CBMEM_ID_ROOT, "CBMEM ROOT " },
{ CBMEM_ID_VBOOT_HANDOFF, "VBOOT " },
{ CBMEM_ID_CAR_GLOBALS, "CAR GLOBALS" },
};
static const struct cbmem_id_to_name cbmem_ids[] = { CBMEM_ID_TO_NAME_TABLE };
void cbmem_print_entry(int n, uint32_t id, uint64_t base, uint64_t size)
{