<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22249">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common/psp: Require PSP PCI definition in SOC<br><br>Remove the definition for the PSP PCI definition from the common PSP<br>code.  Any device using this source should have its own definitions,<br>and this allows for the device to move within the config space.<br><br>Change-Id: Ie41dfa348b04f655640b4259b1aa518376655251<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/common/block/include/amdblocks/psp.h<br>M src/soc/amd/common/block/psp/psp.c<br>2 files changed, 4 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/22249/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h<br>index 42b9fb7..d210498 100644<br>--- a/src/soc/amd/common/block/include/amdblocks/psp.h<br>+++ b/src/soc/amd/common/block/include/amdblocks/psp.h<br>@@ -16,6 +16,7 @@<br> #ifndef __AMD_PSP_H__<br> #define __AMD_PSP_H__<br> <br>+#include <soc/pci_devs.h><br> #include <stdint.h><br> #include <compiler.h><br> #include <Porting.h><br>@@ -78,15 +79,6 @@<br> #define PSPSTS_SEND_ERROR   4<br> #define PSPSTS_INIT_TIMEOUT 5<br> #define PSPSTS_CMD_TIMEOUT  6<br>-<br>-#if !defined(__SIMPLE_DEVICE__)<br>-#include <device/device.h><br>-#include <device/pci_def.h><br>-#define PSP_DEV dev_find_slot(0, PCI_DEVFN(PSP_PCI_DEV, PSP_PCI_FN))<br>-#else<br>-#include <arch/io.h><br>-#define PSP_DEV PCI_DEV(0, PSP_PCI_DEV, PSP_PCI_FN)<br>-#endif<br> <br> #define PSP_INIT_TIMEOUT 10000 /* 10 seconds */<br> #define PSP_CMD_TIMEOUT 1000 /* 1 second */<br>diff --git a/src/soc/amd/common/block/psp/psp.c b/src/soc/amd/common/block/psp/psp.c<br>index 788de2c..8b3605e 100644<br>--- a/src/soc/amd/common/block/psp/psp.c<br>+++ b/src/soc/amd/common/block/psp/psp.c<br>@@ -127,8 +127,8 @@<br>   if (!mbox)<br>            return -PSPSTS_NOBASE;<br> <br>-    command_reg = pci_read_config32(PSP_DEV, PCI_COMMAND);<br>-       pci_write_config32(PSP_DEV, PCI_COMMAND, command_reg |<br>+       command_reg = pci_read_config32(SOC_PSP_DEV, PCI_COMMAND);<br>+   pci_write_config32(SOC_PSP_DEV, PCI_COMMAND, command_reg |<br>                            PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);<br> <br>  /* check for PSP error conditions */<br>@@ -168,7 +168,7 @@<br>     }<br> exit:<br>     /* restore command register to original value */<br>-     pci_write_config32(PSP_DEV, PCI_COMMAND, command_reg);<br>+       pci_write_config32(SOC_PSP_DEV, PCI_COMMAND, command_reg);<br>    return status;<br> }<br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/22249">change 22249</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/22249"/><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: Ie41dfa348b04f655640b4259b1aa518376655251 </div>
<div style="display:none"> Gerrit-Change-Number: 22249 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>