[coreboot-gerrit] [S] Change in coreboot[main]: mb/google/fizz: Use CFR setup menu to manage options

[Matt DeVillier (Code Review)]

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/87565?usp=email )

Change subject: mb/google/fizz: Use CFR setup menu to manage options
......................................................................

mb/google/fizz: Use CFR setup menu to manage options

Enable support for managing system options via CFR, and select it by
default when using edk2 with SMMSTORE.

TEST=build/boot fizz w/edk2 payload

Change-Id: I211a91f16622b048d15ebe373106b0f70b429312
Signed-off-by: Matt DeVillier 
---
M src/mainboard/google/fizz/Kconfig
M src/mainboard/google/fizz/Makefile.mk
A src/mainboard/google/fizz/cfr.c
3 files changed, 46 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/87565/1

diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 84a5145..635170c 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -4,6 +4,7 @@
    def_bool n
    select BOARD_ROMSIZE_KB_16384
    select DRIVERS_I2C_GENERIC
+	select DRIVERS_OPTION_CFR_ENABLED if PAYLOAD_EDK2 && SMMSTORE
    select DRIVERS_SPI_ACPI
    select DRIVERS_USB_ACPI
    select EC_GOOGLE_CHROMEEC
diff --git a/src/mainboard/google/fizz/Makefile.mk b/src/mainboard/google/fizz/Makefile.mk
index 6c20356..a99eb95 100644
--- a/src/mainboard/google/fizz/Makefile.mk
+++ b/src/mainboard/google/fizz/Makefile.mk
@@ -7,6 +7,7 @@

romstage-$(CONFIG_CHROMEOS) += chromeos.c

+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
 ramstage-y += mainboard.c
diff --git a/src/mainboard/google/fizz/cfr.c b/src/mainboard/google/fizz/cfr.c
new file mode 100644
index 0000000..c775136
--- /dev/null
+++ b/src/mainboard/google/fizz/cfr.c
@@ -0,0 +1,44 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <drivers/option/cfr_frontend.h>
+#include <intelblocks/cfr.h>
+#include <soc/cfr.h>
+
+static struct sm_obj_form system = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&hyper_threading,
+		&igd_dvmt,
+		&igd_aperture,
+		&legacy_8254_timer,
+		&me_state,
+		&me_state_counter,
+		&pciexp_aspm,
+		&pciexp_clk_pm,
+		&pciexp_l1ss,
+		&pciexp_speed,
+		&s0ix_enable,
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form power = {
+	.ui_name = "Power",
+	.obj_list = (const struct sm_object *[]) {
+		&power_on_after_fail,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&system,
+	&power,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}