[coreboot-gerrit] [S] Change in coreboot[master]: [WIP] vc/amd/fsp/mendocino/FspmUpd: don't use pointers for usb_phy co...

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/70135 )

Change subject: [WIP] vc/amd/fsp/mendocino/FspmUpd: don't use pointers for usb_phy config
......................................................................

[WIP] vc/amd/fsp/mendocino/FspmUpd: don't use pointers for usb_phy config

The size of a pointer changes between a 32 and 64 bit coreboot build. In
order to be able to use a 32 bit FSP in a 64 bit coreboot build, change
the pointer in the UPDs to a uint32_t to always have a 32 bit field in
the UPD for this.

TEST=None

Signed-off-by: Felix Held 
Change-Id: I419fef73d2881e323487bc7fe641b2ac4041cb17
---
M src/soc/amd/mendocino/fsp_m_params.c
M src/vendorcode/amd/fsp/mendocino/FspmUpd.h
2 files changed, 28 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/70135/1

diff --git a/src/soc/amd/mendocino/fsp_m_params.c b/src/soc/amd/mendocino/fsp_m_params.c
index 8cbea5d..d6eae9a 100644
--- a/src/soc/amd/mendocino/fsp_m_params.c
+++ b/src/soc/amd/mendocino/fsp_m_params.c
@@ -6,6 +6,7 @@
 #include <amdblocks/ioapic.h>
 #include <amdblocks/memmap.h>
 #include <assert.h>
+#include <console/console.h>
 #include <console/uart.h>
 #include <device/device.h>
 #include <fsp/api.h>
@@ -157,9 +158,15 @@
    	lcl_usb_phy.Version_Major = FSP_USB_STRUCT_MAJOR_VERSION;
    	lcl_usb_phy.Version_Minor = FSP_USB_STRUCT_MINOR_VERSION;
    	lcl_usb_phy.TableLength = sizeof(struct usb_phy_config);
-		mcfg->usb_phy = &lcl_usb_phy;
+		if ((uintptr_t)&lcl_usb_phy <= UINT32_MAX) {
+			mcfg->usb_phy_ptr = (uint32_t)(uintptr_t)&lcl_usb_phy;
+		} else {
+			printk(BIOS_ERR, "USB PHY config struct above 4GB; can't pass USB PHY "
+					 "configuration to 32 bit FSP.\n");
+			mcfg->usb_phy_ptr = 0;
+		}
    } else {
-		mcfg->usb_phy = NULL;
+		mcfg->usb_phy_ptr = 0;
    }

fsp_fill_pcie_ddi_descriptors(mcfg);
diff --git a/src/vendorcode/amd/fsp/mendocino/FspmUpd.h b/src/vendorcode/amd/fsp/mendocino/FspmUpd.h
index f42ed43..7639ab1 100644
--- a/src/vendorcode/amd/fsp/mendocino/FspmUpd.h
+++ b/src/vendorcode/amd/fsp/mendocino/FspmUpd.h
@@ -94,7 +94,8 @@
    /** Offset 0x04CF**/	uint32_t                    telemetry_vddcrsocfull_scale_current;
    /** Offset 0x04D3**/	uint32_t                    telemetry_vddcrsocOffset;
    /** Offset 0x04D7**/	uint8_t                     UnusedUpdSpace1;
-	/** Offset 0x04D8**/	struct usb_phy_config       *usb_phy;
+	/* usb_phy_ptr is actually struct usb_phy_config *, but that won't work for 64bit coreboot */
+	/** Offset 0x04D8**/	uint32_t                    usb_phy_ptr;
    /** Offset 0x04DC**/	uint8_t                     UnusedUpdSpace2[292];
    /** Offset 0x0600**/	uint16_t                    UpdTerminator;
 } FSP_M_CONFIG;