summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/drivers/mrc_cache/Kconfig9
-rw-r--r--src/drivers/mrc_cache/mrc_cache.c10
2 files changed, 16 insertions, 3 deletions
diff --git a/src/drivers/mrc_cache/Kconfig b/src/drivers/mrc_cache/Kconfig
index 93ae6c6bf3..c367dcec95 100644
--- a/src/drivers/mrc_cache/Kconfig
+++ b/src/drivers/mrc_cache/Kconfig
@@ -29,4 +29,13 @@ config MRC_SETTINGS_VARIABLE_DATA
bool
default n
+config MRC_WRITE_NV_LATE
+ bool
+ default n
+ help
+ MRC settings are normally written to NVRAM at BS_DEV_ENUMERATE-EXIT.
+ If a platform requires MRC settings written to NVRAM later than
+ normal, select this item. This will cause the write to occur at
+ BS_OS_RESUME_CHECK-ENTRY.
+
endif # CACHE_MRC_SETTINGS
diff --git a/src/drivers/mrc_cache/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c
index 3a9689645f..9732185646 100644
--- a/src/drivers/mrc_cache/mrc_cache.c
+++ b/src/drivers/mrc_cache/mrc_cache.c
@@ -574,8 +574,12 @@ static void update_mrc_cache(void *unused)
}
/*
- * Ensures MRC training data is stored into SPI after PCI enumeration is done
- * during BS_DEV_ENUMERATE-BS_ON_EXIT and lock down SPI protected ranges
- * during BS_DEV_RESOURCES-BS_ON_EXIT.
+ * Ensures MRC training data is stored into SPI after PCI enumeration is done.
+ * Some implementations may require this to be later than others.
*/
+
+#if IS_ENABLED(CONFIG_MRC_WRITE_NV_LATE)
+BOOT_STATE_INIT_ENTRY(BS_OS_RESUME_CHECK, BS_ON_ENTRY, update_mrc_cache, NULL);
+#else
BOOT_STATE_INIT_ENTRY(BS_DEV_ENUMERATE, BS_ON_EXIT, update_mrc_cache, NULL);
+#endif