From 448243d26edc515616e32d95aaeb08cc4880d20d Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Thu, 18 May 2017 14:44:08 -0700
Subject: [PATCH] UPSTREAM: arch/x86: Add function to determine if we're
 currently running from CAR

This patch adds a simple function that can be used to check if
CAR_GLOBALs are currently being read from CAR or from DRAM.

BUG=none
BRANCH=none
TEST=none

Change-Id: I625af4f75b86b11e95a249ff1c14b9b5e9b04b06
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: a92851939cffcfa11d3abf80cc910a43bb48e6b0
Original-Change-Id: Ib7ad0896a691ef6e89e622b985417fedc43579c1
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/19787
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Philippe Mathieu-Daud <philippe.mathieu.daude@gmail.com>
Reviewed-on: https://chromium-review.googlesource.com/521026
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
---
 src/arch/x86/include/arch/early_variables.h | 9 +++++++++
 src/cpu/x86/car.c                           | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h
index d0cfda75aa..2c6c539654 100644
--- a/src/arch/x86/include/arch/early_variables.h
+++ b/src/arch/x86/include/arch/early_variables.h
@@ -44,12 +44,20 @@ static inline void *car_sync_var_ptr(void *var)
 {
 	return var;
 }
+
+static inline int car_active(void)
+{
+	return 1;
+}
 #else
 /* Get the correct pointer for the CAR global variable. */
 void *car_get_var_ptr(void *var);
 
 /* Get and update a CAR_GLOBAL pointing elsewhere in car.global_data*/
 void *car_sync_var_ptr(void *var);
+
+/* Return 1 when currently running with globals in Cache-as-RAM, 0 otherwise. */
+int car_active(void);
 #endif /* ENV_VERSTAGE */
 
 /* Get and set a primitive type global variable. */
@@ -73,6 +81,7 @@ static inline size_t car_object_offset(void *ptr)
 #else
 #define CAR_GLOBAL
 static inline void *car_get_var_ptr(void *var) { return var; }
+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)
diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c
index 606a35e2f6..1b02f8b7da 100644
--- a/src/cpu/x86/car.c
+++ b/src/cpu/x86/car.c
@@ -113,6 +113,11 @@ void *car_sync_var_ptr(void *var)
 	return mig_var;
 }
 
+int car_active(void)
+{
+	return !car_migrated;
+}
+
 static void do_car_migrate_variables(void)
 {
 	void *migrated_base;