Commit a10c1c81 authored by Russell King's avatar Russell King Committed by David S. Miller

net: marvell: neta: add comphy support

Add support for the common phy binding, so that we can reconfigure the
comphy according to the desired ethernet speed.  This will allow us to
support 1000base-X and 2500base-X SFPs dynamically on SolidRun Clearfog.
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ca124f4
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <linux/phy/phy.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/phylink.h> #include <linux/phylink.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -436,6 +437,7 @@ struct mvneta_port { ...@@ -436,6 +437,7 @@ struct mvneta_port {
struct device_node *dn; struct device_node *dn;
unsigned int tx_csum_limit; unsigned int tx_csum_limit;
struct phylink *phylink; struct phylink *phylink;
struct phy *comphy;
struct mvneta_bm *bm_priv; struct mvneta_bm *bm_priv;
struct mvneta_bm_pool *pool_long; struct mvneta_bm_pool *pool_long;
...@@ -3151,6 +3153,8 @@ static void mvneta_start_dev(struct mvneta_port *pp) ...@@ -3151,6 +3153,8 @@ static void mvneta_start_dev(struct mvneta_port *pp)
{ {
int cpu; int cpu;
WARN_ON(phy_power_on(pp->comphy));
mvneta_max_rx_size_set(pp, pp->pkt_size); mvneta_max_rx_size_set(pp, pp->pkt_size);
mvneta_txq_max_tx_size_set(pp, pp->pkt_size); mvneta_txq_max_tx_size_set(pp, pp->pkt_size);
...@@ -3213,6 +3217,8 @@ static void mvneta_stop_dev(struct mvneta_port *pp) ...@@ -3213,6 +3217,8 @@ static void mvneta_stop_dev(struct mvneta_port *pp)
mvneta_tx_reset(pp); mvneta_tx_reset(pp);
mvneta_rx_reset(pp); mvneta_rx_reset(pp);
WARN_ON(phy_power_off(pp->comphy));
} }
static void mvneta_percpu_enable(void *arg) static void mvneta_percpu_enable(void *arg)
...@@ -3338,6 +3344,7 @@ static int mvneta_set_mac_addr(struct net_device *dev, void *addr) ...@@ -3338,6 +3344,7 @@ static int mvneta_set_mac_addr(struct net_device *dev, void *addr)
static void mvneta_validate(struct net_device *ndev, unsigned long *supported, static void mvneta_validate(struct net_device *ndev, unsigned long *supported,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
struct mvneta_port *pp = netdev_priv(ndev);
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
/* We only support QSGMII, SGMII, 802.3z and RGMII modes */ /* We only support QSGMII, SGMII, 802.3z and RGMII modes */
...@@ -3358,8 +3365,13 @@ static void mvneta_validate(struct net_device *ndev, unsigned long *supported, ...@@ -3358,8 +3365,13 @@ static void mvneta_validate(struct net_device *ndev, unsigned long *supported,
phylink_set(mask, Pause); phylink_set(mask, Pause);
/* Half-duplex at speeds higher than 100Mbit is unsupported */ /* Half-duplex at speeds higher than 100Mbit is unsupported */
phylink_set(mask, 1000baseT_Full); if (pp->comphy || state->interface != PHY_INTERFACE_MODE_2500BASEX) {
phylink_set(mask, 1000baseX_Full); phylink_set(mask, 1000baseT_Full);
phylink_set(mask, 1000baseX_Full);
}
if (pp->comphy || state->interface == PHY_INTERFACE_MODE_2500BASEX) {
phylink_set(mask, 2500baseX_Full);
}
if (!phy_interface_mode_is_8023z(state->interface)) { if (!phy_interface_mode_is_8023z(state->interface)) {
/* 10M and 100M are only supported in non-802.3z mode */ /* 10M and 100M are only supported in non-802.3z mode */
...@@ -3373,6 +3385,11 @@ static void mvneta_validate(struct net_device *ndev, unsigned long *supported, ...@@ -3373,6 +3385,11 @@ static void mvneta_validate(struct net_device *ndev, unsigned long *supported,
__ETHTOOL_LINK_MODE_MASK_NBITS); __ETHTOOL_LINK_MODE_MASK_NBITS);
bitmap_and(state->advertising, state->advertising, mask, bitmap_and(state->advertising, state->advertising, mask,
__ETHTOOL_LINK_MODE_MASK_NBITS); __ETHTOOL_LINK_MODE_MASK_NBITS);
/* We can only operate at 2500BaseX or 1000BaseX. If requested
* to advertise both, only report advertising at 2500BaseX.
*/
phylink_helper_basex_speed(state);
} }
static int mvneta_mac_link_state(struct net_device *ndev, static int mvneta_mac_link_state(struct net_device *ndev,
...@@ -3384,7 +3401,9 @@ static int mvneta_mac_link_state(struct net_device *ndev, ...@@ -3384,7 +3401,9 @@ static int mvneta_mac_link_state(struct net_device *ndev,
gmac_stat = mvreg_read(pp, MVNETA_GMAC_STATUS); gmac_stat = mvreg_read(pp, MVNETA_GMAC_STATUS);
if (gmac_stat & MVNETA_GMAC_SPEED_1000) if (gmac_stat & MVNETA_GMAC_SPEED_1000)
state->speed = SPEED_1000; state->speed =
state->interface == PHY_INTERFACE_MODE_2500BASEX ?
SPEED_2500 : SPEED_1000;
else if (gmac_stat & MVNETA_GMAC_SPEED_100) else if (gmac_stat & MVNETA_GMAC_SPEED_100)
state->speed = SPEED_100; state->speed = SPEED_100;
else else
...@@ -3499,12 +3518,20 @@ static void mvneta_mac_config(struct net_device *ndev, unsigned int mode, ...@@ -3499,12 +3518,20 @@ static void mvneta_mac_config(struct net_device *ndev, unsigned int mode,
MVNETA_GMAC_FORCE_LINK_DOWN); MVNETA_GMAC_FORCE_LINK_DOWN);
} }
/* When at 2.5G, the link partner can send frames with shortened /* When at 2.5G, the link partner can send frames with shortened
* preambles. * preambles.
*/ */
if (state->speed == SPEED_2500) if (state->speed == SPEED_2500)
new_ctrl4 |= MVNETA_GMAC4_SHORT_PREAMBLE_ENABLE; new_ctrl4 |= MVNETA_GMAC4_SHORT_PREAMBLE_ENABLE;
if (pp->comphy &&
(state->interface == PHY_INTERFACE_MODE_SGMII ||
state->interface == PHY_INTERFACE_MODE_1000BASEX ||
state->interface == PHY_INTERFACE_MODE_2500BASEX))
WARN_ON(phy_set_mode_ext(pp->comphy, PHY_MODE_ETHERNET,
state->interface));
if (new_ctrl0 != gmac_ctrl0) if (new_ctrl0 != gmac_ctrl0)
mvreg_write(pp, MVNETA_GMAC_CTRL_0, new_ctrl0); mvreg_write(pp, MVNETA_GMAC_CTRL_0, new_ctrl0);
if (new_ctrl2 != gmac_ctrl2) if (new_ctrl2 != gmac_ctrl2)
...@@ -4404,7 +4431,7 @@ static int mvneta_port_power_up(struct mvneta_port *pp, int phy_mode) ...@@ -4404,7 +4431,7 @@ static int mvneta_port_power_up(struct mvneta_port *pp, int phy_mode)
if (phy_mode == PHY_INTERFACE_MODE_QSGMII) if (phy_mode == PHY_INTERFACE_MODE_QSGMII)
mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_QSGMII_SERDES_PROTO); mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_QSGMII_SERDES_PROTO);
else if (phy_mode == PHY_INTERFACE_MODE_SGMII || else if (phy_mode == PHY_INTERFACE_MODE_SGMII ||
phy_mode == PHY_INTERFACE_MODE_1000BASEX) phy_interface_mode_is_8023z(phy_mode))
mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_SGMII_SERDES_PROTO); mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_SGMII_SERDES_PROTO);
else if (!phy_interface_mode_is_rgmii(phy_mode)) else if (!phy_interface_mode_is_rgmii(phy_mode))
return -EINVAL; return -EINVAL;
...@@ -4421,6 +4448,7 @@ static int mvneta_probe(struct platform_device *pdev) ...@@ -4421,6 +4448,7 @@ static int mvneta_probe(struct platform_device *pdev)
struct mvneta_port *pp; struct mvneta_port *pp;
struct net_device *dev; struct net_device *dev;
struct phylink *phylink; struct phylink *phylink;
struct phy *comphy;
const char *dt_mac_addr; const char *dt_mac_addr;
char hw_mac_addr[ETH_ALEN]; char hw_mac_addr[ETH_ALEN];
const char *mac_from; const char *mac_from;
...@@ -4446,6 +4474,14 @@ static int mvneta_probe(struct platform_device *pdev) ...@@ -4446,6 +4474,14 @@ static int mvneta_probe(struct platform_device *pdev)
goto err_free_irq; goto err_free_irq;
} }
comphy = devm_of_phy_get(&pdev->dev, dn, NULL);
if (comphy == ERR_PTR(-EPROBE_DEFER)) {
err = -EPROBE_DEFER;
goto err_free_irq;
} else if (IS_ERR(comphy)) {
comphy = NULL;
}
phylink = phylink_create(dev, pdev->dev.fwnode, phy_mode, phylink = phylink_create(dev, pdev->dev.fwnode, phy_mode,
&mvneta_phylink_ops); &mvneta_phylink_ops);
if (IS_ERR(phylink)) { if (IS_ERR(phylink)) {
...@@ -4462,6 +4498,7 @@ static int mvneta_probe(struct platform_device *pdev) ...@@ -4462,6 +4498,7 @@ static int mvneta_probe(struct platform_device *pdev)
pp = netdev_priv(dev); pp = netdev_priv(dev);
spin_lock_init(&pp->lock); spin_lock_init(&pp->lock);
pp->phylink = phylink; pp->phylink = phylink;
pp->comphy = comphy;
pp->phy_interface = phy_mode; pp->phy_interface = phy_mode;
pp->dn = dn; pp->dn = dn;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment