arch/x86: Flip option NO_CAR_GLOBAL_MIGRATION

It is easier to track CAR_GLOBAL_MIGRATION which is
the approach to be deprecated with the next release.

This change enforces new policy; POSTCAR_STAGE=y is
not allowed together with CAR_GLOBAL_MIGRATION=y.

Change-Id: I0dbad6a14e68bf566ac0f151dc8ea259e5ae2250
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34804
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

src/arch/x86/Kconfig

@@ -222,8 +222,9 @@ config VERSTAGE_ADDR
 # Use the post CAR infrastructure for tearing down cache-as-ram
 # from a program loaded in RAM and subsequently loading ramstage.
 config POSTCAR_STAGE
-	def_bool n
-	select NO_CAR_GLOBAL_MIGRATION
+	def_bool y
+	depends on ARCH_X86
+	depends on !CAR_GLOBAL_MIGRATION
 
 config VERSTAGE_DEBUG_SPINLOOP
 	bool

src/arch/x86/car.ld

@@ -76,7 +76,7 @@
 	 * cbmem console. This is useful for clearing this area on a per-stage
 	 * basis when more than one stage uses cache-as-ram for CAR_GLOBALs. */
 	_car_global_start = .;
-#if CONFIG(NO_CAR_GLOBAL_MIGRATION)
+#if !CONFIG(CAR_GLOBAL_MIGRATION)
 	/* Allow global unitialized variables when CAR_GLOBALs are not used. */
 	*(.bss)
 	*(.bss.*)
@@ -84,7 +84,7 @@
 	*(.sbss.*)
 #else
 	/* .car.global_data objects only around when
-	 * !CONFIG_NO_CAR_GLOBAL_MIGRATION is employed. */
+	 * CONFIG_CAR_GLOBAL_MIGRATION is employed. */
 	*(.car.global_data);
 #endif
 	. = ALIGN(ARCH_POINTER_ALIGN_SIZE);
@@ -107,7 +107,7 @@
 .illegal_globals . : {
 	*(EXCLUDE_FILE ("*/libagesa.*.a:" "*/romstage*/buildOpts.o" "*/romstage*/agesawrapper.o" "*/vendorcode/amd/agesa/*" "*/vendorcode/amd/cimx/*") .data)
 		*(EXCLUDE_FILE ("*/libagesa.*.a:" "*/romstage*/buildOpts.o" "*/romstage*/agesawrapper.o" "*/vendorcode/amd/agesa/*" "*/vendorcode/amd/cimx/*") .data.*)
-#if !CONFIG(NO_CAR_GLOBAL_MIGRATION)
+#if CONFIG(CAR_GLOBAL_MIGRATION)
 	*(.bss)
 	*(.bss.*)
 	*(.sbss)

src/arch/x86/include/arch/early_variables.h

@@ -20,7 +20,7 @@
 #include <commonlib/helpers.h>
 #include <stdlib.h>
 
-#if ENV_CACHE_AS_RAM && !CONFIG(NO_CAR_GLOBAL_MIGRATION)
+#if ENV_CACHE_AS_RAM && CONFIG(CAR_GLOBAL_MIGRATION)
 asm(".section .car.global_data,\"w\",@nobits");
 asm(".previous");
 #ifdef __clang__
@@ -83,8 +83,8 @@ static inline size_t car_object_offset(void *ptr)
 /*
  * We might end up here if:
  * 1. ENV_CACHE_AS_RAM is not set for the stage or
- * 2. ENV_CACHE_AS_RAM is set for the stage but CONFIG_NO_CAR_GLOBAL_MIGRATION
- * is also set. In this case, there is no need to migrate CAR global
+ * 2. ENV_CACHE_AS_RAM is set for the stage but CONFIG_CAR_GLOBAL_MIGRATION
+ * is not set. In this case, there is no need to migrate CAR global
  * variables. But, since we might still be running out of CAR, car_active needs
  * to return 1 if ENV_CACHE_AS_RAM is set.
  */
@@ -101,6 +101,6 @@ static inline int car_active(void) { return 0; }
 #define car_get_var(var) (var)
 #define car_sync_var(var) (var)
 #define car_set_var(var, val)	(var) = (val)
-#endif /* ENV_CACHE_AS_RAM && !CONFIG(NO_CAR_GLOBAL_MIGRATION) */
+#endif /* ENV_CACHE_AS_RAM && CONFIG(CAR_GLOBAL_MIGRATION) */
 
 #endif /* ARCH_EARLY_VARIABLES_H */

src/cpu/Kconfig

@@ -10,12 +10,12 @@ config CACHE_AS_RAM
 	bool
 	default y
 
-config NO_CAR_GLOBAL_MIGRATION
+config CAR_GLOBAL_MIGRATION
 	bool
 	default n
 	depends on CACHE_AS_RAM
 	help
-	  This option is selected if there is no need to migrate CAR globals.
+	  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.
 

src/cpu/amd/agesa/Kconfig

@@ -29,7 +29,6 @@ config CPU_AMD_AGESA
 	select UDELAY_LAPIC
 	select LAPIC_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
-	select POSTCAR_STAGE
 	select SMM_ASEG
 
 if CPU_AMD_AGESA

src/cpu/amd/family_10h-family_15h/Kconfig

@@ -9,6 +9,7 @@ config CPU_AMD_MODEL_10XXX
 	select UDELAY_LAPIC
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select CPU_MICROCODE_MULTIPLE_FILES
+	select CAR_GLOBAL_MIGRATION
 	select ACPI_HUGE_LOWMEM_BACKUP
 
 if CPU_AMD_MODEL_10XXX

src/cpu/amd/pi/Kconfig

@@ -28,7 +28,7 @@ config CPU_AMD_PI
 	select UDELAY_LAPIC
 	select LAPIC_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
-	select POSTCAR_STAGE if !BINARYPI_LEGACY_WRAPPER
+	select CAR_GLOBAL_MIGRATION if BINARYPI_LEGACY_WRAPPER
 	select SMM_ASEG
 
 if CPU_AMD_PI

src/cpu/via/nano/Kconfig

@@ -30,6 +30,7 @@ config CPU_SPECIFIC_OPTIONS
 	select MMX
 	select SSE2
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select CAR_GLOBAL_MIGRATION
 
 config DCACHE_RAM_BASE
 	hex

src/cpu/x86/Makefile.inc

@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
-ifneq ($(CONFIG_NO_CAR_GLOBAL_MIGRATION),y)
+ifeq ($(CONFIG_CAR_GLOBAL_MIGRATION),y)
 romstage-$(CONFIG_CACHE_AS_RAM) += car.c
 endif
 endif

src/drivers/intel/fsp1_0/Kconfig

@@ -16,6 +16,7 @@
 config PLATFORM_USES_FSP1_0
 	bool
 	default n
+	select CAR_GLOBAL_MIGRATION
 	help
 	  Selected for Intel processors/platform combinations that use the
 	  Intel Firmware Support Package (FSP) 1.0 for initialization.

src/drivers/intel/fsp1_1/Kconfig

@@ -18,7 +18,6 @@ config PLATFORM_USES_FSP1_1
 	bool
 	select UEFI_2_4_BINDING
 	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
-	select POSTCAR_STAGE
 	help
 	  Does the code require the Intel Firmware Support Package?
 

src/lib/imd_cbmem.c

@@ -41,7 +41,7 @@
  */
 #define CAN_USE_GLOBALS \
 	(!CONFIG(ARCH_X86) || ENV_RAMSTAGE || ENV_POSTCAR || \
-	 CONFIG(NO_CAR_GLOBAL_MIGRATION))
+	 !CONFIG(CAR_GLOBAL_MIGRATION))
 
 static inline struct imd *cbmem_get_imd(void)
 {

src/mainboard/emulation/qemu-i440fx/Kconfig

@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select BOARD_ROMSIZE_KB_256
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
-	select POSTCAR_STAGE
 
 config MAINBOARD_DIR
 	string

src/mainboard/emulation/qemu-q35/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select BOARD_ROMSIZE_KB_2048
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
-	select POSTCAR_STAGE
 
 config MAINBOARD_DIR
 	string

src/mainboard/intel/galileo/Kconfig

@@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_TPM2
 	select PLATFORM_USES_FSP2_0
 	select UDK_2015_BINDING
-	select POSTCAR_STAGE
 
 
 config MAINBOARD_DIR

src/northbridge/intel/e7505/Kconfig

@@ -22,6 +22,5 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
-	select POSTCAR_STAGE
 
 endif

src/northbridge/intel/gm45/Kconfig

@@ -26,7 +26,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	select INTEL_EDID
 	select INTEL_GMA_ACPI
 	select INTEL_GMA_SSC_ALTERNATE_REF
-	select POSTCAR_STAGE
 	select PARALLEL_MP
 
 config CBFS_SIZE

src/northbridge/intel/haswell/Kconfig

@@ -19,7 +19,6 @@ config NORTHBRIDGE_INTEL_HASWELL
 	select CACHE_MRC_SETTINGS
 	select INTEL_DDI
 	select INTEL_GMA_ACPI
-	select POSTCAR_STAGE
 	select C_ENVIRONMENT_BOOTBLOCK
 	select BOOTBLOCK_CONSOLE
 

src/northbridge/intel/i440bx/Kconfig

@@ -18,7 +18,6 @@ config NORTHBRIDGE_INTEL_I440BX
 	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select UDELAY_IO
-	select POSTCAR_STAGE
 
 config SDRAMPWR_4DIMM
 	bool

src/northbridge/intel/i945/Kconfig

@@ -27,7 +27,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	select INTEL_GMA_SSC_ALTERNATE_REF
 	select INTEL_EDID
 	select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT
-	select POSTCAR_STAGE
 	select PARALLEL_MP
 
 config NORTHBRIDGE_INTEL_SUBTYPE_I945GC

src/northbridge/intel/nehalem/Kconfig

@@ -20,7 +20,6 @@ config NORTHBRIDGE_INTEL_NEHALEM
 	select INTEL_EDID
 	select INTEL_GMA_ACPI
 	select CACHE_MRC_SETTINGS
-	select POSTCAR_STAGE
 	select HAVE_DEBUG_RAM_SETUP
 
 if NORTHBRIDGE_INTEL_NEHALEM

src/northbridge/intel/pineview/Kconfig

@@ -28,7 +28,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT
 	select INTEL_EDID if MAINBOARD_DO_NATIVE_VGA_INIT
 	select INTEL_GMA_ACPI
-	select POSTCAR_STAGE
 	select PARALLEL_MP
 	select C_ENVIRONMENT_BOOTBLOCK
 

src/northbridge/intel/sandybridge/Kconfig

@@ -20,7 +20,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select CPU_INTEL_MODEL_206AX
 	select HAVE_DEBUG_RAM_SETUP
 	select INTEL_GMA_ACPI
-	select POSTCAR_STAGE
 
 if NORTHBRIDGE_INTEL_SANDYBRIDGE
 

src/northbridge/intel/x4x/Kconfig

@@ -26,7 +26,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	select VGA
 	select INTEL_GMA_ACPI
 	select CACHE_MRC_SETTINGS
-	select POSTCAR_STAGE
 	select PARALLEL_MP
 
 config CBFS_SIZE

src/soc/amd/picasso/Kconfig

@@ -56,7 +56,6 @@ config CPU_SPECIFIC_OPTIONS
 	select PARALLEL_MP
 	select PARALLEL_MP_AP_WORK
 	select HAVE_SMI_HANDLER
-	select POSTCAR_STAGE
 	select SSE2
 	select RTC
 

src/soc/amd/stoneyridge/Kconfig

@@ -76,7 +76,6 @@ config CPU_SPECIFIC_OPTIONS
 	select PARALLEL_MP
 	select PARALLEL_MP_AP_WORK
 	select HAVE_SMI_HANDLER
-	select POSTCAR_STAGE
 	select SSE2
 	select RTC
 

src/soc/intel/apollolake/Kconfig

@@ -57,7 +57,6 @@ config CPU_SPECIFIC_OPTIONS
 	select PCIEXP_CLK_PM
 	select PCIEXP_L1_SUB_STATE
 	select PCIEX_LENGTH_256MB
-	select POSTCAR_STAGE
 	select PMC_INVALID_READ_AFTER_WRITE
 	select PMC_GLOBAL_RESET_ENABLE_LOCK
 	select REG_SCRIPT

src/soc/intel/baytrail/Kconfig

@@ -36,7 +36,6 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_SPI_CONSOLE_SUPPORT
 	select INTEL_GMA_ACPI
 	select INTEL_GMA_SWSMISCI
-	select POSTCAR_STAGE
 	select CPU_INTEL_COMMON
 	select CPU_HAS_L2_ENABLE_MSR
 

src/soc/intel/broadwell/Kconfig

@@ -36,7 +36,6 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_SPI_CONSOLE_SUPPORT
 	select CPU_INTEL_COMMON
 	select INTEL_GMA_ACPI
-	select POSTCAR_STAGE
 	select HAVE_POWER_STATE_AFTER_FAILURE
 	select HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE
 	select NO_FIXED_XIP_ROM_SIZE

src/soc/intel/cannonlake/Kconfig

@@ -76,7 +76,6 @@ config CPU_SPECIFIC_OPTIONS
 	select PARALLEL_MP
 	select PARALLEL_MP_AP_WORK
 	select PLATFORM_USES_FSP2_0
-	select POSTCAR_STAGE
 	select REG_SCRIPT
 	select SMP
 	select SOC_AHCI_PORT_IMPLEMENTED_INVERT

src/soc/intel/denverton_ns/Kconfig

@@ -32,7 +32,6 @@ config CPU_SPECIFIC_OPTIONS
 	select SOC_INTEL_COMMON
 	select SOC_INTEL_COMMON_RESET
 	select PLATFORM_USES_FSP2_0
-	select POSTCAR_STAGE
 	select C_ENVIRONMENT_BOOTBLOCK
 	select IOAPIC
 	select HAVE_SMI_HANDLER

src/soc/intel/icelake/Kconfig

@@ -32,7 +32,6 @@ config CPU_SPECIFIC_OPTIONS
 	select PARALLEL_MP_AP_WORK
 	select MICROCODE_BLOB_UNDISCLOSED
 	select PLATFORM_USES_FSP2_1
-	select POSTCAR_STAGE
 	select REG_SCRIPT
 	select SMP
 	select SOC_AHCI_PORT_IMPLEMENTED_INVERT

src/soc/intel/skylake/Kconfig

@@ -92,7 +92,6 @@ config USE_FSP2_0_DRIVER
 	select PLATFORM_USES_FSP2_0
 	select UDK_2015_BINDING
 	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
-	select POSTCAR_STAGE
 
 config USE_FSP1_1_DRIVER
 	def_bool y