From 3654c779f78a2320437da9ef578dc1812cdece7b Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 6 May 2022 17:59:42 +0200 Subject: [PATCH] soc/amd/sabrina/fsp_m_params: add defines for FSP USB struct version Add and use defines instead of magic values in fsp_m_params.c. The values will be updated to match the Sabrina FSP in a follow-up commit. Signed-off-by: Felix Held Change-Id: I91da9e9d2b95e169dd73153766f24cf8afbfa4ef Reviewed-on: https://review.coreboot.org/c/coreboot/+/64128 Reviewed-by: Fred Reitberger Reviewed-by: Angel Pons Reviewed-by: Raul Rangel Tested-by: build bot (Jenkins) --- src/soc/amd/sabrina/fsp_m_params.c | 4 ++-- src/vendorcode/amd/fsp/sabrina/FspUsb.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/soc/amd/sabrina/fsp_m_params.c b/src/soc/amd/sabrina/fsp_m_params.c index d319c3420f..c1f903b3bf 100644 --- a/src/soc/amd/sabrina/fsp_m_params.c +++ b/src/soc/amd/sabrina/fsp_m_params.c @@ -144,8 +144,8 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) if (config->usb_phy_custom) { mcfg->usb_phy = (struct usb_phy_config *)&config->usb_phy; - mcfg->usb_phy->Version_Major = 0xd; - mcfg->usb_phy->Version_Minor = 0x6; + mcfg->usb_phy->Version_Major = FSP_USB_STRUCT_MAJOR_VERSION; + mcfg->usb_phy->Version_Minor = FSP_USB_STRUCT_MINOR_VERSION; mcfg->usb_phy->TableLength = sizeof(struct usb_phy_config); } else { mcfg->usb_phy = NULL; diff --git a/src/vendorcode/amd/fsp/sabrina/FspUsb.h b/src/vendorcode/amd/fsp/sabrina/FspUsb.h index 6563cacc81..fea1fee3bd 100644 --- a/src/vendorcode/amd/fsp/sabrina/FspUsb.h +++ b/src/vendorcode/amd/fsp/sabrina/FspUsb.h @@ -3,6 +3,9 @@ #include +#define FSP_USB_STRUCT_MAJOR_VERSION 0xd +#define FSP_USB_STRUCT_MINOR_VERSION 0x6 + #define USB2_PORT_COUNT 8 #define USB3_PORT_COUNT 4 #define USBC_COMBO_PHY_COUNT 2