phy: marvell: phy-mvebu-cp110-comphy: Implement RXAUI Support
PATCH 1/1 phy: marvell: phy-mvebu-cp110-comphy: Implement RXAUI Support
This patch set introduces support for configuring Marvell's cp110 comphy for RXAUI operation. I can post the other half of these patches (for mvpp2) here if need be but I'm preparing to submit them to netdev shortly. I've tested this on a Marvell Armada 7040 based platform with no issues.
PATCH 1/4 phy: marvell: phy-mvebu-cp110-comphy: implement RXAUI support
Marvell's cp110 phy supports RXAUI on lanes 2, 3, 4, and 5 when connected to port zero. When used in this mode, lanes operate in pairs of two (2 and 3, 4 and 5).
--- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 127 ++++++++++++++++++- 1 file changed, 120 insertions(+), 7 deletions(-)
drivers/phy/marvell/phy-mvebu-cp110-comphy.c +120 -7
@@ -22,6 +22,7 @@#define MVEBU_COMPHY_SERDES_CFG0_PU_RX BIT(11)#define MVEBU_COMPHY_SERDES_CFG0_PU_TX BIT(12)#define MVEBU_COMPHY_SERDES_CFG0_HALF_BUS BIT(14) +#define MVEBU_COMPHY_SERDES_CFG0_RXAUI_MODE BIT(15)#define MVEBU_COMPHY_SERDES_CFG1 (n) (0x4 + (n) * 0x1000)#define MVEBU_COMPHY_SERDES_CFG1_RESET BIT(3)#define MVEBU_COMPHY_SERDES_CFG1_RX_INIT BIT(4)
@@ -111,6 +112,9 @@#define MVEBU_COMPHY_SELECTOR_PHY (n) ((n) * 0x4)#define MVEBU_COMPHY_PIPE_SELECTOR 0x1144#define MVEBU_COMPHY_PIPE_SELECTOR_PIPE (n) ((n) * 0x4) +#define MVEBU_COMPHY_SD1_CTRL1 0x1148 +#define MVEBU_COMPHY_SD1_CTRL1_RXAUI1_EN BIT(26) +#define MVEBU_COMPHY_SD1_CTRL1_RXAUI0_EN BIT(27)#define MVEBU_COMPHY_LANES 6#define MVEBU_COMPHY_PORTS 3
@@ -142,16 +146,20 @@ static const struct mvebu_comphy_conf mvebu_comphy_cp110_modes[] = {/* lane 2 */ MVEBU_COMPHY_CONF (2 ,0 ,PHY_INTERFACE_MODE_SGMII ,0x1 ),MVEBU_COMPHY_CONF (2 ,0 ,PHY_INTERFACE_MODE_2500BASEX ,0x1 ), +MVEBU_COMPHY_CONF (2 ,0 ,PHY_INTERFACE_MODE_RXAUI ,0x1 ),MVEBU_COMPHY_CONF (2 ,0 ,PHY_INTERFACE_MODE_10GKR ,0x1 ),/* lane 3 */ +MVEBU_COMPHY_CONF (3 ,0 ,PHY_INTERFACE_MODE_RXAUI ,0x1 ),MVEBU_COMPHY_CONF (3 ,1 ,PHY_INTERFACE_MODE_SGMII ,0x2 ),MVEBU_COMPHY_CONF (3 ,1 ,PHY_INTERFACE_MODE_2500BASEX ,0x2 ),/* lane 4 */ MVEBU_COMPHY_CONF (4 ,0 ,PHY_INTERFACE_MODE_SGMII ,0x2 ),MVEBU_COMPHY_CONF (4 ,0 ,PHY_INTERFACE_MODE_2500BASEX ,0x2 ), +MVEBU_COMPHY_CONF (4 ,0 ,PHY_INTERFACE_MODE_RXAUI ,0x2 ),MVEBU_COMPHY_CONF (4 ,0 ,PHY_INTERFACE_MODE_10GKR ,0x2 ),MVEBU_COMPHY_CONF (4 ,1 ,PHY_INTERFACE_MODE_SGMII ,0x1 ),/* lane 5 */ +MVEBU_COMPHY_CONF (5 ,0 ,PHY_INTERFACE_MODE_RXAUI ,0x2 ),MVEBU_COMPHY_CONF (5 ,2 ,PHY_INTERFACE_MODE_SGMII ,0x1 ), MVEBU_COMPHY_CONF(5, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1), };
@@ -193,7 +201,7 @@ static int mvebu_comphy_get_mux(int lane, int port,return mvebu_comphy_cp110_modes[i].mux; } -static void mvebu_comphy_ethernet_init_reset (struct mvebu_comphy_lane *lane) +static int mvebu_comphy_ethernet_init_reset (struct mvebu_comphy_lane *lane) {struct mvebu_comphy_priv *priv = lane->priv;u32 val;
@@ -210,20 +218,61 @@ static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane)MVEBU_COMPHY_SERDES_CFG0_PU_TX |MVEBU_COMPHY_SERDES_CFG0_HALF_BUS |MVEBU_COMPHY_SERDES_CFG0_GEN_RX (0xf ) | - MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0xf)); -if (lane->submode ==PHY_INTERFACE_MODE_10GKR ) +MVEBU_COMPHY_SERDES_CFG0_GEN_TX (0xf ) | + MVEBU_COMPHY_SERDES_CFG0_RXAUI_MODE); + +switch (lane->submode) { +case PHY_INTERFACE_MODE_10GKR : val |=MVEBU_COMPHY_SERDES_CFG0_GEN_RX (0xe ) |MVEBU_COMPHY_SERDES_CFG0_GEN_TX (0xe ); -else if (lane->submode ==PHY_INTERFACE_MODE_2500BASEX ) +break ; +case PHY_INTERFACE_MODE_RXAUI : + val |=MVEBU_COMPHY_SERDES_CFG0_GEN_RX (0xb ) | +MVEBU_COMPHY_SERDES_CFG0_GEN_TX (0xb ) | +MVEBU_COMPHY_SERDES_CFG0_RXAUI_MODE ; +break ; +case PHY_INTERFACE_MODE_2500BASEX : val |=MVEBU_COMPHY_SERDES_CFG0_GEN_RX (0x8 ) |MVEBU_COMPHY_SERDES_CFG0_GEN_TX (0x8 ) |MVEBU_COMPHY_SERDES_CFG0_HALF_BUS ; -else if (lane->submode ==PHY_INTERFACE_MODE_SGMII ) +break ; +case PHY_INTERFACE_MODE_SGMII : val |=MVEBU_COMPHY_SERDES_CFG0_GEN_RX (0x6 ) |MVEBU_COMPHY_SERDES_CFG0_GEN_TX (0x6 ) |MVEBU_COMPHY_SERDES_CFG0_HALF_BUS ; +break ; +default : +dev_err (priv->dev, +"unsupported comphy submode (%d) on lane %d\n" , + lane->submode, + lane->id); +return -ENOTSUPP ; + } +writel (val, priv->base +MVEBU_COMPHY_SERDES_CFG0 (lane->id)); +if (lane->submode ==PHY_INTERFACE_MODE_RXAUI ) { +regmap_read (priv->regmap,MVEBU_COMPHY_SD1_CTRL1 , &val); + +switch (lane->id) { +case 2 : +case 3 : + val |=MVEBU_COMPHY_SD1_CTRL1_RXAUI0_EN ; +break ; +case 4 : +case 5 : + val |=MVEBU_COMPHY_SD1_CTRL1_RXAUI1_EN ; +break ; +default : +dev_err (priv->dev, +"RXAUI is not supported on comphy lane %d\n" , + lane->id); +return -EINVAL ; + } + +regmap_write (priv->regmap,MVEBU_COMPHY_SD1_CTRL1 , val); + } +/* reset */ val =readl (priv->base +MVEBU_COMPHY_SERDES_CFG1 (lane->id)); val &= ~(MVEBU_COMPHY_SERDES_CFG1_RESET |
@@ -264,6 +313,8 @@ static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane) val &= ~MVEBU_COMPHY_LOOPBACK_DBUS_WIDTH (0x7 ); val |=MVEBU_COMPHY_LOOPBACK_DBUS_WIDTH (0x1 );writel (val, priv->base +MVEBU_COMPHY_LOOPBACK (lane->id)); + +return 0 ; }static int mvebu_comphy_init_plls (struct mvebu_comphy_lane *lane)
@@ -312,8 +363,11 @@ static int mvebu_comphy_set_mode_sgmii(struct phy *phy)struct mvebu_comphy_lane *lane =phy_get_drvdata (phy);struct mvebu_comphy_priv *priv = lane->priv;u32 val; +int err; -mvebu_comphy_ethernet_init_reset (lane); + err =mvebu_comphy_ethernet_init_reset (lane); +if (err) +return err; val =readl (priv->base +MVEBU_COMPHY_RX_CTRL1 (lane->id)); val &= ~MVEBU_COMPHY_RX_CTRL1_CLK8T_EN ;
@@ -337,13 +391,69 @@ static int mvebu_comphy_set_mode_sgmii(struct phy *phy)return mvebu_comphy_init_plls (lane); } +static int mvebu_comphy_set_mode_rxaui (struct phy *phy) +{ +struct mvebu_comphy_lane *lane =phy_get_drvdata (phy); +struct mvebu_comphy_priv *priv = lane->priv; +u32 val; +int err; + + err =mvebu_comphy_ethernet_init_reset (lane); +if (err) +return err; + + val =readl (priv->base +MVEBU_COMPHY_RX_CTRL1 (lane->id)); + val |=MVEBU_COMPHY_RX_CTRL1_RXCLK2X_SEL | +MVEBU_COMPHY_RX_CTRL1_CLK8T_EN ; +writel (val, priv->base +MVEBU_COMPHY_RX_CTRL1 (lane->id)); + + val =readl (priv->base +MVEBU_COMPHY_DLT_CTRL (lane->id)); + val |=MVEBU_COMPHY_DLT_CTRL_DLT_FLOOP_EN ; +writel (val, priv->base +MVEBU_COMPHY_DLT_CTRL (lane->id)); + + val =readl (priv->base +MVEBU_COMPHY_SERDES_CFG2 (lane->id)); + val |=MVEBU_COMPHY_SERDES_CFG2_DFE_EN ; +writel (val, priv->base +MVEBU_COMPHY_SERDES_CFG2 (lane->id)); + + val =readl (priv->base +MVEBU_COMPHY_DFE_RES (lane->id)); + val |=MVEBU_COMPHY_DFE_RES_FORCE_GEN_TBL ; +writel (val, priv->base +MVEBU_COMPHY_DFE_RES (lane->id)); + + val =readl (priv->base +MVEBU_COMPHY_GEN1_S0 (lane->id)); + val &= ~MVEBU_COMPHY_GEN1_S0_TX_EMPH (0xf ); + val |=MVEBU_COMPHY_GEN1_S0_TX_EMPH (0xd ); +writel (val, priv->base +MVEBU_COMPHY_GEN1_S0 (lane->id)); + + val =readl (priv->base +MVEBU_COMPHY_GEN1_S1 (lane->id)); + val &= ~(MVEBU_COMPHY_GEN1_S1_RX_MUL_PI (0x7 ) | +MVEBU_COMPHY_GEN1_S1_RX_MUL_PF (0x7 )); + val |=MVEBU_COMPHY_GEN1_S1_RX_MUL_PI (0x1 ) | +MVEBU_COMPHY_GEN1_S1_RX_MUL_PF (0x1 ) | +MVEBU_COMPHY_GEN1_S1_RX_DFE_EN ; +writel (val, priv->base +MVEBU_COMPHY_GEN1_S1 (lane->id)); + + val =readl (priv->base +MVEBU_COMPHY_COEF (lane->id)); + val &= ~(MVEBU_COMPHY_COEF_DFE_EN |MVEBU_COMPHY_COEF_DFE_CTRL ); +writel (val, priv->base +MVEBU_COMPHY_COEF (lane->id)); + + val =readl (priv->base +MVEBU_COMPHY_GEN1_S4 (lane->id)); + val &= ~MVEBU_COMPHY_GEN1_S4_DFE_RES (0x3 ); + val |=MVEBU_COMPHY_GEN1_S4_DFE_RES (0x1 ); +writel (val, priv->base +MVEBU_COMPHY_GEN1_S4 (lane->id)); + +return mvebu_comphy_init_plls (lane); +} +static int mvebu_comphy_set_mode_10gkr (struct phy *phy) {struct mvebu_comphy_lane *lane =phy_get_drvdata (phy);struct mvebu_comphy_priv *priv = lane->priv;u32 val; +int err; -mvebu_comphy_ethernet_init_reset (lane); + err =mvebu_comphy_ethernet_init_reset (lane); +if (err) +return err; val =readl (priv->base +MVEBU_COMPHY_RX_CTRL1 (lane->id)); val |= MVEBU_COMPHY_RX_CTRL1_RXCLK2X_SEL |
@@ -502,6 +612,9 @@ static int mvebu_comphy_power_on(struct phy *phy)case PHY_INTERFACE_MODE_2500BASEX : ret =mvebu_comphy_set_mode_sgmii (phy);break ; +case PHY_INTERFACE_MODE_RXAUI : + ret =mvebu_comphy_set_mode_rxaui (phy); +break ;case PHY_INTERFACE_MODE_10GKR : ret =mvebu_comphy_set_mode_10gkr (phy);break ;
Signature · 1 line
2.21.0
PATCH 2/4 phy: marvell: phy-mvebu-cp110-comphy: rename instances of DLT
In reply to Matt PellandThe documentation for Marvell's cp110 phy refers to these registers/register regions as DTL control, DTL frequency loop enable, etc. This patch aligns the relevant code for these accordingly.
--- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/phy/marvell/phy-mvebu-cp110-comphy.c +11 -11
@@ -78,8 +78,8 @@#define MVEBU_COMPHY_TX_SLEW_RATE (n) (0x974 + (n) * 0x1000)#define MVEBU_COMPHY_TX_SLEW_RATE_EMPH (n) ((n) << 5)#define MVEBU_COMPHY_TX_SLEW_RATE_SLC (n) ((n) << 10) -#define MVEBU_COMPHY_DLT_CTRL (n) (0x984 + (n) * 0x1000) -#define MVEBU_COMPHY_DLT_CTRL_DTL_FLOOP_EN BIT(2) +#define MVEBU_COMPHY_DTL_CTRL (n) (0x984 + (n) * 0x1000) +#define MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN BIT(2)#define MVEBU_COMPHY_FRAME_DETECT0 (n) (0xa14 + (n) * 0x1000)#define MVEBU_COMPHY_FRAME_DETECT0_PATN (n) ((n) << 7)#define MVEBU_COMPHY_FRAME_DETECT3 (n) (0xa20 + (n) * 0x1000)
@@ -374,9 +374,9 @@ static int mvebu_comphy_set_mode_sgmii(struct phy *phy) val |=MVEBU_COMPHY_RX_CTRL1_RXCLK2X_SEL ;writel (val, priv->base +MVEBU_COMPHY_RX_CTRL1 (lane->id)); - val =readl (priv->base +MVEBU_COMPHY_DLT_CTRL (lane->id)); - val &= ~MVEBU_COMPHY_DLT_CTRL_DTL_FLOOP_EN ; -writel (val, priv->base +MVEBU_COMPHY_DLT_CTRL (lane->id)); + val =readl (priv->base +MVEBU_COMPHY_DTL_CTRL (lane->id)); + val &= ~MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN ; +writel (val, priv->base +MVEBU_COMPHY_DTL_CTRL (lane->id));regmap_read (priv->regmap,MVEBU_COMPHY_CONF1 (lane->id), &val); val &= ~MVEBU_COMPHY_CONF1_USB_PCIE ;
@@ -407,9 +407,9 @@ static int mvebu_comphy_set_mode_rxaui(struct phy *phy)MVEBU_COMPHY_RX_CTRL1_CLK8T_EN ;writel (val, priv->base +MVEBU_COMPHY_RX_CTRL1 (lane->id)); - val =readl (priv->base +MVEBU_COMPHY_DLT_CTRL (lane->id)); - val |=MVEBU_COMPHY_DLT_CTRL_DLT_FLOOP_EN ; -writel (val, priv->base +MVEBU_COMPHY_DLT_CTRL (lane->id)); + val =readl (priv->base +MVEBU_COMPHY_DTL_CTRL (lane->id)); + val |=MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN ; +writel (val, priv->base +MVEBU_COMPHY_DTL_CTRL (lane->id)); val =readl (priv->base +MVEBU_COMPHY_SERDES_CFG2 (lane->id)); val |=MVEBU_COMPHY_SERDES_CFG2_DFE_EN ;
@@ -460,9 +460,9 @@ static int mvebu_comphy_set_mode_10gkr(struct phy *phy)MVEBU_COMPHY_RX_CTRL1_CLK8T_EN ;writel (val, priv->base +MVEBU_COMPHY_RX_CTRL1 (lane->id)); - val =readl (priv->base +MVEBU_COMPHY_DLT_CTRL (lane->id)); - val |=MVEBU_COMPHY_DLT_CTRL_DTL_FLOOP_EN ; -writel (val, priv->base +MVEBU_COMPHY_DLT_CTRL (lane->id)); + val =readl (priv->base +MVEBU_COMPHY_DTL_CTRL (lane->id)); + val |=MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN ; +writel (val, priv->base +MVEBU_COMPHY_DTL_CTRL (lane->id));/* Speed divider */ val =readl (priv->base +MVEBU_COMPHY_SPEED_DIV (lane->id));
Signature · 1 line
2.21.0