[coreboot-gerrit] Change in coreboot[master]: mb/google/volteer: Add audio fw_config to SMBIOS OEM strings

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44783 )

Change subject: mb/google/volteer: Add audio fw_config to SMBIOS OEM strings
......................................................................

mb/google/volteer: Add audio fw_config to SMBIOS OEM strings

Some Linux kernel drivers bind to "DMI quirks." In this case, the audio
fw_config is added as an OEM string, e.g., "AUDIO-MAX98357_ALC5682I_I2S"
so the audio topology can be correctly discovered.

BUG=b:161963281
TEST=dmidecode -t 11 and see AUDIO-NONE for my board. Rewrote CBI field
to indicate another audio fw_config, and verify using dmidecode.

Signed-off-by: Tim Wawrzynczak 
Change-Id: I7b7586b0ebfe7b2fd888f448a50ae086364fa718
---
M src/mainboard/google/volteer/mainboard.c
M src/mainboard/google/volteer/variants/baseboard/devicetree.cb
2 files changed, 20 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/44783/1

diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index 5bece68..ee67555 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -5,6 +5,7 @@
 #include <baseboard/variants.h>
 #include <device/device.h>
 #include <ec/ec.h>
+#include <fw_config.h>
 #include <soc/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <variant/gpio.h>
@@ -14,10 +15,28 @@
    mainboard_ec_init();
 }

+static void add_fw_config(const struct fw_config *config, void *arg)
+{
+	char buffer[64];
+	struct smbios_type11 *t = arg;
+
+	if (!config || config->mask != FW_CONFIG_FIELD_AUDIO_MASK)
+		return;
+
+	snprintf(buffer, sizeof(buffer), "%s-%s", config->field_name, config->option_name);
+	t->count = smbios_add_string(t->eos, buffer);
+}
+
+static void mainboard_smbios_strings(struct device *dev, struct smbios_type11 *t)
+{
+	fw_config_for_each_cached(add_fw_config, t);
+}
+
 static void mainboard_enable(struct device *dev)
 {
    dev->ops->init = mainboard_init;
    dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
+	dev->ops->get_smbios_strings = mainboard_smbios_strings;
 }

static void mainboard_chip_init(void *chip_info)
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index ffae2f0..faf1dfb 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -47,7 +47,7 @@
    register "HeciEnabled" = "1"

# FSP configuration
-	register "SaGv" = "SaGv_Enabled"
+	register "SaGv" = "SaGv_Disabled"
    register "SmbusEnable" = "0"

register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)"	# Type-A Port A0