<p>Wisley Chen has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29466">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/octopus: Add support to get OEM name from CBFS<br><br>refer to https://review.coreboot.org/c/coreboot/+/26142<br><br>This change:<br>1. Allows mainboard to add OEM table to CBFS<br>2. Provides mainboard specific smbios_mainboard_manufacturer that reads<br>OEM ID from EC using CBI and compares it against the OEM ID in CBFS<br>table to identify the right OEM string.<br><br>BUG=b:118798180<br>TEST=emerge-ocotopus coreboot<br><br>Change-Id: Idd7385db9a6189d70b92d31a0aa00ed03b37404c<br>Signed-off-by: Wisley Chen <wisley.chen@quantatw.com><br>---<br>M src/mainboard/google/octopus/Kconfig<br>M src/mainboard/google/octopus/Makefile.inc<br>M src/mainboard/google/octopus/mainboard.c<br>3 files changed, 87 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/29466/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig</span><br><span>index f00803d..d4e8e58 100644</span><br><span>--- a/src/mainboard/google/octopus/Kconfig</span><br><span>+++ b/src/mainboard/google/octopus/Kconfig</span><br><span>@@ -136,4 +136,8 @@</span><br><span> default 1 if BOARD_GOOGLE_MEEP</span><br><span> default 255 if BOARD_GOOGLE_OCTOPUS</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config OEM_BIN_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ string "OEM ID table"</span><br><span style="color: hsl(120, 100%, 40%);">+ default ""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif # BOARD_GOOGLE_OCTOPUS</span><br><span>diff --git a/src/mainboard/google/octopus/Makefile.inc b/src/mainboard/google/octopus/Makefile.inc</span><br><span>index 1a9adbc..9f28956 100644</span><br><span>--- a/src/mainboard/google/octopus/Makefile.inc</span><br><span>+++ b/src/mainboard/google/octopus/Makefile.inc</span><br><span>@@ -16,3 +16,8 @@</span><br><span> VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR))</span><br><span> subdirs-y += variants/$(VARIANT_DIR)</span><br><span> CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Add OEM ID table</span><br><span style="color: hsl(120, 100%, 40%);">+cbfs-files-y += oem.bin</span><br><span style="color: hsl(120, 100%, 40%);">+oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE))</span><br><span style="color: hsl(120, 100%, 40%);">+oem.bin-type := raw</span><br><span>diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c</span><br><span>index fceb95d..6ca99f7 100644</span><br><span>--- a/src/mainboard/google/octopus/mainboard.c</span><br><span>+++ b/src/mainboard/google/octopus/mainboard.c</span><br><span>@@ -16,7 +16,9 @@</span><br><span> #include <arch/acpi.h></span><br><span> #include <baseboard/variants.h></span><br><span> #include <boardid.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cbfs.h></span><br><span> #include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <commonlib/cbfs_serialized.h></span><br><span> #include <device/device.h></span><br><span> #include <device/pci_def.h></span><br><span> #include <device/pci_ops.h></span><br><span>@@ -180,3 +182,79 @@</span><br><span> /* Defer to variant for board-specific updates. */</span><br><span> variant_update_devtree(dev);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define OEM_UNKNOWN 0xff</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Read OEM ID from EC using cbi commands.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Return value:</span><br><span style="color: hsl(120, 100%, 40%);">+ * Success = OEM ID read from EC</span><br><span style="color: hsl(120, 100%, 40%);">+ * Failure = OEM_UNKNOWN (0xff)</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t read_oem_id(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t oem_id = OEM_UNKNOWN;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (oem_id != OEM_UNKNOWN)</span><br><span style="color: hsl(120, 100%, 40%);">+ return oem_id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (google_chromeec_cbi_get_oem_id(&id))</span><br><span style="color: hsl(120, 100%, 40%);">+ return OEM_UNKNOWN;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (id > OEM_UNKNOWN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "%s: OEM ID too big %u!\n", __func__, id);</span><br><span style="color: hsl(120, 100%, 40%);">+ return OEM_UNKNOWN;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ oem_id = id;</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "%s: OEM ID=%d\n", __func__, oem_id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return oem_id;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* "oem.bin" in cbfs contains array of records using the following structure. */</span><br><span style="color: hsl(120, 100%, 40%);">+struct oem_mapping {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t oem_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ char oem_name[10];</span><br><span style="color: hsl(120, 100%, 40%);">+} __packed;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Local buffer to read "oem.bin" */</span><br><span style="color: hsl(120, 100%, 40%);">+static char oem_bin_data[200];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const char *smbios_mainboard_manufacturer(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t oem_id = read_oem_id();</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct oem_mapping *oem_entry = (void *)&oem_bin_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t oem_data_size;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t curr = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static const char *manuf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (manuf)</span><br><span style="color: hsl(120, 100%, 40%);">+ return manuf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If OEM ID cannot be determined, return default manuf string. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (oem_id == OEM_UNKNOWN)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ oem_data_size = cbfs_boot_load_file("oem.bin", oem_bin_data,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(oem_bin_data),</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_RAW);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while ((curr < oem_data_size) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ ((oem_data_size - curr) >= sizeof(*oem_entry))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (oem_id == oem_entry->oem_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ manuf = oem_entry->oem_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ curr += sizeof(*oem_entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ oem_entry++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (manuf == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return manuf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29466">change 29466</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29466"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Idd7385db9a6189d70b92d31a0aa00ed03b37404c </div>
<div style="display:none"> Gerrit-Change-Number: 29466 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Wisley Chen <wisley.chen@quantatw.com> </div>
<div style="display:none"> Gerrit-Reviewer: Wisley Chen <wisley.chen@quanta.corp-partner.google.com> </div>