<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21335">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gooble/kahlee: Use devicetree register values for UMA<br><br>Modify Kahlee's OemPostParams() to vary the UMA settings passed to<br>AmdInitPost().<br><br>BUG=b:64927639<br>TEST=default, and 64, 128, 256, 384MB non-legacy configurations.<br><br>Change-Id: I2bc808d8b402c3eb16a1a5962f3fa9d6b224cf52<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/mainboard/google/kahlee/OemCustomize.c<br>M src/mainboard/google/kahlee/devicetree.cb<br>2 files changed, 28 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/21335/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/kahlee/OemCustomize.c b/src/mainboard/google/kahlee/OemCustomize.c<br>index 2b3ac29..5da260b 100644<br>--- a/src/mainboard/google/kahlee/OemCustomize.c<br>+++ b/src/mainboard/google/kahlee/OemCustomize.c<br>@@ -1,7 +1,7 @@<br> /*<br>  * This file is part of the coreboot project.<br>  *<br>- * Copyright (C) 2015-2016 Advanced Micro Devices, Inc.<br>+ * Copyright (C) 2015-2017 Advanced Micro Devices, Inc.<br>  *<br>  * This program is free software; you can redistribute it and/or modify<br>  * it under the terms of the GNU General Public License as published by<br>@@ -13,8 +13,11 @@<br>  * GNU General Public License for more details.<br>  */<br> <br>+#include <device/device.h><br> #include <agesawrapper.h><br> #include <PlatformMemoryConfiguration.h><br>+#include <chip.h><br>+#include <soc/pci_devs.h><br> <br> #define FILECODE PROC_GNB_PCIE_FAMILY_0X15_F15PCIECOMPLEXCONFIG_FILECODE<br> <br>@@ -34,6 +37,27 @@<br> <br> void OemPostParams(AMD_POST_PARAMS *PostParams)<br> {<br>+       const struct soc_amd_stoneyridge_config *cfg;<br>+        const struct device *dev = dev_find_slot(0, GNB_DEVFN);<br>+<br>+   if (!dev || !dev->chip_info)<br>+              printk(BIOS_ERR, "BUG! Could not find SoC devicetree config\n");<br>+   cfg = dev->chip_info;<br>+<br>   PostParams->MemConfig.PlatformMemoryConfiguration =<br>                                (PSO_ENTRY *)DDR4PlatformMemoryConfiguration;<br>+<br>+     if (IS_ENABLED(CONFIG_GFXUMA)) {<br>+             PostParams->MemConfig.UmaMode = cfg->uma_mode;<br>+         PostParams->MemConfig.UmaVersion = cfg->uma_type;<br>+              if (cfg->uma_mode == UMAMODE_SPECIFIED)<br>+                   PostParams->MemConfig.UmaSize = cfg->uma_size;<br>+         else<br>+                 PostParams->MemConfig.UmaSize = 0;<br>+        } else {<br>+             if (cfg->uma_mode != UMAMODE_NONE)<br>+                        printk(BIOS_WARNING, "Warning: UMA mode was requested "<br>+                                    "but CONFIG_GFXUMA is not enabled\n");<br>+             PostParams->MemConfig.UmaMode = UMAMODE_NONE;<br>+     }<br> }<br>diff --git a/src/mainboard/google/kahlee/devicetree.cb b/src/mainboard/google/kahlee/devicetree.cb<br>index 0ed3336..0be629b 100644<br>--- a/src/mainboard/google/kahlee/devicetree.cb<br>+++ b/src/mainboard/google/kahlee/devicetree.cb<br>@@ -18,6 +18,9 @@<br>         {<br>             { {0xA0, 0x00} }, // socket 0 - Channel 0, slot 0<br>     }"<br>+      register "uma_type" = "UMATYPE_LEGACY"<br>+   register "uma_mode" = "UMAMODE_AUTO"<br>+     register "uma_size" = "0"<br> <br>      device cpu_cluster 0 on<br>               device lapic 10 on end<br></pre><p>To view, visit <a href="https://review.coreboot.org/21335">change 21335</a>. To unsubscribe, 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/21335"/><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: I2bc808d8b402c3eb16a1a5962f3fa9d6b224cf52 </div>
<div style="display:none"> Gerrit-Change-Number: 21335 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>