Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35398 )
Change subject: src/: Replace some __PRE_RAM__ use ......................................................................
src/: Replace some __PRE_RAM__ use
Change-Id: Iaa56e7b98aad33eeb876edd7465c56c80fd1ac18 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/console/init.c M src/include/device/pci_ehci.h M src/include/memlayout.h M src/include/thread.h M src/lib/cbmem_console.c M src/lib/imd_cbmem.c M src/lib/program.ld M src/lib/reg_script.c 8 files changed, 19 insertions(+), 33 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/35398/1
diff --git a/src/console/init.c b/src/console/init.c index 4859980..d481858 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -22,11 +22,7 @@ #include <version.h>
/* Mutable console log level only allowed when RAM comes online. */ -#if defined(__PRE_RAM__) -#define CONSOLE_LEVEL_CONST 1 -#else -#define CONSOLE_LEVEL_CONST 0 -#endif +#define CONSOLE_LEVEL_CONST !ENV_STAGE_HAS_DATA_SECTION
static int console_inited CAR_GLOBAL; static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h index 6e59854..e9a7776 100644 --- a/src/include/device/pci_ehci.h +++ b/src/include/device/pci_ehci.h @@ -31,7 +31,6 @@ u8 *pci_ehci_base_regs(pci_devfn_t dev); void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port);
-#ifndef __PRE_RAM__ #if !CONFIG(USBDEBUG) #define pci_ehci_read_resources pci_dev_read_resources #else @@ -46,6 +45,5 @@ struct device; void pci_ehci_read_resources(struct device *dev); #endif -#endif
#endif /* _PCI_EHCI_H_ */ diff --git a/src/include/memlayout.h b/src/include/memlayout.h index 505ccc1..0100e27 100644 --- a/src/include/memlayout.h +++ b/src/include/memlayout.h @@ -73,7 +73,7 @@ ALIAS_REGION(cbfs_cache, preram_cbfs_cache) \ ALIAS_REGION(cbfs_cache, postram_cbfs_cache)
-#if defined(__PRE_RAM__) +#if ENV_ROMSTAGE_OR_BEFORE #define PRERAM_CBFS_CACHE(addr, size) \ REGION(preram_cbfs_cache, addr, size, 4) \ ALIAS_REGION(preram_cbfs_cache, cbfs_cache) diff --git a/src/include/thread.h b/src/include/thread.h index e6af2ef..b66803e 100644 --- a/src/include/thread.h +++ b/src/include/thread.h @@ -20,7 +20,7 @@ #include <bootstate.h> #include <arch/cpu.h>
-#if CONFIG(COOP_MULTITASKING) && !defined(__SMM__) && !defined(__PRE_RAM__) +#if ENV_RAMSTAGE && CONFIG(COOP_MULTITASKING)
struct thread { int id; diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 18c3b71..7876ff5 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -51,16 +51,11 @@
static struct cbmem_console *cbmem_console_p CAR_GLOBAL;
-#ifdef __PRE_RAM__ /* * While running from ROM, before DRAM is initialized, some area in cache as * RAM space is used for the console buffer storage. The size and location of * the area are defined by the linker script with _(e)preram_cbmem_console. - */ - -#else - -/* + * * When running from RAM, some console output is generated before CBMEM is * reinitialized. This static buffer is used to store that output temporarily, * to be concatenated with the CBMEM console buffer contents accumulated @@ -69,7 +64,6 @@
#define STATIC_CONSOLE_SIZE 1024 static u8 static_console[STATIC_CONSOLE_SIZE]; -#endif
static struct cbmem_console *current_console(void) { @@ -107,14 +101,13 @@
void cbmemc_init(void) { -#ifdef __PRE_RAM__ - /* Pre-RAM environments use special buffer placed by linker script. */ - init_console_ptr(_preram_cbmem_console, - REGION_SIZE(preram_cbmem_console)); -#else - /* Post-RAM uses static (BSS) buffer before CBMEM is reinitialized. */ - init_console_ptr(static_console, sizeof(static_console)); -#endif + if (ENV_ROMSTAGE_OR_BEFORE) { + /* Pre-RAM environments use special buffer placed by linker script. */ + init_console_ptr(_preram_cbmem_console, REGION_SIZE(preram_cbmem_console)); + } else { + /* Post-RAM uses static (BSS) buffer before CBMEM is reinitialized. */ + init_console_ptr(static_console, sizeof(static_console)); + } }
void cbmemc_tx_byte(unsigned char data) diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index e5c3e41..f04e086 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -172,14 +172,13 @@ if (imd_recover(imd)) return 1;
-#if defined(__PRE_RAM__) /* * Lock the imd in romstage on a recovery. The assumption is that * if the imd area was recovered in romstage then S3 resume path * is being taken. */ - imd_lockdown(imd); -#endif + if (ENV_ROMSTAGE) + imd_lockdown(imd);
/* Add the specified range first */ if (size) diff --git a/src/lib/program.ld b/src/lib/program.ld index ad364a4..a9d4e48 100644 --- a/src/lib/program.ld +++ b/src/lib/program.ld @@ -108,7 +108,7 @@ *(.sdata); *(.sdata.*);
-#ifdef __PRE_RAM__ +#if ENV_ROMSTAGE_OR_BEFORE PROVIDE(_preram_cbmem_console = .); PROVIDE(_epreram_cbmem_console = _preram_cbmem_console); #elif ENV_RAMSTAGE diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c index 50cf7b6..0c033ed 100644 --- a/src/lib/reg_script.c +++ b/src/lib/reg_script.c @@ -36,7 +36,8 @@ #endif
#define POLL_DELAY 100 /* 100us */ -#if defined(__PRE_RAM__) + +#ifdef __SIMPLE_DEVICE__ #define EMPTY_DEV 0 #else #define EMPTY_DEV NULL @@ -68,9 +69,9 @@
static struct resource *reg_script_get_resource(struct reg_script_context *ctx) { -#if defined(__PRE_RAM__) - return NULL; -#else + if (!ENV_RAMSTAGE) + return NULL; + struct resource *res; const struct reg_script *step = reg_script_get_step(ctx);
@@ -82,7 +83,6 @@ res = find_resource(ctx->dev, step->res_index); ctx->res = res; return res; -#endif }
static uint32_t reg_script_read_pci(struct reg_script_context *ctx)
Hello Julius Werner, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35398
to look at the new patch set (#2).
Change subject: src/: Replace some __PRE_RAM__ use ......................................................................
src/: Replace some __PRE_RAM__ use
Change-Id: Iaa56e7b98aad33eeb876edd7465c56c80fd1ac18 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/console/init.c M src/include/device/pci_ehci.h M src/include/memlayout.h M src/include/thread.h M src/lib/cbmem_console.c M src/lib/imd_cbmem.c M src/lib/program.ld M src/lib/reg_script.c 8 files changed, 17 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/35398/2
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35398 )
Change subject: src/: Replace some __PRE_RAM__ use ......................................................................
Patch Set 2: Code-Review+2
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35398 )
Change subject: src/: Replace some __PRE_RAM__ use ......................................................................
src/: Replace some __PRE_RAM__ use
Change-Id: Iaa56e7b98aad33eeb876edd7465c56c80fd1ac18 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35398 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aaron Durbin adurbin@chromium.org --- M src/console/init.c M src/include/device/pci_ehci.h M src/include/memlayout.h M src/include/thread.h M src/lib/cbmem_console.c M src/lib/imd_cbmem.c M src/lib/program.ld M src/lib/reg_script.c 8 files changed, 17 insertions(+), 30 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved
diff --git a/src/console/init.c b/src/console/init.c index 4859980..d481858 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -22,11 +22,7 @@ #include <version.h>
/* Mutable console log level only allowed when RAM comes online. */ -#if defined(__PRE_RAM__) -#define CONSOLE_LEVEL_CONST 1 -#else -#define CONSOLE_LEVEL_CONST 0 -#endif +#define CONSOLE_LEVEL_CONST !ENV_STAGE_HAS_DATA_SECTION
static int console_inited CAR_GLOBAL; static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h index 6e59854..e9a7776 100644 --- a/src/include/device/pci_ehci.h +++ b/src/include/device/pci_ehci.h @@ -31,7 +31,6 @@ u8 *pci_ehci_base_regs(pci_devfn_t dev); void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port);
-#ifndef __PRE_RAM__ #if !CONFIG(USBDEBUG) #define pci_ehci_read_resources pci_dev_read_resources #else @@ -46,6 +45,5 @@ struct device; void pci_ehci_read_resources(struct device *dev); #endif -#endif
#endif /* _PCI_EHCI_H_ */ diff --git a/src/include/memlayout.h b/src/include/memlayout.h index 505ccc1..0100e27 100644 --- a/src/include/memlayout.h +++ b/src/include/memlayout.h @@ -73,7 +73,7 @@ ALIAS_REGION(cbfs_cache, preram_cbfs_cache) \ ALIAS_REGION(cbfs_cache, postram_cbfs_cache)
-#if defined(__PRE_RAM__) +#if ENV_ROMSTAGE_OR_BEFORE #define PRERAM_CBFS_CACHE(addr, size) \ REGION(preram_cbfs_cache, addr, size, 4) \ ALIAS_REGION(preram_cbfs_cache, cbfs_cache) diff --git a/src/include/thread.h b/src/include/thread.h index e6af2ef..b66803e 100644 --- a/src/include/thread.h +++ b/src/include/thread.h @@ -20,7 +20,7 @@ #include <bootstate.h> #include <arch/cpu.h>
-#if CONFIG(COOP_MULTITASKING) && !defined(__SMM__) && !defined(__PRE_RAM__) +#if ENV_RAMSTAGE && CONFIG(COOP_MULTITASKING)
struct thread { int id; diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 18c3b71..7876ff5 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -51,16 +51,11 @@
static struct cbmem_console *cbmem_console_p CAR_GLOBAL;
-#ifdef __PRE_RAM__ /* * While running from ROM, before DRAM is initialized, some area in cache as * RAM space is used for the console buffer storage. The size and location of * the area are defined by the linker script with _(e)preram_cbmem_console. - */ - -#else - -/* + * * When running from RAM, some console output is generated before CBMEM is * reinitialized. This static buffer is used to store that output temporarily, * to be concatenated with the CBMEM console buffer contents accumulated @@ -69,7 +64,6 @@
#define STATIC_CONSOLE_SIZE 1024 static u8 static_console[STATIC_CONSOLE_SIZE]; -#endif
static struct cbmem_console *current_console(void) { @@ -107,14 +101,13 @@
void cbmemc_init(void) { -#ifdef __PRE_RAM__ - /* Pre-RAM environments use special buffer placed by linker script. */ - init_console_ptr(_preram_cbmem_console, - REGION_SIZE(preram_cbmem_console)); -#else - /* Post-RAM uses static (BSS) buffer before CBMEM is reinitialized. */ - init_console_ptr(static_console, sizeof(static_console)); -#endif + if (ENV_ROMSTAGE_OR_BEFORE) { + /* Pre-RAM environments use special buffer placed by linker script. */ + init_console_ptr(_preram_cbmem_console, REGION_SIZE(preram_cbmem_console)); + } else { + /* Post-RAM uses static (BSS) buffer before CBMEM is reinitialized. */ + init_console_ptr(static_console, sizeof(static_console)); + } }
void cbmemc_tx_byte(unsigned char data) diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index e5c3e41..f04e086 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -172,14 +172,13 @@ if (imd_recover(imd)) return 1;
-#if defined(__PRE_RAM__) /* * Lock the imd in romstage on a recovery. The assumption is that * if the imd area was recovered in romstage then S3 resume path * is being taken. */ - imd_lockdown(imd); -#endif + if (ENV_ROMSTAGE) + imd_lockdown(imd);
/* Add the specified range first */ if (size) diff --git a/src/lib/program.ld b/src/lib/program.ld index ad364a4..a9d4e48 100644 --- a/src/lib/program.ld +++ b/src/lib/program.ld @@ -108,7 +108,7 @@ *(.sdata); *(.sdata.*);
-#ifdef __PRE_RAM__ +#if ENV_ROMSTAGE_OR_BEFORE PROVIDE(_preram_cbmem_console = .); PROVIDE(_epreram_cbmem_console = _preram_cbmem_console); #elif ENV_RAMSTAGE diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c index 50cf7b6..5f4fa9f 100644 --- a/src/lib/reg_script.c +++ b/src/lib/reg_script.c @@ -36,7 +36,8 @@ #endif
#define POLL_DELAY 100 /* 100us */ -#if defined(__PRE_RAM__) + +#ifdef __SIMPLE_DEVICE__ #define EMPTY_DEV 0 #else #define EMPTY_DEV NULL @@ -68,7 +69,7 @@
static struct resource *reg_script_get_resource(struct reg_script_context *ctx) { -#if defined(__PRE_RAM__) +#ifdef __SIMPLE_DEVICE__ return NULL; #else struct resource *res;
-
Aaron Durbin (Code Review) -
Kyösti Mälkki (Code Review)