<p>Simon Glass has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25011">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">kahlee: Add SKU support<br><br>We want to report the board SKU via the SMBIOS tables. Add support for<br>this, obtaining the ID itself from the EC.<br><br>I'm not quite sure of the correct code layout/naming, so please check.<br><br>BUG=b:74175244<br>BRANCH=none<br>TEST=manually on grunt with another CL:<br>mosys platform sku<br>0<br><br>Change-Id: I9e08d64df3f89d3703de047dd9ec8e1717e6b212<br>Signed-off-by: Simon Glass <sjg@chromium.org><br>---<br>M src/mainboard/google/kahlee/mainboard.c<br>M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/kahlee/variants/grunt/Makefile.inc<br>A src/mainboard/google/kahlee/variants/grunt/mainboard.c<br>4 files changed, 48 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/11/25011/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c</span><br><span>index 753a83e..e82569e 100644</span><br><span>--- a/src/mainboard/google/kahlee/mainboard.c</span><br><span>+++ b/src/mainboard/google/kahlee/mainboard.c</span><br><span>@@ -13,6 +13,7 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <string.h></span><br><span> #include <console/console.h></span><br><span> #include <device/device.h></span><br><span> #include <arch/acpi.h></span><br><span>@@ -21,6 +22,7 @@</span><br><span> #include <cbmem.h></span><br><span> #include <baseboard/variants.h></span><br><span> #include <boardid.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <smbios.h></span><br><span> #include <soc/nvs.h></span><br><span> #include <soc/pci_devs.h></span><br><span> #include <soc/smi.h></span><br><span>@@ -221,3 +223,18 @@</span><br><span> .enable_dev = kahlee_enable,</span><br><span> .final = mainboard_final,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Variants may override this function so see definitions in variants/ */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t __attribute__((weak)) variant_board_sku(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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%);">+const char *smbios_mainboard_sku(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static char sku_str[7]; /* sku{0..255} */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(sku_str, sizeof(sku_str), "sku%d", variant_board_sku());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return sku_str;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>index 83ee119..e5a348a 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -24,6 +24,8 @@</span><br><span> </span><br><span> const struct sci_source *get_gpe_table(size_t *num);</span><br><span> uint8_t variant_memory_sku(void);</span><br><span style="color: hsl(120, 100%, 40%);">+/* Return board SKU. Limited to uint8_t, so it fits into 3 decimal digits */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t variant_board_sku(void);</span><br><span> int variant_mainboard_read_spd(uint8_t spdAddress, char *buf, size_t len);</span><br><span> int variant_get_xhci_oc_map(uint16_t *usb_oc_map);</span><br><span> int variant_get_ehci_oc_map(uint16_t *usb_oc_map);</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>index 319ff13..7a4b994 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>+++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>@@ -14,3 +14,5 @@</span><br><span> #</span><br><span> </span><br><span> subdirs-y += spd</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += mainboard.c</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/mainboard.c b/src/mainboard/google/kahlee/variants/grunt/mainboard.c</span><br><span>new file mode 100644</span><br><span>index 0000000..16a8ea9</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/kahlee/variants/grunt/mainboard.c</span><br><span>@@ -0,0 +1,27 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright 2018 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</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%);">+#include <ec/google/chromeec/ec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include "baseboard/variants.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t variant_board_sku(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static int sku = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sku == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ sku = google_chromeec_get_sku_id();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return sku;</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/25011">change 25011</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/25011"/><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: I9e08d64df3f89d3703de047dd9ec8e1717e6b212 </div>
<div style="display:none"> Gerrit-Change-Number: 25011 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Simon Glass <sjg@chromium.org> </div>