[coreboot-gerrit] Change in ...coreboot[master]: soc/intel/common/gpsi: Don't use CAR_GLOBAL

[Arthur Heymans (Code Review)]

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

Change subject: soc/intel/common/gpsi: Don't use CAR_GLOBAL
......................................................................

soc/intel/common/gpsi: Don't use CAR_GLOBAL

All platforms using this code have NO_CAR_GLOBAL_MIGRATION.

Change-Id: I5dfbc718fd82f0511b0049383e4e93c6f15ee932
Signed-off-by: Arthur Heymans 
---
M src/soc/intel/common/block/gspi/gspi.c
1 file changed, 4 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/32999/1

diff --git a/src/soc/intel/common/block/gspi/gspi.c b/src/soc/intel/common/block/gspi/gspi.c
index 81eb7ee..7fd7d0f 100644
--- a/src/soc/intel/common/block/gspi/gspi.c
+++ b/src/soc/intel/common/block/gspi/gspi.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */

-#include <arch/early_variables.h>
 #include <device/mmio.h>
 #include <assert.h>
 #include <console/console.h>
@@ -262,15 +261,13 @@
    return cfg[gspi_bus].speed_mhz;
 }

-static uintptr_t gspi_base[CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX] CAR_GLOBAL;
+static uintptr_t gspi_base[CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX];
 static uintptr_t gspi_get_bus_base_addr(unsigned int gspi_bus)
 {
-	uintptr_t *base = car_get_var_ptr(gspi_base);
+	if (!gspi_base[gspi_bus])
+		gspi_base[gspi_bus] = gspi_calc_base_addr(gspi_bus);

-	if (!base[gspi_bus])
-		base[gspi_bus] = gspi_calc_base_addr(gspi_bus);
-
-	return base[gspi_bus];
+	return gspi_base[gspi_bus];
 }

/* Parameters for GSPI controller operation. */