<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29343">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoneyridge: Set IOMMU support to follow device setting<br><br>Instead of forcing the IOMMU to be enabled, change it to only be enabled<br>if the device is enabled in devicetree.<br><br>BUG=b:118612241<br>TEST=Verify that IOMMU is disabled.<br><br>Change-Id: I6cfd6c81f47de23c54a49ec7cf87b219215ced5e<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/soc/amd/common/block/pi/agesawrapper.c<br>M src/soc/amd/stoneyridge/northbridge.c<br>2 files changed, 8 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/29343/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>index 87e0b69..3e7f6f9 100644</span><br><span>--- a/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>+++ b/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <amdblocks/agesawrapper.h></span><br><span> #include <amdblocks/image.h></span><br><span> #include <amdblocks/BiosCallOuts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/pci_devs.h></span><br><span> #include <soc/southbridge.h></span><br><span> #include <soc/northbridge.h></span><br><span> #include <soc/cpu.h></span><br><span>@@ -323,8 +324,11 @@</span><br><span>   */</span><br><span>  AMD_LATE_PARAMS *LateParams = create_struct(&AmdParamStruct);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   LateParams->GnbLateConfiguration.GnbIoapicId = CONFIG_MAX_CPUS + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-  LateParams->GnbLateConfiguration.FchIoapicId = CONFIG_MAX_CPUS;</span><br><span style="color: hsl(120, 100%, 40%);">+    const struct device *dev = dev_find_slot(0, IOMMU_DEVFN);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (!dev->enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+               LateParams->GnbLateConfiguration.GnbIoapicId = CONFIG_MAX_CPUS + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                LateParams->GnbLateConfiguration.FchIoapicId = CONFIG_MAX_CPUS;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> </span><br><span>        timestamp_add_now(TS_AGESA_INIT_LATE_START);</span><br><span>         Status = AmdInitLate(LateParams);</span><br><span>diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c</span><br><span>index a2ae52c..e981f83 100644</span><br><span>--- a/src/soc/amd/stoneyridge/northbridge.c</span><br><span>+++ b/src/soc/amd/stoneyridge/northbridge.c</span><br><span>@@ -509,7 +509,8 @@</span><br><span> </span><br><span> void SetNbEnvParams(GNB_ENV_CONFIGURATION *params)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- params->IommuSupport = TRUE;</span><br><span style="color: hsl(120, 100%, 40%);">+       const struct device *dev = SOC_IOMMU_DEV;</span><br><span style="color: hsl(120, 100%, 40%);">+     params->IommuSupport = dev->enabled;</span><br><span>   set_board_env_params(params);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29343">change 29343</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/29343"/><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: I6cfd6c81f47de23c54a49ec7cf87b219215ced5e </div>
<div style="display:none"> Gerrit-Change-Number: 29343 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>