[PATCH phy 2/6] phy: marvell: phy-mvebu-a3700-comphy: Add native kernel implementation

Vinod Koul vkoul at kernel.org
Mon Nov 22 23:26:24 PST 2021


On 28-10-21, 20:42, Marek Behún wrote:
> From: Pali Rohár <pali at kernel.org>
> 
> Remove old RPC implementation and add a new native kernel implementation.
> 
> The old implementation uses ARM SMC API to issue RPC calls to ARM Trusted
> Firmware which provides real implementation of PHY configuration.
> 
> But older versions of ARM Trusted Firmware do not provide this PY
> configuration functionality, simply returning: operation not supported; or
> worse, some versions provide the configuration functionality incorrectly.
> 
> For example the firmware shipped in ESPRESSObin board has this older
> version of ARM Trusted Firmware and therefore SATA, USB 3.0 and PCIe
> functionality do not work with newer versions of Linux kernel.
> 
> Due to the above reasons, the following commits were introduced into Linux,
> to workaround these issues by ignoring -EOPNOTSUPP error code from
> phy-mvebu-a3700-comphy driver function phy_power_on():
> 
> commit 45aefe3d2251 ("ata: ahci: mvebu: Make SATA PHY optional for Armada
> 3720")
> commit 3241929b67d2 ("usb: host: xhci: mvebu: make USB 3.0 PHY optional for
> Armada 3720")
> commit b0c6ae0f8948 ("PCI: aardvark: Fix initialization with old Marvell's
> Arm Trusted Firmware")
> 
> Replace this RPC implementation with proper native kernel implementation,
> which is independent on the firmware. Never return -EOPNOTSUPP for proper
> arguments.
> 
> This should solve multiple issues with real-world boards, where it is not
> possible or really inconvenient to change the firmware. Let's eliminate
> these issues.
> 
> This implementation is ported directly from Armada 3720 comphy driver found
> in newest version of ARM Trusted Firmware source code.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> Signed-off-by: Marek Behún <kabel at kernel.org>
> ---
>  drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 1296 ++++++++++++++++--
>  1 file changed, 1179 insertions(+), 117 deletions(-)
> 
> diff --git a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
> index dbb2d4308851..3fc01d8fbea9 100644
> --- a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
> +++ b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
> @@ -5,12 +5,14 @@
>   * Authors:
>   *   Evan Wang <xswang at marvell.com>
>   *   Miquèl Raynal <miquel.raynal at bootlin.com>
> + *   Pali Rohár <pali at kernel.org>
>   *
>   * Structure inspired from phy-mvebu-cp110-comphy.c written by Antoine Tenart.
>   * SMC call initial support done by Grzegorz Jaszczyk.
> + * Comphy code from ARM Trusted Firmware ported by Pali Rohár <pali at kernel.org>.
>   */
>  
> -#include <linux/arm-smccc.h>
> +#include <linux/clk.h>
>  #include <linux/io.h>
>  #include <linux/iopoll.h>
>  #include <linux/mfd/syscon.h>
> @@ -19,102 +21,1122 @@
>  #include <linux/phy/phy.h>
>  #include <linux/platform_device.h>
>  
> -#define MVEBU_A3700_COMPHY_LANES		3
> -
> -/* COMPHY Fast SMC function identifiers */
> -#define COMPHY_SIP_POWER_ON			0x82000001
> -#define COMPHY_SIP_POWER_OFF			0x82000002
> -#define COMPHY_SIP_PLL_LOCK			0x82000003
> -
> -#define COMPHY_FW_MODE_SATA			0x1
> -#define COMPHY_FW_MODE_SGMII			0x2
> -#define COMPHY_FW_MODE_2500BASEX		0x3
> -#define COMPHY_FW_MODE_USB3H			0x4
> -#define COMPHY_FW_MODE_USB3D			0x5
> -#define COMPHY_FW_MODE_PCIE			0x6
> -#define COMPHY_FW_MODE_USB3			0xa
> -
> -#define COMPHY_FW_SPEED_1_25G			0 /* SGMII 1G */
> -#define COMPHY_FW_SPEED_2_5G			1
> -#define COMPHY_FW_SPEED_3_125G			2 /* 2500BASE-X */
> -#define COMPHY_FW_SPEED_5G			3
> -#define COMPHY_FW_SPEED_MAX			0x3F
> -
> -#define COMPHY_FW_MODE(mode)			((mode) << 12)
> -#define COMPHY_FW_NET(mode, idx, speed)		(COMPHY_FW_MODE(mode) | \
> -						 ((idx) << 8) |	\
> -						 ((speed) << 2))
> -#define COMPHY_FW_PCIE(mode, speed, width)	(COMPHY_FW_NET(mode, 0, speed) | \
> -						 ((width) << 18))
> +#define PLL_SET_DELAY_US			600
> +#define COMPHY_PLL_SLEEP			1000
> +#define COMPHY_PLL_TIMEOUT			150000
> +
> +#define COMPHY_SELECTOR_PHY_REG			0xFC
> +/* bit0: 0: Lane0 is GBE0; 1: Lane1 is PCIE */
> +#define COMPHY_SELECTOR_PCIE_GBE0_SEL_BIT	BIT(0)
> +/* bit4: 0: Lane1 is GBE1; 1: Lane1 is USB3 */
> +#define COMPHY_SELECTOR_USB3_GBE1_SEL_BIT	BIT(4)
> +/* bit8: 0: Lane1 is USB, Lane2 is SATA; 1: Lane2 is USB3 */
> +#define COMPHY_SELECTOR_USB3_PHY_SEL_BIT	BIT(8)
> +
> +/* SATA PHY register offset */
> +#define SATAPHY_LANE2_REG_BASE_OFFSET		0x200
> +
> +/* USB3 PHY offset compared to SATA PHY */
> +#define USB3PHY_LANE2_REG_BASE_OFFSET		0x200
> +
> +/* Comphy lane2 indirect access register offset */
> +#define COMPHY_LANE2_INDIR_ADDR_OFFSET		0x0
> +#define COMPHY_LANE2_INDIR_DATA_OFFSET		0x4
> +
> +/* PHY shift to get related register address */
> +enum {
> +	PCIE = 1,
> +	USB3,
> +};
> +
> +#define PCIEPHY_SHFT			2
> +#define USB3PHY_SHFT			2
> +#define PHY_SHFT(unit)			((unit == PCIE) ? PCIEPHY_SHFT : USB3PHY_SHFT)
> +
> +/* PHY register */
> +#define COMPHY_POWER_PLL_CTRL		0x01
> +#define PWR_PLL_CTRL_ADDR(unit)		(COMPHY_POWER_PLL_CTRL * PHY_SHFT(unit))
> +#define PU_IVREF_BIT			BIT(15)
> +#define PU_PLL_BIT			BIT(14)
> +#define PU_RX_BIT			BIT(13)
> +#define PU_TX_BIT			BIT(12)
> +#define PU_TX_INTP_BIT			BIT(11)
> +#define PU_DFE_BIT			BIT(10)
> +#define RESET_DTL_RX_BIT		BIT(9)
> +#define PLL_LOCK_BIT			BIT(8)
> +#define REF_FREF_SEL_OFFSET		0
> +#define REF_FREF_SEL_MASK		(0x1F << REF_FREF_SEL_OFFSET)
> +#define REF_CLOCK_SPEED_25M		(0x1 << REF_FREF_SEL_OFFSET)
> +#define REF_CLOCK_SPEED_30M		(0x2 << REF_FREF_SEL_OFFSET)
> +#define PCIE_REF_CLOCK_SPEED_25M	REF_CLOCK_SPEED_30M
> +#define USB3_REF_CLOCK_SPEED_25M	REF_CLOCK_SPEED_30M
> +#define REF_CLOCK_SPEED_40M		(0x3 << REF_FREF_SEL_OFFSET)
> +#define REF_CLOCK_SPEED_50M		(0x4 << REF_FREF_SEL_OFFSET)
> +#define COMPHY_MODE_OFFSET		5
> +#define COMPHY_MODE_MASK		(7 << COMPHY_MODE_OFFSET)
> +#define COMPHY_MODE_SATA		(0x0 << COMPHY_MODE_OFFSET)
> +#define COMPHY_MODE_PCIE		(0x3 << COMPHY_MODE_OFFSET)
> +#define COMPHY_MODE_SERDES		(0x4 << COMPHY_MODE_OFFSET)
> +#define COMPHY_MODE_USB3		(0x5 << COMPHY_MODE_OFFSET)
> +
> +#define COMPHY_KVCO_CAL_CTRL		0x02
> +#define KVCO_CAL_CTRL_ADDR(unit)	(COMPHY_KVCO_CAL_CTRL * PHY_SHFT(unit))
> +#define USE_MAX_PLL_RATE_BIT		BIT(12)
> +#define SPEED_PLL_OFFSET		2
> +#define SPEED_PLL_MASK			(0x3F << SPEED_PLL_OFFSET)
> +#define SPEED_PLL_VALUE_16		(0x10 << SPEED_PLL_OFFSET)
> +
> +#define COMPHY_RESERVED_REG		0x0E
> +#define PHYCTRL_FRM_PIN_BIT		BIT(13)
> +
> +#define COMPHY_LOOPBACK_REG0		0x23
> +#define DIG_LB_EN_ADDR(unit)		(COMPHY_LOOPBACK_REG0 * PHY_SHFT(unit))
> +#define SEL_DATA_WIDTH_OFFSET		10
> +#define SEL_DATA_WIDTH_MASK		(0x3 << SEL_DATA_WIDTH_OFFSET)
> +#define DATA_WIDTH_10BIT		(0x0 << SEL_DATA_WIDTH_OFFSET)
> +#define DATA_WIDTH_20BIT		(0x1 << SEL_DATA_WIDTH_OFFSET)
> +#define DATA_WIDTH_40BIT		(0x2 << SEL_DATA_WIDTH_OFFSET)
> +#define PLL_READY_TX_BIT		BIT(4)
> +
> +#define COMPHY_SYNC_PATTERN_REG		0x24
> +#define SYNC_PATTERN_REG_ADDR(unit)	(COMPHY_SYNC_PATTERN_REG * PHY_SHFT(unit))
> +#define TXD_INVERT_BIT			BIT(10)
> +#define RXD_INVERT_BIT			BIT(11)
> +
> +#define COMPHY_SYNC_MASK_GEN_REG	0x25
> +#define PHY_GEN_MAX_OFFSET		10
> +#define PHY_GEN_MAX_MASK		(3 << PHY_GEN_MAX_OFFSET)

Pls use GENMASK()

> +#define PHY_GEN_USB3_5G			(1 << PHY_GEN_MAX_OFFSET)

this should be BIT(10)

> +
> +#define COMPHY_ISOLATION_CTRL_REG	0x26
> +#define ISOLATION_CTRL_REG_ADDR(unit)	(COMPHY_ISOLATION_CTRL_REG * PHY_SHFT(unit))
> +#define PHY_ISOLATE_MODE		BIT(15)
> +
> +#define COMPHY_MISC_REG0_ADDR		0x4F
> +#define MISC_REG0_ADDR(unit)		(COMPHY_MISC_REG0_ADDR * PHY_SHFT(unit))
> +#define CLK100M_125M_EN			BIT(4)
> +#define TXDCLK_2X_SEL			BIT(6)
> +#define CLK500M_EN			BIT(7)
> +#define PHY_REF_CLK_SEL			BIT(10)
> +#define MISC_REG0_DEFAULT_VALUE		0xA00D
> +
> +#define COMPHY_REG_GEN2_SET_2		0x3e
> +#define GEN2_SETTING_2_ADDR(unit)	(COMPHY_REG_GEN2_SET_2 * PHY_SHFT(unit))
> +#define G2_TX_SSC_AMP_VALUE_20		BIT(14)
> +#define G2_TX_SSC_AMP_OFF		9
> +#define G2_TX_SSC_AMP_LEN		7
> +#define G2_TX_SSC_AMP_MASK		(((1 << G2_TX_SSC_AMP_LEN) - 1) << G2_TX_SSC_AMP_OFF)
> +
> +#define COMPHY_REG_GEN2_SET_3		0x3f
> +#define GEN2_SETTING_3_ADDR(unit)	(COMPHY_REG_GEN2_SET_3 * PHY_SHFT(unit))
> +#define G3_TX_SSC_AMP_OFF		9
> +#define G3_TX_SSC_AMP_LEN		7
> +#define G3_TX_SSC_AMP_MASK		(((1 << G2_TX_SSC_AMP_LEN) - 1) << G2_TX_SSC_AMP_OFF)
> +#define G3_VREG_RXTX_MAS_ISET_OFF	7
> +#define G3_VREG_RXTX_MAS_ISET_60U	(0 << G3_VREG_RXTX_MAS_ISET_OFF)
> +#define G3_VREG_RXTX_MAS_ISET_80U	(1 << G3_VREG_RXTX_MAS_ISET_OFF)
> +#define G3_VREG_RXTX_MAS_ISET_100U	(2 << G3_VREG_RXTX_MAS_ISET_OFF)
> +#define G3_VREG_RXTX_MAS_ISET_120U	(3 << G3_VREG_RXTX_MAS_ISET_OFF)
> +#define G3_VREG_RXTX_MAS_ISET_MASK	(BIT(7) | BIT(8))
> +#define RSVD_PH03FH_6_0_OFF		0
> +#define RSVD_PH03FH_6_0_LEN		7
> +#define RSVD_PH03FH_6_0_MASK		(((1 << RSVD_PH03FH_6_0_LEN) - 1) << RSVD_PH03FH_6_0_OFF)
> +
> +#define COMPHY_REG_UNIT_CTRL_ADDR	0x48
> +#define UNIT_CTRL_ADDR(unit)		(COMPHY_REG_UNIT_CTRL_ADDR * PHY_SHFT(unit))
> +#define IDLE_SYNC_EN			BIT(12)
> +#define UNIT_CTRL_DEFAULT_VALUE		0x60
> +
> +#define COMPHY_MISC_REG1_ADDR		0x73
> +#define MISC_REG1_ADDR(unit)		(COMPHY_MISC_REG1_ADDR * PHY_SHFT(unit))
> +#define SEL_BITS_PCIE_FORCE		BIT(15)
> +
> +#define COMPHY_REG_GEN3_SETTINGS_3	0x112
> +#define COMPHY_GEN_FFE_CAP_SEL_MASK	0xF
> +#define COMPHY_GEN_FFE_CAP_SEL_VALUE	0xF
> +
> +#define COMPHY_REG_LANE_CFG0_ADDR	0x180
> +#define LANE_CFG0_ADDR(unit)		(COMPHY_REG_LANE_CFG0_ADDR * PHY_SHFT(unit))
> +#define PRD_TXDEEMPH0_MASK		BIT(0)
> +#define PRD_TXMARGIN_MASK		(BIT(1) | BIT(2) | BIT(3))
> +#define PRD_TXSWING_MASK		BIT(4)
> +#define CFG_TX_ALIGN_POS_MASK		(BIT(5) | BIT(6) | BIT(7) | BIT(8))
> +
> +#define COMPHY_REG_LANE_CFG1_ADDR	0x181
> +#define LANE_CFG1_ADDR(unit)		(COMPHY_REG_LANE_CFG1_ADDR * PHY_SHFT(unit))
> +#define PRD_TXDEEMPH1_MASK		BIT(15)
> +#define USE_MAX_PLL_RATE_EN		BIT(9)
> +#define TX_DET_RX_MODE			BIT(6)
> +#define GEN2_TX_DATA_DLY_MASK		(BIT(3) | BIT(4))
> +#define GEN2_TX_DATA_DLY_DEFT		(2 << 3)
> +#define TX_ELEC_IDLE_MODE_EN		BIT(0)
> +
> +#define COMPHY_REG_LANE_STATUS1_ADDR	0x183
> +#define LANE_STATUS1_ADDR(unit)		(COMPHY_REG_LANE_STATUS1_ADDR * PHY_SHFT(unit))
> +#define TXDCLK_PCLK_EN			BIT(0)
> +
> +#define COMPHY_REG_LANE_CFG4_ADDR	0x188
> +#define LANE_CFG4_ADDR(unit)		(COMPHY_REG_LANE_CFG4_ADDR * PHY_SHFT(unit))
> +#define SPREAD_SPECTRUM_CLK_EN		BIT(7)
> +
> +#define COMPHY_REG_GLOB_PHY_CTRL0_ADDR	0x1C1
> +#define GLOB_PHY_CTRL0_ADDR(unit)	(COMPHY_REG_GLOB_PHY_CTRL0_ADDR * PHY_SHFT(unit))
> +#define SOFT_RESET			BIT(0)
> +#define MODE_REFDIV			0x30
> +#define MODE_CORE_CLK_FREQ_SEL		BIT(9)
> +#define MODE_PIPE_WIDTH_32		BIT(3)
> +#define MODE_REFDIV_OFFSET		4
> +#define MODE_REFDIV_LEN			2
> +#define MODE_REFDIV_MASK		(0x3 << MODE_REFDIV_OFFSET)
> +#define MODE_REFDIV_BY_4		(0x2 << MODE_REFDIV_OFFSET)
> +
> +#define COMPHY_REG_TEST_MODE_CTRL_ADDR	0x1C2
> +#define TEST_MODE_CTRL_ADDR(unit)	(COMPHY_REG_TEST_MODE_CTRL_ADDR * PHY_SHFT(unit))
> +#define MODE_MARGIN_OVERRIDE		BIT(2)
> +
> +#define COMPHY_REG_GLOB_CLK_SRC_LO_ADDR	0x1C3
> +#define GLOB_CLK_SRC_LO_ADDR(unit)	(COMPHY_REG_GLOB_CLK_SRC_LO_ADDR * PHY_SHFT(unit))
> +#define MODE_CLK_SRC			BIT(0)
> +#define BUNDLE_PERIOD_SEL		BIT(1)
> +#define BUNDLE_PERIOD_SCALE		(BIT(2) | BIT(3))
> +#define BUNDLE_SAMPLE_CTRL		BIT(4)
> +#define PLL_READY_DLY			(BIT(5) | BIT(6) | BIT(7))
> +#define CFG_SEL_20B			BIT(15)
> +
> +#define COMPHY_REG_PWR_MGM_TIM1_ADDR	0x1D0
> +#define PWR_MGM_TIM1_ADDR(unit)		(COMPHY_REG_PWR_MGM_TIM1_ADDR * PHY_SHFT(unit))
> +#define CFG_PM_OSCCLK_WAIT_OFF		12
> +#define CFG_PM_OSCCLK_WAIT_LEN		4
> +#define CFG_PM_OSCCLK_WAIT_MASK		(((1 << CFG_PM_OSCCLK_WAIT_LEN) - 1) << \
> +					 CFG_PM_OSCCLK_WAIT_OFF)
> +#define CFG_PM_RXDEN_WAIT_OFF		8
> +#define CFG_PM_RXDEN_WAIT_LEN		4
> +#define CFG_PM_RXDEN_WAIT_MASK		(((1 << CFG_PM_RXDEN_WAIT_LEN) - 1) << \
> +					 CFG_PM_RXDEN_WAIT_OFF)
> +#define CFG_PM_RXDEN_WAIT_1_UNIT	(1 << CFG_PM_RXDEN_WAIT_OFF)
> +#define CFG_PM_RXDLOZ_WAIT_OFF		0
> +#define CFG_PM_RXDLOZ_WAIT_LEN		8
> +#define CFG_PM_RXDLOZ_WAIT_MASK		(((1 << CFG_PM_RXDLOZ_WAIT_LEN) - 1) << \
> +					 CFG_PM_RXDLOZ_WAIT_OFF)
> +#define CFG_PM_RXDLOZ_WAIT_7_UNIT	(7 << CFG_PM_RXDLOZ_WAIT_OFF)
> +#define CFG_PM_RXDLOZ_WAIT_12_UNIT	(0xC << CFG_PM_RXDLOZ_WAIT_OFF)
> +
> +/* SERDES */
> +#define COMPHY_PHY_CFG1_OFFSET(lane)	((1 - (lane)) * 0x28)
> +#define PIN_PU_IVEREF_BIT		BIT(1)
> +#define PIN_RESET_CORE_BIT		BIT(11)
> +#define PIN_RESET_COMPHY_BIT		BIT(12)
> +#define PIN_PU_PLL_BIT			BIT(16)
> +#define PIN_PU_RX_BIT			BIT(17)
> +#define PIN_PU_TX_BIT			BIT(18)
> +#define PIN_TX_IDLE_BIT			BIT(19)
> +#define GEN_RX_SEL_OFFSET		22
> +#define GEN_RX_SEL_MASK			(0xF << GEN_RX_SEL_OFFSET)
> +#define GEN_TX_SEL_OFFSET		26
> +#define GEN_TX_SEL_MASK			(0xF << GEN_TX_SEL_OFFSET)
> +#define PHY_RX_INIT_BIT			BIT(30)
> +#define SERDES_SPEED_1_25_G		0x6
> +#define SERDES_SPEED_2_5_G		0x8
> +
> +/* COMPHY status reg:
> + * lane0: PCIe/GbE0 PHY Status 1
> + * lane1: USB3/GbE1 PHY Status 1
> + */
> +#define COMPHY_PHY_STATUS_OFFSET(lane)	(0x18 + (1 - (lane)) * 0x28)
> +#define PHY_RX_INIT_DONE_BIT		BIT(0)
> +#define PHY_PLL_READY_RX_BIT		BIT(2)
> +#define PHY_PLL_READY_TX_BIT		BIT(3)
> +
> +#define GBE_PHY_ADDR(base, off)		((base) + (((off) & 0x00007FF) * 2))
>  
>  struct mvebu_a3700_comphy_conf {
>  	unsigned int lane;
>  	enum phy_mode mode;
>  	int submode;
> -	u32 fw_mode;
>  };
>  
> -#define MVEBU_A3700_COMPHY_CONF(_lane, _mode, _smode, _fw)		\
> +#define MVEBU_A3700_COMPHY_CONF(_lane, _mode, _smode)			\
>  	{								\
>  		.lane = _lane,						\
>  		.mode = _mode,						\
>  		.submode = _smode,					\
> -		.fw_mode = _fw,						\
>  	}
>  
> -#define MVEBU_A3700_COMPHY_CONF_GEN(_lane, _mode, _fw) \
> -	MVEBU_A3700_COMPHY_CONF(_lane, _mode, PHY_INTERFACE_MODE_NA, _fw)
> +#define MVEBU_A3700_COMPHY_CONF_GEN(_lane, _mode) \
> +	MVEBU_A3700_COMPHY_CONF(_lane, _mode, PHY_INTERFACE_MODE_NA)
>  
> -#define MVEBU_A3700_COMPHY_CONF_ETH(_lane, _smode, _fw) \
> -	MVEBU_A3700_COMPHY_CONF(_lane, PHY_MODE_ETHERNET, _smode, _fw)
> +#define MVEBU_A3700_COMPHY_CONF_ETH(_lane, _smode) \
> +	MVEBU_A3700_COMPHY_CONF(_lane, PHY_MODE_ETHERNET, _smode)
>  
>  static const struct mvebu_a3700_comphy_conf mvebu_a3700_comphy_modes[] = {
>  	/* lane 0 */
> -	MVEBU_A3700_COMPHY_CONF_GEN(0, PHY_MODE_USB_HOST_SS,
> -				    COMPHY_FW_MODE_USB3H),
> -	MVEBU_A3700_COMPHY_CONF_ETH(0, PHY_INTERFACE_MODE_SGMII,
> -				    COMPHY_FW_MODE_SGMII),
> -	MVEBU_A3700_COMPHY_CONF_ETH(0, PHY_INTERFACE_MODE_2500BASEX,
> -				    COMPHY_FW_MODE_2500BASEX),
> +	MVEBU_A3700_COMPHY_CONF_GEN(0, PHY_MODE_USB_HOST_SS),
> +	MVEBU_A3700_COMPHY_CONF_ETH(0, PHY_INTERFACE_MODE_SGMII),
> +	MVEBU_A3700_COMPHY_CONF_ETH(0, PHY_INTERFACE_MODE_1000BASEX),
> +	MVEBU_A3700_COMPHY_CONF_ETH(0, PHY_INTERFACE_MODE_2500BASEX),
>  	/* lane 1 */
> -	MVEBU_A3700_COMPHY_CONF_GEN(1, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE),
> -	MVEBU_A3700_COMPHY_CONF_ETH(1, PHY_INTERFACE_MODE_SGMII,
> -				    COMPHY_FW_MODE_SGMII),
> -	MVEBU_A3700_COMPHY_CONF_ETH(1, PHY_INTERFACE_MODE_2500BASEX,
> -				    COMPHY_FW_MODE_2500BASEX),
> +	MVEBU_A3700_COMPHY_CONF_GEN(1, PHY_MODE_PCIE),
> +	MVEBU_A3700_COMPHY_CONF_ETH(1, PHY_INTERFACE_MODE_SGMII),
> +	MVEBU_A3700_COMPHY_CONF_ETH(1, PHY_INTERFACE_MODE_1000BASEX),
> +	MVEBU_A3700_COMPHY_CONF_ETH(1, PHY_INTERFACE_MODE_2500BASEX),
>  	/* lane 2 */
> -	MVEBU_A3700_COMPHY_CONF_GEN(2, PHY_MODE_SATA, COMPHY_FW_MODE_SATA),
> -	MVEBU_A3700_COMPHY_CONF_GEN(2, PHY_MODE_USB_HOST_SS,
> -				    COMPHY_FW_MODE_USB3H),
> +	MVEBU_A3700_COMPHY_CONF_GEN(2, PHY_MODE_SATA),
> +	MVEBU_A3700_COMPHY_CONF_GEN(2, PHY_MODE_USB_HOST_SS),
> +};
> +
> +struct mvebu_a3700_comphy_priv {
> +	void __iomem *comphy_regs;
> +	void __iomem *pcie_gbe0_phy_regs;
> +	void __iomem *usb3_gbe1_phy_regs;
> +	void __iomem *sata_usb3_phy_regs;
> +	bool xtal_is_40m;
>  };
>  
>  struct mvebu_a3700_comphy_lane {
> +	struct mvebu_a3700_comphy_priv *priv;
>  	struct device *dev;
>  	unsigned int id;
>  	enum phy_mode mode;
>  	int submode;
> +	bool invert_tx;
> +	bool invert_rx;
> +};
> +
> +struct gbe_phy_init_data_fix {
> +	u16 addr;
> +	u16 value;
> +};
> +
> +/* Changes to 40M1G25 mode data required for running 40M3G125 init mode */
> +static struct gbe_phy_init_data_fix gbe_phy_init_fix[] = {
> +	{0x005, 0x07CC}, {0x015, 0x0000}, {0x01B, 0x0000}, {0x01D, 0x0000},
> +	{0x01E, 0x0000}, {0x01F, 0x0000}, {0x020, 0x0000}, {0x021, 0x0030},
> +	{0x026, 0x0888}, {0x04D, 0x0152}, {0x04F, 0xA020}, {0x050, 0x07CC},
> +	{0x053, 0xE9CA}, {0x055, 0xBD97}, {0x071, 0x3015}, {0x076, 0x03AA},
> +	{0x07C, 0x0FDF}, {0x0C2, 0x3030}, {0x0C3, 0x8000}, {0x0E2, 0x5550},
> +	{0x0E3, 0x12A4}, {0x0E4, 0x7D00}, {0x0E6, 0x0C83}, {0x101, 0xFCC0},
> +	{0x104, 0x0C10}
> +};
> +
> +/* 40M1G25 mode init data */
> +static u16 gbe_phy_init[512] = {
> +	/* 0       1       2       3       4       5       6       7 */
> +	/*-----------------------------------------------------------*/
> +	/* 8       9       A       B       C       D       E       F */
> +	0x3110, 0xFD83, 0x6430, 0x412F, 0x82C0, 0x06FA, 0x4500, 0x6D26,	/* 00 */
> +	0xAFC0, 0x8000, 0xC000, 0x0000, 0x2000, 0x49CC, 0x0BC9, 0x2A52,	/* 08 */
> +	0x0BD2, 0x0CDE, 0x13D2, 0x0CE8, 0x1149, 0x10E0, 0x0000, 0x0000,	/* 10 */
> +	0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x4134, 0x0D2D, 0xFFFF,	/* 18 */
> +	0xFFE0, 0x4030, 0x1016, 0x0030, 0x0000, 0x0800, 0x0866, 0x0000,	/* 20 */
> +	0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,	/* 28 */
> +	0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/* 30 */
> +	0x0000, 0x0000, 0x000F, 0x6A62, 0x1988, 0x3100, 0x3100, 0x3100,	/* 38 */
> +	0x3100, 0xA708, 0x2430, 0x0830, 0x1030, 0x4610, 0xFF00, 0xFF00,	/* 40 */
> +	0x0060, 0x1000, 0x0400, 0x0040, 0x00F0, 0x0155, 0x1100, 0xA02A,	/* 48 */
> +	0x06FA, 0x0080, 0xB008, 0xE3ED, 0x5002, 0xB592, 0x7A80, 0x0001,	/* 50 */
> +	0x020A, 0x8820, 0x6014, 0x8054, 0xACAA, 0xFC88, 0x2A02, 0x45CF,	/* 58 */
> +	0x000F, 0x1817, 0x2860, 0x064F, 0x0000, 0x0204, 0x1800, 0x6000,	/* 60 */
> +	0x810F, 0x4F23, 0x4000, 0x4498, 0x0850, 0x0000, 0x000E, 0x1002,	/* 68 */
> +	0x9D3A, 0x3009, 0xD066, 0x0491, 0x0001, 0x6AB0, 0x0399, 0x3780,	/* 70 */
> +	0x0040, 0x5AC0, 0x4A80, 0x0000, 0x01DF, 0x0000, 0x0007, 0x0000,	/* 78 */
> +	0x2D54, 0x00A1, 0x4000, 0x0100, 0xA20A, 0x0000, 0x0000, 0x0000,	/* 80 */
> +	0x0000, 0x0000, 0x0000, 0x7400, 0x0E81, 0x1000, 0x1242, 0x0210,	/* 88 */
> +	0x80DF, 0x0F1F, 0x2F3F, 0x4F5F, 0x6F7F, 0x0F1F, 0x2F3F, 0x4F5F,	/* 90 */
> +	0x6F7F, 0x4BAD, 0x0000, 0x0000, 0x0800, 0x0000, 0x2400, 0xB651,	/* 98 */
> +	0xC9E0, 0x4247, 0x0A24, 0x0000, 0xAF19, 0x1004, 0x0000, 0x0000,	/* A0 */
> +	0x0000, 0x0013, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/* A8 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/* B0 */
> +	0x0000, 0x0000, 0x0000, 0x0060, 0x0000, 0x0000, 0x0000, 0x0000,	/* B8 */
> +	0x0000, 0x0000, 0x3010, 0xFA00, 0x0000, 0x0000, 0x0000, 0x0003,	/* C0 */
> +	0x1618, 0x8200, 0x8000, 0x0400, 0x050F, 0x0000, 0x0000, 0x0000,	/* C8 */
> +	0x4C93, 0x0000, 0x1000, 0x1120, 0x0010, 0x1242, 0x1242, 0x1E00,	/* D0 */
> +	0x0000, 0x0000, 0x0000, 0x00F8, 0x0000, 0x0041, 0x0800, 0x0000,	/* D8 */
> +	0x82A0, 0x572E, 0x2490, 0x14A9, 0x4E00, 0x0000, 0x0803, 0x0541,	/* E0 */
> +	0x0C15, 0x0000, 0x0000, 0x0400, 0x2626, 0x0000, 0x0000, 0x4200,	/* E8 */
> +	0x0000, 0xAA55, 0x1020, 0x0000, 0x0000, 0x5010, 0x0000, 0x0000,	/* F0 */
> +	0x0000, 0x0000, 0x5000, 0x0000, 0x0000, 0x0000, 0x02F2, 0x0000,	/* F8 */
> +	0x101F, 0xFDC0, 0x4000, 0x8010, 0x0110, 0x0006, 0x0000, 0x0000,	/*100 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*108 */
> +	0x04CF, 0x0000, 0x04CF, 0x0000, 0x04CF, 0x0000, 0x04C6, 0x0000,	/*110 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*118 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*120 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*128 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*130 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*138 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*140 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*148 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*150 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*158 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*160 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*168 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*170 */
> +	0x0000, 0x0000, 0x0000, 0x00F0, 0x08A2, 0x3112, 0x0A14, 0x0000,	/*178 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*180 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*188 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*190 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*198 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1A0 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1A8 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1B0 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1B8 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1C0 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1C8 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1D0 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1D8 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1E0 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1E8 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,	/*1F0 */
> +	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000	/*1F8 */
>  };
>  
> -static int mvebu_a3700_comphy_smc(unsigned long function, unsigned long lane,
> -				  unsigned long mode)
> +static inline void reg_set(void __iomem *addr, u32 data, u32 mask)
>  {
> -	struct arm_smccc_res res;
> -	s32 ret;
> +	u32 reg_data;
>  
> -	arm_smccc_smc(function, lane, mode, 0, 0, 0, 0, 0, &res);
> -	ret = res.a0;
> +	reg_data = readl(addr);
> +	reg_data &= ~mask;
> +	reg_data |= data;
> +	writel(reg_data, addr);
> +}
> +
> +static inline void reg_set16(void __iomem *addr, u16 data, u16 mask)
> +{
> +	u16 reg_data;
> +
> +	reg_data = readw(addr);
> +	reg_data &= ~mask;
> +	reg_data |= data;
> +	writew(reg_data, addr);
> +}
> +
> +/* PHY selector configures with corresponding modes */
> +static int mvebu_a3700_comphy_set_phy_selector(struct mvebu_a3700_comphy_lane *lane)
> +{
> +	u32 reg;
> +
> +	reg = readl(lane->priv->comphy_regs + COMPHY_SELECTOR_PHY_REG);
> +	switch (lane->mode) {
> +	case PHY_MODE_SATA:
> +		/* SATA must be in Lane2 */
> +		if (lane->id == 2)
> +			reg &= ~COMPHY_SELECTOR_USB3_PHY_SEL_BIT;
> +		else
> +			goto error;
> +		break;
> +
> +	case PHY_MODE_ETHERNET:
> +		if (lane->id == 0)
> +			reg &= ~COMPHY_SELECTOR_USB3_GBE1_SEL_BIT;
> +		else if (lane->id == 1)
> +			reg &= ~COMPHY_SELECTOR_PCIE_GBE0_SEL_BIT;
> +		else
> +			goto error;
> +		break;
> +
> +	case PHY_MODE_USB_HOST_SS:
> +		if (lane->id == 2)
> +			reg |= COMPHY_SELECTOR_USB3_PHY_SEL_BIT;
> +		else if (lane->id == 0)
> +			reg |= COMPHY_SELECTOR_USB3_GBE1_SEL_BIT;
> +		else
> +			goto error;
> +		break;
> +
> +	case PHY_MODE_PCIE:
> +		/* PCIE must be in Lane1 */
> +		if (lane->id == 1)
> +			reg |= COMPHY_SELECTOR_PCIE_GBE0_SEL_BIT;
> +		else
> +			goto error;
> +		break;
>  
> -	switch (ret) {
> -	case SMCCC_RET_SUCCESS:
> -		return 0;
> -	case SMCCC_RET_NOT_SUPPORTED:
> -		return -EOPNOTSUPP;
>  	default:
> +		goto error;
> +	}
> +
> +	writel(reg, lane->priv->comphy_regs + COMPHY_SELECTOR_PHY_REG);
> +	return 0;
> +error:
> +	dev_err(lane->dev, "COMPHY[%d] mode[%d] is invalid\n", lane->id, lane->mode);
> +	return -EINVAL;
> +}
> +
> +/* It is only used for SATA and USB3 on comphy lane2. */
> +static void comphy_set_indirect(void __iomem *base_addr, u32 offset, u16 data,
> +				u16 mask, bool is_sata)
> +{
> +	/*
> +	 * When Lane 2 PHY is for USB3, access the PHY registers
> +	 * through indirect Address and Data registers:
> +	 * INDIR_ACC_PHY_ADDR (RD00E0178h [31:0]),
> +	 * INDIR_ACC_PHY_DATA (RD00E017Ch [31:0]),
> +	 * within the SATA Host Controller registers, Lane 2 base register
> +	 * offset is 0x200
> +	 */
> +	if (is_sata)
> +		writel(offset, base_addr + COMPHY_LANE2_INDIR_ADDR_OFFSET);
> +	else
> +		writel(USB3PHY_LANE2_REG_BASE_OFFSET + offset,
> +		       base_addr + COMPHY_LANE2_INDIR_ADDR_OFFSET);
> +
> +	reg_set(base_addr + COMPHY_LANE2_INDIR_DATA_OFFSET, data, mask);
> +}
> +
> +/* It is only used for SATA on comphy lane2. */
> +static void comphy_sata_set_indirect(void __iomem *base_addr, u32 reg_offset,
> +				     u16 data, u16 mask)
> +{
> +	comphy_set_indirect(base_addr, reg_offset, data, mask, true);
> +}
> +
> +/* It is only used for USB3 indirect access on comphy lane2. */
> +static void comphy_usb3_set_indirect(void __iomem *base_addr, u32 reg_offset,
> +				     u16 data, u16 mask)
> +{
> +	comphy_set_indirect(base_addr, reg_offset, data, mask, false);
> +}
> +
> +/* It is only used for USB3 direct access not on comphy lane2. */
> +static void comphy_usb3_set_direct(void __iomem *base_addr, u32 reg_offset,
> +				   u16 data, u16 mask)
> +{
> +	reg_set16(base_addr + reg_offset * PHY_SHFT(USB3), data, mask);
> +}
> +
> +static void comphy_gbe_phy_init(void __iomem *gbe_phy_base, bool is_1gbps)
> +{
> +	const int fix_arr_sz = ARRAY_SIZE(gbe_phy_init_fix);
> +	int addr, fix_idx;
> +	u16 val;
> +
> +	fix_idx = 0;
> +	for (addr = 0; addr < 512; addr++) {
> +		/*
> +		 * All PHY register values are defined in full for 3.125Gbps
> +		 * SERDES speed. The values required for 1.25 Gbps are almost
> +		 * the same and only few registers should be "fixed" in
> +		 * comparison to 3.125 Gbps values. These register values are
> +		 * stored in "gbe_phy_init_fix" array.
> +		 */
> +		if (!is_1gbps && gbe_phy_init_fix[fix_idx].addr == addr) {
> +			/* Use new value */
> +			val = gbe_phy_init_fix[fix_idx].value;
> +			if (fix_idx < fix_arr_sz)
> +				fix_idx++;
> +		} else {
> +			val = gbe_phy_init[addr];
> +		}
> +
> +		reg_set16(GBE_PHY_ADDR(gbe_phy_base, addr), val, 0xFFFF);
> +	}
> +}
> +
> +static int mvebu_a3700_comphy_sata_power_on(struct mvebu_a3700_comphy_lane *lane)
> +{
> +	void __iomem *sata_phy_base = lane->priv->sata_usb3_phy_regs;
> +	u32 offset, data = 0, ref_clk;
> +	int ret;
> +
> +	/* Configure phy selector for SATA */
> +	ret = mvebu_a3700_comphy_set_phy_selector(lane);
> +	if (ret)
> +		return ret;
> +
> +	/* Clear phy isolation mode to make it work in normal mode */
> +	offset = SATAPHY_LANE2_REG_BASE_OFFSET + COMPHY_ISOLATION_CTRL_REG;
> +	comphy_sata_set_indirect(sata_phy_base, offset, 0, PHY_ISOLATE_MODE);
> +
> +	/* 0. Check the Polarity invert bits */
> +	if (lane->invert_tx)
> +		data |= TXD_INVERT_BIT;
> +	if (lane->invert_rx)
> +		data |= RXD_INVERT_BIT;
> +
> +	offset = SATAPHY_LANE2_REG_BASE_OFFSET + COMPHY_SYNC_PATTERN_REG;
> +	comphy_sata_set_indirect(sata_phy_base, offset, data, TXD_INVERT_BIT |
> +				 RXD_INVERT_BIT);
> +
> +	/* 1. Select 40-bit data width */
> +	offset = SATAPHY_LANE2_REG_BASE_OFFSET + COMPHY_LOOPBACK_REG0;
> +	comphy_sata_set_indirect(sata_phy_base, offset, DATA_WIDTH_40BIT,
> +				 SEL_DATA_WIDTH_MASK);
> +
> +	/* 2. Select reference clock(25M) and PHY mode (SATA) */
> +	offset = SATAPHY_LANE2_REG_BASE_OFFSET + COMPHY_POWER_PLL_CTRL;
> +	if (lane->priv->xtal_is_40m)
> +		ref_clk = REF_CLOCK_SPEED_40M;
> +	else
> +		ref_clk = REF_CLOCK_SPEED_25M;
> +
> +	comphy_sata_set_indirect(sata_phy_base, offset, ref_clk | COMPHY_MODE_SATA,
> +				 REF_FREF_SEL_MASK | COMPHY_MODE_MASK);
> +
> +	/* 3. Use maximum PLL rate (no power save) */
> +	offset = SATAPHY_LANE2_REG_BASE_OFFSET + COMPHY_KVCO_CAL_CTRL;
> +	comphy_sata_set_indirect(sata_phy_base, offset, USE_MAX_PLL_RATE_BIT,
> +				 USE_MAX_PLL_RATE_BIT);
> +
> +	/* 4. Reset reserved bit */
> +	comphy_sata_set_indirect(sata_phy_base, COMPHY_RESERVED_REG, 0,
> +				 PHYCTRL_FRM_PIN_BIT);
> +
> +	/* 5. Set vendor-specific configuration (It is done in sata driver) */
> +	/* XXX: in U-Boot below sequence was executed in this place, in Linux
> +	 * not.  Now it is done only in U-Boot before this comphy
> +	 * initialization - tests shows that it works ok, but in case of any
> +	 * future problem it is left for reference.
> +	 *   reg_set(MVEBU_REGS_BASE + 0xe00a0, 0, 0xffffffff);
> +	 *   reg_set(MVEBU_REGS_BASE + 0xe00a4, BIT(6), BIT(6));
> +	 */
> +
> +	/* Wait for > 55 us to allow PLL be enabled */
> +	udelay(PLL_SET_DELAY_US);
> +
> +	/* Polling status */
> +	writel(SATAPHY_LANE2_REG_BASE_OFFSET + COMPHY_LOOPBACK_REG0,
> +	       sata_phy_base + COMPHY_LANE2_INDIR_ADDR_OFFSET);
> +
> +	ret = readl_poll_timeout(sata_phy_base + COMPHY_LANE2_INDIR_DATA_OFFSET,
> +				 data, data & PLL_READY_TX_BIT,
> +				 COMPHY_PLL_SLEEP, COMPHY_PLL_TIMEOUT);
> +	if (ret) {
> +		dev_err(lane->dev, "Failed to lock SATA PLL\n");
> +		return ret;
> +	}
> +
> +	return 0;
> +}
> +
> +static int mvebu_a3700_comphy_ethernet_power_on(struct mvebu_a3700_comphy_lane *lane)
> +{
> +	void __iomem *comphy_base = lane->priv->comphy_regs;
> +	void __iomem *gbe_phy_base;
> +	u32 mask, data;
> +	int ret;
> +
> +	/* Set selector */
> +	ret = mvebu_a3700_comphy_set_phy_selector(lane);
> +	if (ret)
> +		return ret;
> +
> +	/* GBE PHY Base address
> +	 * COMPHY Lane0 -- USB3/GBE1
> +	 * COMPHY Lane1 -- PCIe/GBE0
> +	 */
> +	if (lane->id == 0) {
> +		/* Get usb3 and gbe register base address */
> +		gbe_phy_base = lane->priv->usb3_gbe1_phy_regs;
> +	} else {
> +		/* Get pcie and gbe register base address */
> +		gbe_phy_base = lane->priv->pcie_gbe0_phy_regs;
> +	}
> +
> +	/*
> +	 * 1. Reset PHY by setting PHY input port PIN_RESET=1.
> +	 * 2. Set PHY input port PIN_TX_IDLE=1, PIN_PU_IVREF=1 to keep
> +	 *    PHY TXP/TXN output to idle state during PHY initialization
> +	 * 3. Set PHY input port PIN_PU_PLL=0, PIN_PU_RX=0, PIN_PU_TX=0.
> +	 */
> +	data = PIN_PU_IVEREF_BIT | PIN_TX_IDLE_BIT | PIN_RESET_COMPHY_BIT;
> +	mask = PIN_RESET_CORE_BIT | PIN_PU_PLL_BIT | PIN_PU_RX_BIT |
> +		PIN_PU_TX_BIT | PHY_RX_INIT_BIT;
> +	reg_set(comphy_base + COMPHY_PHY_CFG1_OFFSET(lane->id), data, mask);
> +
> +	/* 4. Release reset to the PHY by setting PIN_RESET=0. */
> +	data = 0;
> +	mask = PIN_RESET_COMPHY_BIT;
> +	reg_set(comphy_base + COMPHY_PHY_CFG1_OFFSET(lane->id), data, mask);
> +
> +	/*
> +	 * 5. Set PIN_PHY_GEN_TX[3:0] and PIN_PHY_GEN_RX[3:0] to decide COMPHY
> +	 * bit rate
> +	 */
> +	switch (lane->submode) {
> +	case PHY_INTERFACE_MODE_SGMII:
> +	case PHY_INTERFACE_MODE_1000BASEX:
> +		/* SGMII 1G, SerDes speed 1.25G */
> +		data |= SERDES_SPEED_1_25_G << GEN_RX_SEL_OFFSET;
> +		data |= SERDES_SPEED_1_25_G << GEN_TX_SEL_OFFSET;
> +		break;
> +	case PHY_INTERFACE_MODE_2500BASEX:
> +		/* 2500Base-X, SerDes speed 3.125G */
> +		data |= SERDES_SPEED_2_5_G << GEN_RX_SEL_OFFSET;
> +		data |= SERDES_SPEED_2_5_G << GEN_TX_SEL_OFFSET;
> +		break;
> +	default:
> +		/* Other rates are not supported */
> +		dev_err(lane->dev, "unsupported phy speed %d on comphy lane%d\n",
> +			lane->submode, lane->id);
>  		return -EINVAL;
>  	}
> +	mask = GEN_RX_SEL_MASK | GEN_TX_SEL_MASK;
> +	reg_set(comphy_base + COMPHY_PHY_CFG1_OFFSET(lane->id), data, mask);
> +
> +	/*
> +	 * 6. Wait 10mS for bandgap and reference clocks to stabilize; then
> +	 * start SW programming.
> +	 */
> +	mdelay(10);
> +
> +	/* 7. Program COMPHY register PHY_MODE */
> +	data = COMPHY_MODE_SERDES;
> +	mask = COMPHY_MODE_MASK;
> +	reg_set16(GBE_PHY_ADDR(gbe_phy_base, COMPHY_POWER_PLL_CTRL), data, mask);
> +
> +	/*
> +	 * 8. Set COMPHY register REFCLK_SEL to select the correct REFCLK
> +	 * source
> +	 */
> +	data = 0;
> +	mask = PHY_REF_CLK_SEL;
> +	reg_set16(GBE_PHY_ADDR(gbe_phy_base, COMPHY_MISC_REG0_ADDR), data, mask);
> +
> +	/*
> +	 * 9. Set correct reference clock frequency in COMPHY register
> +	 * REF_FREF_SEL.
> +	 */
> +	if (lane->priv->xtal_is_40m)
> +		data = REF_CLOCK_SPEED_50M;
> +	else
> +		data = REF_CLOCK_SPEED_25M;
> +
> +	mask = REF_FREF_SEL_MASK;
> +	reg_set16(GBE_PHY_ADDR(gbe_phy_base, COMPHY_POWER_PLL_CTRL), data, mask);
> +
> +	/* 10. Program COMPHY register PHY_GEN_MAX[1:0]
> +	 * This step is mentioned in the flow received from verification team.
> +	 * However the PHY_GEN_MAX value is only meaningful for other interfaces
> +	 * (not SERDES). For instance, it selects SATA speed 1.5/3/6 Gbps or PCIe
> +	 * speed 2.5/5 Gbps
> +	 */
> +
> +	/*
> +	 * 11. Program COMPHY register SEL_BITS to set correct parallel data
> +	 * bus width
> +	 */
> +	data = DATA_WIDTH_10BIT;
> +	mask = SEL_DATA_WIDTH_MASK;
> +	reg_set16(GBE_PHY_ADDR(gbe_phy_base, COMPHY_LOOPBACK_REG0), data, mask);
> +
> +	/*
> +	 * 12. As long as DFE function needs to be enabled in any mode,
> +	 * COMPHY register DFE_UPDATE_EN[5:0] shall be programmed to 0x3F
> +	 * for real chip during COMPHY power on.
> +	 * The step 14 exists (and empty) in the original initialization flow
> +	 * obtained from the verification team. According to the functional
> +	 * specification DFE_UPDATE_EN already has the default value 0x3F
> +	 */
> +
> +	/*
> +	 * 13. Program COMPHY GEN registers.
> +	 * These registers should be programmed based on the lab testing result
> +	 * to achieve optimal performance. Please contact the CEA group to get
> +	 * the related GEN table during real chip bring-up. We only required to
> +	 * run though the entire registers programming flow defined by
> +	 * "comphy_gbe_phy_init" when the REF clock is 40 MHz. For REF clock
> +	 * 25 MHz the default values stored in PHY registers are OK.
> +	 */
> +	dev_dbg(lane->dev, "Running C-DPI phy init %s mode\n",
> +		lane->submode == PHY_INTERFACE_MODE_2500BASEX ? "2G5" : "1G");
> +	if (lane->priv->xtal_is_40m)
> +		comphy_gbe_phy_init(gbe_phy_base, lane->submode != PHY_INTERFACE_MODE_2500BASEX);
> +
> +	/*
> +	 * 14. [Simulation Only] should not be used for real chip.
> +	 * By pass power up calibration by programming EXT_FORCE_CAL_DONE
> +	 * (R02h[9]) to 1 to shorten COMPHY simulation time.
> +	 */
> +
> +	/*
> +	 * 15. [Simulation Only: should not be used for real chip]
> +	 * Program COMPHY register FAST_DFE_TIMER_EN=1 to shorten RX training
> +	 * simulation time.
> +	 */
> +
> +	/*
> +	 * 16. Check the PHY Polarity invert bit
> +	 */
> +	data = 0x0;
> +	if (lane->invert_tx)
> +		data |= TXD_INVERT_BIT;
> +	if (lane->invert_rx)
> +		data |= RXD_INVERT_BIT;
> +	mask = TXD_INVERT_BIT | RXD_INVERT_BIT;
> +	reg_set16(GBE_PHY_ADDR(gbe_phy_base, COMPHY_SYNC_PATTERN_REG), data, mask);
> +
> +	/*
> +	 * 17. Set PHY input ports PIN_PU_PLL, PIN_PU_TX and PIN_PU_RX to 1 to
> +	 * start PHY power up sequence. All the PHY register programming should
> +	 * be done before PIN_PU_PLL=1. There should be no register programming
> +	 * for normal PHY operation from this point.
> +	 */
> +	reg_set(comphy_base + COMPHY_PHY_CFG1_OFFSET(lane->id),
> +		PIN_PU_PLL_BIT | PIN_PU_RX_BIT | PIN_PU_TX_BIT,
> +		PIN_PU_PLL_BIT | PIN_PU_RX_BIT | PIN_PU_TX_BIT);
> +
> +	/*
> +	 * 18. Wait for PHY power up sequence to finish by checking output ports
> +	 * PIN_PLL_READY_TX=1 and PIN_PLL_READY_RX=1.
> +	 */
> +	ret = readl_poll_timeout(comphy_base + COMPHY_PHY_STATUS_OFFSET(lane->id),
> +				 data, (data & (PHY_PLL_READY_TX_BIT | PHY_PLL_READY_RX_BIT)) ==
> +				               (PHY_PLL_READY_TX_BIT | PHY_PLL_READY_RX_BIT),

checkpatch complains about using tabs, pls fix. Do run checkpatch...

> +				 COMPHY_PLL_SLEEP, COMPHY_PLL_TIMEOUT);
> +	if (ret) {
> +		dev_err(lane->dev, "Failed to lock PLL for SERDES PHY %d\n", lane->id);
> +		return ret;
> +	}
> +
> +	/*
> +	 * 19. Set COMPHY input port PIN_TX_IDLE=0
> +	 */
> +	reg_set(comphy_base + COMPHY_PHY_CFG1_OFFSET(lane->id),
> +		0x0, PIN_TX_IDLE_BIT);
> +
> +	/*
> +	 * 20. After valid data appear on PIN_RXDATA bus, set PIN_RX_INIT=1. To
> +	 * start RX initialization. PIN_RX_INIT_DONE will be cleared to 0 by the
> +	 * PHY After RX initialization is done, PIN_RX_INIT_DONE will be set to
> +	 * 1 by COMPHY Set PIN_RX_INIT=0 after PIN_RX_INIT_DONE= 1. Please
> +	 * refer to RX initialization part for details.
> +	 */
> +	reg_set(comphy_base + COMPHY_PHY_CFG1_OFFSET(lane->id),
> +		PHY_RX_INIT_BIT, PHY_RX_INIT_BIT);
> +
> +	ret = readl_poll_timeout(comphy_base + COMPHY_PHY_STATUS_OFFSET(lane->id),
> +				 data, (data & (PHY_PLL_READY_TX_BIT | PHY_PLL_READY_RX_BIT)) ==
> +				               (PHY_PLL_READY_TX_BIT | PHY_PLL_READY_RX_BIT),

Here as well

-- 
~Vinod



More information about the linux-phy mailing list