[coreboot-gerrit] [M] Change in coreboot[main]: soc/amd/phoenix/chip.h: add USB PHY configuration for openSIL

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/82584?usp=email )

Change subject: soc/amd/phoenix/chip.h: add USB PHY configuration for openSIL
......................................................................

soc/amd/phoenix/chip.h: add USB PHY configuration for openSIL

Add the USB PHY configuration structs for the openSIL case, so that
those can be configured in the devicetree like in the FSP case.

Signed-off-by: Felix Held 
Change-Id: Ied25e90859c4b1bc9b876bed3f3c46358ca36d32
Reviewed-on: https://review.coreboot.org/c/coreboot/+/82584
Reviewed-by: Matt DeVillier 
Tested-by: build bot (Jenkins) 
---
M src/soc/amd/phoenix/chip.h
M src/soc/amd/phoenix/chip_opensil.h
2 files changed, 50 insertions(+), 2 deletions(-)

Approvals:
  Matt DeVillier: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/soc/amd/phoenix/chip.h b/src/soc/amd/phoenix/chip.h
index 0fccb53..07b0dab 100644
--- a/src/soc/amd/phoenix/chip.h
+++ b/src/soc/amd/phoenix/chip.h
@@ -107,10 +107,10 @@
    	DXIO_PSPP_POWERSAVE,
    } pspp_policy;

-#if CONFIG(PLATFORM_USES_FSP2_0)
    uint8_t usb_phy_custom;
    struct usb_phy_config usb_phy;
-#else
+
+#if !CONFIG(PLATFORM_USES_FSP2_0)
    struct ddi_descriptor ddi[DDI_DESCRIPTOR_COUNT];
 #endif
 };
diff --git a/src/soc/amd/phoenix/chip_opensil.h b/src/soc/amd/phoenix/chip_opensil.h
index fcaa85c..da25a79 100644
--- a/src/soc/amd/phoenix/chip_opensil.h
+++ b/src/soc/amd/phoenix/chip_opensil.h
@@ -30,3 +30,51 @@
    uint8_t		aux_index;
    uint8_t		hdp_index;
 };
+
+#define USB2_PORT_COUNT 8
+#define USB3_PORT_COUNT 3
+#define USBC_COMBO_PHY_COUNT 3
+
+struct fch_usb2_phy {
+	uint8_t compdistune;		///< COMPDISTUNE
+	uint8_t pllbtune;		///< PLLBTUNE
+	uint8_t pllitune;		///< PLLITUNE
+	uint8_t pllptune;		///< PLLPTUNE
+	uint8_t sqrxtune;		///< SQRXTUNE
+	uint8_t txfslstune;		///< TXFSLSTUNE
+	uint8_t txpreempamptune;	///< TXPREEMPAMPTUNE
+	uint8_t txpreemppulsetune;	///< TXPREEMPPULSETUNE
+	uint8_t txrisetune;		///< TXRISETUNE
+	uint8_t txvreftune;		///< TXVREFTUNE
+	uint8_t txhsxvtune;		///< TXHSXVTUNE
+	uint8_t txrestune;		///< TXRESTUNE
+};
+
+struct fch_usb3_phy {
+	uint8_t tx_term_ctrl;		///< tx_term_ctrl
+	uint8_t rx_term_ctrl;		///< rx_term_ctrl
+	uint8_t tx_vboost_lvl_en;	///< TX_VBOOST_LVL_EN
+	uint8_t tx_vboost_lvl;		///< TX_VBOOST_LVL
+};
+
+#define USB0_PORT0	0
+#define USB0_PORT1	1
+#define USB0_PORT2	1
+#define USB0_PORT3	3
+#define USB1_PORT0	(0<<2)
+#define USB1_PORT1	(1<<2)
+#define USB1_PORT2	(1<<2)
+#define USB1_PORT3	(3<<2)
+
+#define USB_COMBO_PHY_MODE_USB_C	0
+#define USB_COMBO_PHY_MODE_USB_ONLY	1
+#define USB_COMBO_PHY_MODE_USB_DPM	2
+#define USB_COMBO_PHY_MODE_USB_DPP	3
+
+struct usb_phy_config {
+	struct fch_usb2_phy	Usb2PhyPort[USB2_PORT_COUNT];      ///< USB 2.0 Driving Strength
+	struct fch_usb3_phy	Usb3PhyPort[USB3_PORT_COUNT];      ///< USB3 PHY Adjustment
+	uint8_t			BatteryChargerEnable;              ///< bit[1:0]-Usb0 Port[1:0], bit[3:2]-Usb1 Port[1:0]
+	uint8_t			PhyP3CpmP4Support;                 ///< bit[1:0]-Usb0 Port[1:0], bit[3:2]-Usb1 Port[1:0]
+	uint8_t			ComboPhyStaticConfig[USBC_COMBO_PHY_COUNT]; ///< 0-Type C, 1- USB only mode, 2- DP only mode, 3- USB + DP
+};