Patch set updated for coreboot: mainboard/asus/kgpe-d16: Enable CBFS spinlocks

[Timothy Pearson]

Timothy Pearson ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12062

-gerrit

commit d53de0c5984082cf3be1e88840268efc77838aaf
Author: Timothy Pearson 
Date:   Fri Aug 28 20:02:45 2015 -0500

mainboard/asus/kgpe-d16: Enable CBFS spinlocks

Change-Id: I8f6226d3e74ac5c7f29f708128a7502ced1287bf
    Signed-off-by: Timothy Pearson 
---
 src/mainboard/asus/kgpe-d16/Kconfig    |  1 +
 src/mainboard/asus/kgpe-d16/romstage.c | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/asus/kgpe-d16/Kconfig b/src/mainboard/asus/kgpe-d16/Kconfig
index 67b43ca..49dd37b 100644
--- a/src/mainboard/asus/kgpe-d16/Kconfig
+++ b/src/mainboard/asus/kgpe-d16/Kconfig
@@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
    select SUPERIO_NUVOTON_NCT5572D
    select PARALLEL_CPU_INIT
    select HAVE_ROMSTAGE_CONSOLE_SPINLOCK
+	select HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK
    select HAVE_HARD_RESET
    select HAVE_OPTION_TABLE
    select HAVE_CMOS_DEFAULT
diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index 13eacd2..f9af195 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -324,6 +324,18 @@ void initialize_romstage_console_lock(void)
    car_get_var(printk_spinlock) = SPIN_LOCK_UNLOCKED;
 }

+static spinlock_t nvram_cbfs_spinlock CAR_GLOBAL;
+
+spinlock_t* romstage_nvram_cbfs_lock(void)
+{
+	return car_get_var_ptr(&nvram_cbfs_spinlock);
+}
+
+void initialize_romstage_nvram_cbfs_lock(void)
+{
+	car_get_var(nvram_cbfs_spinlock) = SPIN_LOCK_UNLOCKED;
+}
+
 void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 {
    uint32_t esp;
@@ -350,8 +362,9 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    	timestamp_init(timestamp_get());
    	timestamp_add_now(TS_START_ROMSTAGE);

-		/* Initialize the printk spinlock */
+		/* Initialize the printk and nvram CBFS spinlocks */
    	initialize_romstage_console_lock();
+		initialize_romstage_nvram_cbfs_lock();

/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */