From 3727708aefb03ac7ca0f15246cfded18b85b49b3 Mon Sep 17 00:00:00 2001
From: Marshall Dawson <marshalldawson3rd@gmail.com>
Date: Fri, 27 Oct 2017 20:12:46 -0600
Subject: [PATCH] soc/amd/common/psp: Require PSP PCI definition in SOC

Remove the definition for the PSP PCI device from the common PSP
code.  Any APU using this source should have its own definitions,
and this allows for the device to move within the config space.

Change-Id: Ie41dfa348b04f655640b4259b1aa518376655251
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/22249
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marc Jones <marc@marcjonesconsulting.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/soc/amd/common/block/include/amdblocks/psp.h | 10 +---------
 src/soc/amd/common/block/psp/psp.c               |  6 +++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h
index 42b9fb7178..d210498502 100644
--- a/src/soc/amd/common/block/include/amdblocks/psp.h
+++ b/src/soc/amd/common/block/include/amdblocks/psp.h
@@ -16,6 +16,7 @@
 #ifndef __AMD_PSP_H__
 #define __AMD_PSP_H__
 
+#include <soc/pci_devs.h>
 #include <stdint.h>
 #include <compiler.h>
 #include <Porting.h>
@@ -79,15 +80,6 @@ struct mbox_default_buffer {	/* command-response buffer unused by command */
 #define PSPSTS_INIT_TIMEOUT 5
 #define PSPSTS_CMD_TIMEOUT  6
 
-#if !defined(__SIMPLE_DEVICE__)
-#include <device/device.h>
-#include <device/pci_def.h>
-#define PSP_DEV dev_find_slot(0, PCI_DEVFN(PSP_PCI_DEV, PSP_PCI_FN))
-#else
-#include <arch/io.h>
-#define PSP_DEV PCI_DEV(0, PSP_PCI_DEV, PSP_PCI_FN)
-#endif
-
 #define PSP_INIT_TIMEOUT 10000 /* 10 seconds */
 #define PSP_CMD_TIMEOUT 1000 /* 1 second */
 
diff --git a/src/soc/amd/common/block/psp/psp.c b/src/soc/amd/common/block/psp/psp.c
index 788de2ceea..8b3605e6fa 100644
--- a/src/soc/amd/common/block/psp/psp.c
+++ b/src/soc/amd/common/block/psp/psp.c
@@ -127,8 +127,8 @@ static int send_psp_command(u32 command, void *buffer)
 	if (!mbox)
 		return -PSPSTS_NOBASE;
 
-	command_reg = pci_read_config32(PSP_DEV, PCI_COMMAND);
-	pci_write_config32(PSP_DEV, PCI_COMMAND, command_reg |
+	command_reg = pci_read_config32(SOC_PSP_DEV, PCI_COMMAND);
+	pci_write_config32(SOC_PSP_DEV, PCI_COMMAND, command_reg |
 				PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
 
 	/* check for PSP error conditions */
@@ -168,7 +168,7 @@ static int send_psp_command(u32 command, void *buffer)
 	}
 exit:
 	/* restore command register to original value */
-	pci_write_config32(PSP_DEV, PCI_COMMAND, command_reg);
+	pci_write_config32(SOC_PSP_DEV, PCI_COMMAND, command_reg);
 	return status;
 }