Change in coreboot[master]: kill CAR_GLOBAL_MIGRATION leftovers

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37055 )

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

kill CAR_GLOBAL_MIGRATION leftovers

Change-Id: Ia3b2c10af63cd0cab42dc39f479cb69bc4df9124
Signed-off-by: Arthur Heymans 
---
M src/commonlib/include/commonlib/cbmem_id.h
M src/console/printk.c
M src/include/rules.h
3 files changed, 2 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/37055/1

diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/include/commonlib/cbmem_id.h
index b063cd1..6835d86 100644
--- a/src/commonlib/include/commonlib/cbmem_id.h
+++ b/src/commonlib/include/commonlib/cbmem_id.h
@@ -20,7 +20,6 @@
 #define CBMEM_ID_AFTER_CAR	0xc4787a93
 #define CBMEM_ID_AGESA_RUNTIME	0x41474553
 #define CBMEM_ID_AMDMCT_MEMINFO 0x494D454E
-#define CBMEM_ID_CAR_GLOBALS	0xcac4e6a3
 #define CBMEM_ID_CBTABLE	0x43425442
 #define CBMEM_ID_CBTABLE_FWD	0x43425443
 #define CBMEM_ID_CONSOLE	0x434f4e53
@@ -88,7 +87,6 @@
    { CBMEM_ID_AGESA_RUNTIME,	"AGESA RSVD " }, \
    { CBMEM_ID_AFTER_CAR,		"AFTER CAR  " }, \
    { CBMEM_ID_AMDMCT_MEMINFO,	"AMDMEM INFO" }, \
-	{ CBMEM_ID_CAR_GLOBALS,		"CAR GLOBALS" }, \
    { CBMEM_ID_CBTABLE,		"COREBOOT   " }, \
    { CBMEM_ID_CBTABLE_FWD,		"COREBOOTFWD" }, \
    { CBMEM_ID_CONSOLE,		"CONSOLE    " }, \
diff --git a/src/console/printk.c b/src/console/printk.c
index 4f9f547..dc3077d 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -27,8 +27,7 @@
 DECLARE_SPIN_LOCK(console_lock)
 #endif

-#define TRACK_CONSOLE_TIME (CONFIG(HAVE_MONOTONIC_TIMER) && \
-	(ENV_RAMSTAGE || !CONFIG(CAR_GLOBAL_MIGRATION)))
+#define TRACK_CONSOLE_TIME (CONFIG(HAVE_MONOTONIC_TIMER))

static struct mono_time mt_start, mt_stop;
 static long console_usecs;
diff --git a/src/include/rules.h b/src/include/rules.h
index 9e13ee6..fa60ede 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -258,7 +258,7 @@
 /* No .data sections with execute-in-place from ROM.  */
 #define ENV_STAGE_HAS_DATA_SECTION	!ENV_CACHE_AS_RAM
 /* No .bss sections for stage with CAR teardown. */
-#define ENV_STAGE_HAS_BSS_SECTION	!(ENV_ROMSTAGE && CONFIG(CAR_GLOBAL_MIGRATION))
+#define ENV_STAGE_HAS_BSS_SECTION	1
 #else
 /* Both .data and .bss, sometimes SRAM not DRAM. */
 #define ENV_STAGE_HAS_DATA_SECTION	1

Change in coreboot[master]: [WIP]kill CAR_GLOBAL_MIGRATION leftovers

[Arthur Heymans (Code Review)]

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37055

to look at the new patch set (#4).

Change subject: [WIP]kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

[WIP]kill CAR_GLOBAL_MIGRATION leftovers

Change-Id: Ia3b2c10af63cd0cab42dc39f479cb69bc4df9124
Signed-off-by: Arthur Heymans 
---
M src/arch/x86/Kconfig
M src/arch/x86/assembly_entry.S
M src/arch/x86/car.ld
M src/commonlib/include/commonlib/cbmem_id.h
M src/console/printk.c
M src/cpu/Kconfig
M src/cpu/x86/Makefile.inc
M src/include/rules.h
M src/soc/intel/fsp_baytrail/spi.c
9 files changed, 7 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/37055/4

Change in coreboot[master]: [WIP]kill CAR_GLOBAL_MIGRATION leftovers

[Arthur Heymans (Code Review)]

Hello Patrick Rudolph, Huang Jin, Julius Werner, Philipp Deppenwiese, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37055

to look at the new patch set (#5).

Change subject: [WIP]kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

[WIP]kill CAR_GLOBAL_MIGRATION leftovers

Change-Id: Ia3b2c10af63cd0cab42dc39f479cb69bc4df9124
Signed-off-by: Arthur Heymans 
---
M src/arch/x86/Kconfig
M src/arch/x86/assembly_entry.S
M src/arch/x86/car.ld
M src/commonlib/include/commonlib/cbmem_id.h
M src/console/printk.c
M src/cpu/Kconfig
M src/cpu/x86/Makefile.inc
M src/include/rules.h
M src/soc/intel/fsp_baytrail/spi.c
9 files changed, 6 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/37055/5

Change in coreboot[master]: [WIP]kill CAR_GLOBAL_MIGRATION leftovers

[Arthur Heymans (Code Review)]

Hello Patrick Rudolph, Huang Jin, Julius Werner, Philipp Deppenwiese, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37055

to look at the new patch set (#7).

Change subject: [WIP]kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

[WIP]kill CAR_GLOBAL_MIGRATION leftovers

Change-Id: Ia3b2c10af63cd0cab42dc39f479cb69bc4df9124
Signed-off-by: Arthur Heymans 
---
M src/arch/x86/Kconfig
M src/arch/x86/assembly_entry.S
M src/arch/x86/car.ld
M src/commonlib/include/commonlib/cbmem_id.h
M src/console/printk.c
M src/cpu/Kconfig
M src/cpu/x86/Makefile.inc
M src/include/rules.h
8 files changed, 4 insertions(+), 31 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/37055/7

[Arthur Heymans (Code Review)]

Hello Patrick Rudolph, Huang Jin, Julius Werner, Philipp Deppenwiese, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37055

to look at the new patch set (#8).

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

kill CAR_GLOBAL_MIGRATION leftovers

Change-Id: Ia3b2c10af63cd0cab42dc39f479cb69bc4df9124
Signed-off-by: Arthur Heymans 
---
M src/arch/x86/Kconfig
M src/console/printk.c
M src/cpu/Kconfig
M src/include/rules.h
4 files changed, 2 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/37055/8

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37055 )

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

Patch Set 8: Code-Review+1

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37055 )

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

Patch Set 8: Code-Review+2

\o/ grab a pint

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37055 )

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

Patch Set 10: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37055 )

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

kill CAR_GLOBAL_MIGRATION leftovers

Change-Id: Ia3b2c10af63cd0cab42dc39f479cb69bc4df9124
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37055
Reviewed-by: Angel Pons 
Reviewed-by: HAOUAS Elyes 
Reviewed-by: Kyösti Mälkki 
Tested-by: build bot (Jenkins) 
---
M src/arch/x86/Kconfig
M src/console/printk.c
M src/cpu/Kconfig
M src/include/rules.h
4 files changed, 2 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  HAOUAS Elyes: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, approved

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index a788bc0..0e6f486 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -219,7 +219,6 @@
 config POSTCAR_STAGE
    def_bool y
    depends on ARCH_X86
-	depends on !CAR_GLOBAL_MIGRATION

config VERSTAGE_DEBUG_SPINLOOP
    bool
diff --git a/src/console/printk.c b/src/console/printk.c
index fd590fa..a08dd2f 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -25,8 +25,7 @@

DECLARE_SPIN_LOCK(console_lock)

-#define TRACK_CONSOLE_TIME (CONFIG(HAVE_MONOTONIC_TIMER) && \
-	(ENV_RAMSTAGE || !CONFIG(CAR_GLOBAL_MIGRATION)))
+#define TRACK_CONSOLE_TIME (CONFIG(HAVE_MONOTONIC_TIMER))

static struct mono_time mt_start, mt_stop;
 static long console_usecs;
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 3c0bf89..1ad7ef1 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -6,14 +6,6 @@

if ARCH_X86

-config CAR_GLOBAL_MIGRATION
-	bool
-	default n
-	help
-	  This option is selected if there is need to migrate CAR globals.
-	  All stages which use CAR globals can directly access the variables
-	  from their linked addresses.
-
 config DCACHE_RAM_BASE
    hex

diff --git a/src/include/rules.h b/src/include/rules.h
index 9e13ee6..fa60ede 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -258,7 +258,7 @@
 /* No .data sections with execute-in-place from ROM.  */
 #define ENV_STAGE_HAS_DATA_SECTION	!ENV_CACHE_AS_RAM
 /* No .bss sections for stage with CAR teardown. */
-#define ENV_STAGE_HAS_BSS_SECTION	!(ENV_ROMSTAGE && CONFIG(CAR_GLOBAL_MIGRATION))
+#define ENV_STAGE_HAS_BSS_SECTION	1
 #else
 /* Both .data and .bss, sometimes SRAM not DRAM. */
 #define ENV_STAGE_HAS_DATA_SECTION	1

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37055 )

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

Patch Set 11:

Stupid question... is ENV_STAGE_HAS_BSS_SECTION still used for anything after this patch? Can it still be 0 on any platform?

If not, can we please clean it (and all related pieces like MAYBE_STATIC_BSS) out of the codebase? People are still adding new code with MAYBE_STATIC_BSS and dealing with the related headaches right now (e.g. CB:41209) and that's just a waste of time if nothing is using it anyway.

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37055 )

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

Patch Set 11:
> Patch Set 11:
>
> Stupid question... is ENV_STAGE_HAS_BSS_SECTION still used for anything after this patch? Can it still be 0 on any platform?
>
> If not, can we please clean it (and all related pieces like MAYBE_STATIC_BSS) out of the codebase? People are still adding new code with MAYBE_STATIC_BSS and dealing with the related headaches right now (e.g. CB:41209) and that's just a waste of time if nothing is using it anyway.

CB:40535 and you have been added as reviewer since April 20th.