From 12431d6eef53454907711dcd1545a0540ba57bbe Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Tue, 25 Dec 2018 03:00:34 +0100
Subject: [PATCH] Makefile.inc: Create a default SMMSTORE region

Change-Id: I7b7b75050e0139ea9a0a4f2ad3c0d69a482fb38b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/30421
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 Makefile.inc                  | 19 ++++++++++++++++++-
 src/drivers/smmstore/Kconfig  | 11 +++++++++++
 util/cbfstool/default-x86.fmd |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc b/Makefile.inc
index dfdd8f6f37..469ad7a665 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -882,12 +882,28 @@ FMAP_MRC_CACHE_SIZE := 0
 FMAP_MRC_CACHE_ENTRY :=
 endif # ifeq ($(CONFIG_CACHE_MRC_SETTINGS),y)
 
+#
+# X86 SMMSTORE FMAP region
+#
+# position, size and entry line of SMMSTORE relative to BIOS_BASE, if enabled
+ifeq ($(CONFIG_SMMSTORE),y)
+FMAP_SMMSTORE_BASE := $(call int-align, $(call int-add, $(FMAP_CONSOLE_BASE) \
+	$(FMAP_CONSOLE_SIZE) $(FMAP_MRC_CACHE_SIZE)), 0x10000)
+FMAP_SMMSTORE_SIZE := $(CONFIG_SMMSTORE_SIZE)
+FMAP_SMMSTORE_ENTRY := SMMSTORE@$(FMAP_SMMSTORE_BASE) $(FMAP_SMMSTORE_SIZE)
+else # ifeq ($(CONFIG_SMMSTORE),y)
+FMAP_SMMSTORE_BASE := 0
+FMAP_SMMSTORE_SIZE := 0
+FMAP_SMMSTORE_ENTRY :=
+endif # ifeq ($(CONFIG_CACHE_MRC_SETTINGS),y)
+
 #
 # X86 FMAP region
 #
 #
 # position, size
-FMAP_FMAP_BASE := $(call int-add, $(FMAP_CONSOLE_SIZE) $(FMAP_MRC_CACHE_SIZE))
+FMAP_FMAP_BASE := $(call int-add, $(FMAP_CONSOLE_BASE) $(FMAP_CONSOLE_SIZE) \
+	$(FMAP_MRC_CACHE_SIZE) $(FMAP_SMMSTORE_SIZE))
 FMAP_FMAP_SIZE := 0x200
 
 #
@@ -961,6 +977,7 @@ $(obj)/fmap.fmd: $(top)/Makefile.inc $(DEFAULT_FLASHMAP) $(obj)/config.h
 	    -e "s,##FMAP_SIZE##,$(FMAP_FMAP_SIZE)," \
 	    -e "s,##CONSOLE_ENTRY##,$(FMAP_CONSOLE_ENTRY)," \
 	    -e "s,##MRC_CACHE_ENTRY##,$(FMAP_MRC_CACHE_ENTRY)," \
+	    -e "s,##SMMSTORE_ENTRY##,$(FMAP_SMMSTORE_ENTRY)," \
 	    -e "s,##CBFS_BASE##,$(FMAP_CBFS_BASE)," \
 	    -e "s,##CBFS_SIZE##,$(FMAP_CBFS_SIZE)," \
 		$(DEFAULT_FLASHMAP) > $@.tmp
diff --git a/src/drivers/smmstore/Kconfig b/src/drivers/smmstore/Kconfig
index 1ab3a5e941..e59e78decc 100644
--- a/src/drivers/smmstore/Kconfig
+++ b/src/drivers/smmstore/Kconfig
@@ -37,4 +37,15 @@ config SMMSTORE_FILENAME
 	string "SMM store file name" if SMMSTORE_IN_CBFS
 	default "smm_store"
 
+config SMMSTORE_SIZE
+	hex "size of the SMMSTORE FMAP region"
+	depends on !SMMSTORE_IN_CBFS
+	default 0x40000
+	help
+	  Sets the size of the default SMMSTORE FMAP region.
+	  If using an UEFI payload, note that UEFI specifies at least 64K.
+	  The current implementation of SMMSTORE is append only, so until
+	  garbage collection is implemented it is better to set this to
+	  a rather large value.
+
 endif
diff --git a/util/cbfstool/default-x86.fmd b/util/cbfstool/default-x86.fmd
index 174db1f268..f0143e9575 100644
--- a/util/cbfstool/default-x86.fmd
+++ b/util/cbfstool/default-x86.fmd
@@ -11,6 +11,7 @@ FLASH@##ROM_BASE## ##ROM_SIZE## {
 	BIOS@##BIOS_BASE## ##BIOS_SIZE## {
 		##CONSOLE_ENTRY##
 		##MRC_CACHE_ENTRY##
+		##SMMSTORE_ENTRY##
 		FMAP@##FMAP_BASE## ##FMAP_SIZE##
 		COREBOOT(CBFS)@##CBFS_BASE## ##CBFS_SIZE##
 	}