<p>Richard Spiegel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27817">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoneyridge: Disable SATA by default<br><br>Grunt based boards don't use SATA, so it should be disabled to save power.<br>However, other boards might use, so the change has to be configurable.<br>Create a config parameter that if selected will enable SATA, but if not<br>selected SATA will be disabled.<br><br>BUG=b:112139043<br>TEST=Buil and boot grunt, checked the absence of SATA PCI.<br><br>Change-Id: I33015baff5bbb869c40aa53d3ef316dcec377734<br>Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M src/soc/amd/stoneyridge/BiosCallOuts.c<br>M src/soc/amd/stoneyridge/Kconfig<br>M src/soc/amd/stoneyridge/southbridge.c<br>3 files changed, 38 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/27817/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/amd/stoneyridge/BiosCallOuts.c b/src/soc/amd/stoneyridge/BiosCallOuts.c</span><br><span>index 430dc45..bda5367 100644</span><br><span>--- a/src/soc/amd/stoneyridge/BiosCallOuts.c</span><br><span>+++ b/src/soc/amd/stoneyridge/BiosCallOuts.c</span><br><span>@@ -67,19 +67,22 @@</span><br><span> </span><br><span> /* SATA configuration */</span><br><span> FchParams_env->Sata.SataClass = CONFIG_STONEYRIDGE_SATA_MODE;</span><br><span style="color: hsl(0, 100%, 40%);">- switch ((SATA_CLASS)CONFIG_STONEYRIDGE_SATA_MODE) {</span><br><span style="color: hsl(0, 100%, 40%);">- case SataRaid:</span><br><span style="color: hsl(0, 100%, 40%);">- case SataAhci:</span><br><span style="color: hsl(0, 100%, 40%);">- case SataAhci7804:</span><br><span style="color: hsl(0, 100%, 40%);">- case SataLegacyIde:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_STONEYRIDGE_SATA_ENABLE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch ((SATA_CLASS)CONFIG_STONEYRIDGE_SATA_MODE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SataRaid:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SataAhci:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SataAhci7804:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SataLegacyIde:</span><br><span style="color: hsl(120, 100%, 40%);">+ FchParams_env->Sata.SataIdeMode = FALSE;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SataIde2Ahci:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SataIde2Ahci7804:</span><br><span style="color: hsl(120, 100%, 40%);">+ default: /* SataNativeIde */</span><br><span style="color: hsl(120, 100%, 40%);">+ FchParams_env->Sata.SataIdeMode = TRUE;</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%);">+ } else</span><br><span> FchParams_env->Sata.SataIdeMode = FALSE;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case SataIde2Ahci:</span><br><span style="color: hsl(0, 100%, 40%);">- case SataIde2Ahci7804:</span><br><span style="color: hsl(0, 100%, 40%);">- default: /* SataNativeIde */</span><br><span style="color: hsl(0, 100%, 40%);">- FchParams_env->Sata.SataIdeMode = TRUE;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> /* Platform updates */</span><br><span> platform_FchParams_env(FchParams_env);</span><br><span>diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig</span><br><span>index 7675bce..305aa83 100644</span><br><span>--- a/src/soc/amd/stoneyridge/Kconfig</span><br><span>+++ b/src/soc/amd/stoneyridge/Kconfig</span><br><span>@@ -191,6 +191,12 @@</span><br><span> string "AMD public Key"</span><br><span> default "3rdparty/blobs/soc/amd/stoneyridge/PSP/AmdPubKeyST.bin"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config STONEYRIDGE_SATA_ENABLE</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Enable Stoney Ridge SATA Controller"</span><br><span style="color: hsl(120, 100%, 40%);">+ default n</span><br><span style="color: hsl(120, 100%, 40%);">+ help</span><br><span style="color: hsl(120, 100%, 40%);">+ Select this option if your board uses SATA.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config STONEYRIDGE_SATA_MODE</span><br><span> int "SATA Mode"</span><br><span> default 0</span><br><span>diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c</span><br><span>index 63d8806..36cfc2b 100644</span><br><span>--- a/src/soc/amd/stoneyridge/southbridge.c</span><br><span>+++ b/src/soc/amd/stoneyridge/southbridge.c</span><br><span>@@ -73,17 +73,29 @@</span><br><span> void SetFchResetParams(FCH_RESET_INTERFACE *params)</span><br><span> {</span><br><span> params->Xhci0Enable = IS_ENABLED(CONFIG_STONEYRIDGE_XHCI_ENABLE);</span><br><span style="color: hsl(0, 100%, 40%);">- params->SataEnable = sb_sata_enable();</span><br><span style="color: hsl(0, 100%, 40%);">- params->IdeEnable = sb_ide_enable();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_STONEYRIDGE_SATA_ENABLE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ params->SataEnable = sb_sata_enable();</span><br><span style="color: hsl(120, 100%, 40%);">+ params->IdeEnable = sb_ide_enable();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ params->SataEnable = FALSE;</span><br><span style="color: hsl(120, 100%, 40%);">+ params->IdeEnable = FALSE;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> void SetFchEnvParams(FCH_INTERFACE *params)</span><br><span> {</span><br><span> params->AzaliaController = AzEnable;</span><br><span> params->SataClass = CONFIG_STONEYRIDGE_SATA_MODE;</span><br><span style="color: hsl(0, 100%, 40%);">- params->SataEnable = is_sata_config();</span><br><span style="color: hsl(0, 100%, 40%);">- params->IdeEnable = !params->SataEnable;</span><br><span style="color: hsl(0, 100%, 40%);">- params->SataIdeMode = (CONFIG_STONEYRIDGE_SATA_MODE == SataLegacyIde);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_STONEYRIDGE_SATA_ENABLE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ params->SataEnable = is_sata_config();</span><br><span style="color: hsl(120, 100%, 40%);">+ params->IdeEnable = !params->SataEnable;</span><br><span style="color: hsl(120, 100%, 40%);">+ params->SataIdeMode = (CONFIG_STONEYRIDGE_SATA_MODE ==</span><br><span style="color: hsl(120, 100%, 40%);">+ SataLegacyIde);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ params->SataEnable = FALSE;</span><br><span style="color: hsl(120, 100%, 40%);">+ params->IdeEnable = FALSE;</span><br><span style="color: hsl(120, 100%, 40%);">+ params->SataIdeMode = FALSE;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> void SetFchMidParams(FCH_INTERFACE *params)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27817">change 27817</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/27817"/><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: I33015baff5bbb869c40aa53d3ef316dcec377734 </div>
<div style="display:none"> Gerrit-Change-Number: 27817 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>