<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26499">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy/variants/nami: Perform PL2 setting in variant_devtree_udpate<br><br>This change moves PL2 override to variant_devtree_update for two reasons:<br>1. This function was added to basically override devtree settings in<br>variant specific code. So, it would be a good idea to perform all the<br>overrides in a single place.<br>2. Adding a device for performing nami_enable would require changes to<br>devicetree and special handling for calling this device enable. Thus,<br>nami_enable was never getting called.<br><br>BUG=b:80148703<br><br>Change-Id: Ifa24a7b6e99cad2368b3d656a757f26297373121<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/poppy/variants/nami/Makefile.inc<br>M src/mainboard/google/poppy/variants/nami/mainboard.c<br>D src/mainboard/google/poppy/variants/nami/pl2.c<br>3 files changed, 22 insertions(+), 51 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/26499/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>index e9e90f5..618011c 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>@@ -33,7 +33,6 @@</span><br><span> </span><br><span> ramstage-y += gpio.c</span><br><span> ramstage-y += nhlt.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += pl2.c</span><br><span> ramstage-y += mainboard.c</span><br><span> </span><br><span> # Add OEM ID table</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>index 6ff2960..19a5604 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>@@ -23,11 +23,26 @@</span><br><span> #include <device/device.h></span><br><span> #include <drivers/intel/gma/opregion.h></span><br><span> #include <ec/google/chromeec/ec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <intelblocks/mp_init.h></span><br><span> #include <smbios.h></span><br><span> #include <soc/ramstage.h></span><br><span> #include <string.h></span><br><span> #include <variant/sku.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define PL2_I7_SKU 44</span><br><span style="color: hsl(120, 100%, 40%);">+#define PL2_DEFAULT 29</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t get_pl2(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cpuid_result cpuidr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cpuidr = cpuid(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpuidr.eax == CPUID_KABYLAKE_Y0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return PL2_I7_SKU;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return PL2_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> uint32_t variant_board_sku(void)</span><br><span> {</span><br><span> static uint32_t sku_id = SKU_UNKNOWN;</span><br><span>@@ -42,16 +57,21 @@</span><br><span> return sku_id;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Override dev tree settings per board */</span><br><span> void variant_devtree_update(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Override dev tree settings per board */</span><br><span> uint32_t sku_id = variant_board_sku();</span><br><span> struct device *root = SA_DEV_ROOT;</span><br><span> config_t *cfg = root->chip_info;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Update PL2 based on SKU. */</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->tdp_pl2_override = get_pl2();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (sku_id) {</span><br><span> case SKU_1_VAYNE:</span><br><span> case SKU_2_VAYNE:</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->usb2_ports[5].enable = 0;//rear camera</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Disable unused port USB port */</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->usb2_ports[5].enable = 0;</span><br><span> break;</span><br><span> default:</span><br><span> break;</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/pl2.c b/src/mainboard/google/poppy/variants/nami/pl2.c</span><br><span>deleted file mode 100644</span><br><span>index 6744f2c..0000000</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/pl2.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,48 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * This file is part of the coreboot project.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright 2017 Google Inc.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <arch/cpu.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <chip.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <device/device.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <intelblocks/mp_init.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define PL2_I7_SKU 44</span><br><span style="color: hsl(0, 100%, 40%);">-#define PL2_DEFAULT 29</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t nami_get_pl2(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct cpuid_result cpuidr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- cpuidr = cpuid(1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (cpuidr.eax == CPUID_KABYLAKE_Y0)</span><br><span style="color: hsl(0, 100%, 40%);">- return PL2_I7_SKU;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return PL2_DEFAULT;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void nami_enable(device_t dev)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *root = SA_DEV_ROOT;</span><br><span style="color: hsl(0, 100%, 40%);">- config_t *conf = root->chip_info;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!conf)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- conf->tdp_pl2_override = nami_get_pl2();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct chip_operations nami_ops = {</span><br><span style="color: hsl(0, 100%, 40%);">- .enable_dev = nami_enable,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26499">change 26499</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/26499"/><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: Ifa24a7b6e99cad2368b3d656a757f26297373121 </div>
<div style="display:none"> Gerrit-Change-Number: 26499 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>