ramips: raeth: add PHYLIB support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30547 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/ramips_eth_platform.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/ramips_eth_platform.h
index 25e91fe..57c0556 100644 (file)
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/ramips_eth_platform.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/ramips_eth_platform.h
@@ -19,6 +19,8 @@
 #ifndef _RAMIPS_ETH_PLATFORM_H
 #define _RAMIPS_ETH_PLATFORM_H
 
 #ifndef _RAMIPS_ETH_PLATFORM_H
 #define _RAMIPS_ETH_PLATFORM_H
 

+#include <linux/phy.h>
+

 struct ramips_eth_platform_data
 {
        unsigned char mac[6];
 struct ramips_eth_platform_data
 {
        unsigned char mac[6];


@@ -30,6 +32,9 @@ struct ramips_eth_platform_data
        int duplex;
        int tx_fc;
        int rx_fc;
        int duplex;
        int tx_fc;
        int rx_fc;

+
+       u32 phy_mask;
+       phy_interface_t phy_if_mode;

 };
 
 #endif /* _RAMIPS_ETH_PLATFORM_H */
 };
 
 #endif /* _RAMIPS_ETH_PLATFORM_H */

diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c
index e211f47..4a3f4c3 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -92,10 +92,31 @@ ramips_hw_set_macaddr(unsigned char *mac)
 
 #define RAMIPS_MDIO_RETRY      1000
 
 
 #define RAMIPS_MDIO_RETRY      1000
 

-static void
-ramips_setup_mdio_cfg(struct raeth_priv *re)
+static unsigned char *ramips_speed_str(struct raeth_priv *re)

 {
 {

-       unsigned int mdio_cfg;
+       switch (re->speed) {
+       case SPEED_1000:
+               return "1000";
+       case SPEED_100:
+               return "100";
+       case SPEED_10:
+               return "10";
+       }
+
+       return "?";
+}
+
+static void ramips_link_adjust(struct raeth_priv *re)
+{
+       struct ramips_eth_platform_data *pdata;
+       u32 mdio_cfg;
+
+       pdata = re->parent->platform_data;
+       if (!re->link) {
+               netif_carrier_off(re->netdev);
+               netdev_info(re->netdev, "link down\n");
+               return;
+       }

 
        mdio_cfg = RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 |
                   RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 |
 
        mdio_cfg = RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 |
                   RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 |


@@ -125,7 +146,13 @@ ramips_setup_mdio_cfg(struct raeth_priv *re)
        }
 
        ramips_fe_wr(mdio_cfg, RAMIPS_MDIO_CFG);
        }
 
        ramips_fe_wr(mdio_cfg, RAMIPS_MDIO_CFG);

+
+       netif_carrier_on(re->netdev);
+       netdev_info(re->netdev, "link up (%sMbps/%s duplex)\n",
+                   ramips_speed_str(re),
+                   (DUPLEX_FULL == re->duplex) ? "Full" : "Half");

 }
 }

+

 static int
 ramips_mdio_wait_ready(struct raeth_priv *re)
 {
 static int
 ramips_mdio_wait_ready(struct raeth_priv *re)
 {


@@ -246,12 +273,159 @@ ramips_mdio_cleanup(struct raeth_priv *re)
        kfree(re->mii_bus);
 }
 
        kfree(re->mii_bus);
 }
 

-#else
-static inline void
-ramips_setup_mdio_cfg(struct raeth_priv *re)
+static void
+ramips_phy_link_adjust(struct net_device *dev)
+{
+       struct raeth_priv *re = netdev_priv(dev);
+       struct phy_device *phydev = re->phy_dev;
+       unsigned long flags;
+       int status_change = 0;
+
+       spin_lock_irqsave(&re->phy_lock, flags);
+
+       if (phydev->link)
+               if (re->duplex != phydev->duplex ||
+                   re->speed != phydev->speed)
+                       status_change = 1;
+
+       if (phydev->link != re->link)
+               status_change = 1;
+
+       re->link = phydev->link;
+       re->duplex = phydev->duplex;
+       re->speed = phydev->speed;
+
+       if (status_change)
+               ramips_link_adjust(re);
+
+       spin_unlock_irqrestore(&re->phy_lock, flags);
+}
+
+static int
+ramips_phy_connect_multi(struct raeth_priv *re)
+{
+       struct net_device *netdev = re->netdev;
+       struct ramips_eth_platform_data *pdata;
+       struct phy_device *phydev = NULL;
+       int phy_addr;
+       int ret = 0;
+
+       pdata = re->parent->platform_data;
+       for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
+               if (!(pdata->phy_mask & (1 << phy_addr)))
+                       continue;
+
+               if (re->mii_bus->phy_map[phy_addr] == NULL)
+                       continue;
+
+               RADEBUG("%s: PHY found at %s, uid=%08x\n",
+                       netdev->name,
+                       dev_name(&re->mii_bus->phy_map[phy_addr]->dev),
+                       re->mii_bus->phy_map[phy_addr]->phy_id);
+
+               if (phydev == NULL)
+                       phydev = re->mii_bus->phy_map[phy_addr];
+       }
+
+       if (!phydev) {
+               netdev_err(netdev, "no PHY found with phy_mask=%08x\n",
+                          pdata->phy_mask);
+               return -ENODEV;
+       }
+
+       re->phy_dev = phy_connect(netdev, dev_name(&phydev->dev),
+                                 ramips_phy_link_adjust, 0,
+                                 pdata->phy_if_mode);
+
+       if (IS_ERR(re->phy_dev)) {
+               netdev_err(netdev, "could not connect to PHY at %s\n",
+                          dev_name(&phydev->dev));
+               return PTR_ERR(re->phy_dev);
+       }
+
+       phydev->supported &= PHY_GBIT_FEATURES;
+       phydev->advertising = phydev->supported;
+
+       RADEBUG("%s: connected to PHY at %s [uid=%08x, driver=%s]\n",
+               netdev->name, dev_name(&phydev->dev),
+               phydev->phy_id, phydev->drv->name);
+
+       re->link = 0;
+       re->speed = 0;
+       re->duplex = -1;
+       re->rx_fc = 0;
+       re->tx_fc = 0;
+
+       return ret;
+}
+
+static int
+ramips_phy_connect_fixed(struct raeth_priv *re)
+{
+       struct ramips_eth_platform_data *pdata;
+
+       pdata = re->parent->platform_data;
+       switch (pdata->speed) {
+       case SPEED_10:
+       case SPEED_100:
+       case SPEED_1000:
+               break;
+       default:
+               netdev_err(re->netdev, "invalid speed specified\n");
+               return -EINVAL;
+       }
+
+       RADEBUG("%s: using fixed link parameters\n", re->netdev->name);
+
+       re->speed = pdata->speed;
+       re->duplex = pdata->duplex;
+       re->tx_fc = pdata->tx_fc;
+       re->rx_fc = pdata->tx_fc;
+
+       return 0;
+}
+
+static int
+ramips_phy_connect(struct raeth_priv *re)

 {
 {

+       struct ramips_eth_platform_data *pdata;
+
+       pdata = re->parent->platform_data;
+       if (pdata->phy_mask)
+               return ramips_phy_connect_multi(re);
+
+       return ramips_phy_connect_fixed(re);

 }
 
 }
 

+static void
+ramips_phy_disconnect(struct raeth_priv *re)
+{
+       if (re->phy_dev)
+               phy_disconnect(re->phy_dev);
+}
+
+static void
+ramips_phy_start(struct raeth_priv *re)
+{
+       if (re->phy_dev) {
+               phy_start(re->phy_dev);
+       } else {
+               re->link = 1;
+               ramips_link_adjust(re);
+       }
+}
+
+static void
+ramips_phy_stop(struct raeth_priv *re)
+{
+       if (re->phy_dev) {
+               phy_stop(re->phy_dev);
+       } else {
+               re->link = 0;
+               ramips_link_adjust(re);
+       }
+}
+#else

 static inline int
 ramips_mdio_init(struct raeth_priv *re)
 {
 static inline int
 ramips_mdio_init(struct raeth_priv *re)
 {


@@ -262,6 +436,27 @@ static inline void
 ramips_mdio_cleanup(struct raeth_priv *re)
 {
 }
 ramips_mdio_cleanup(struct raeth_priv *re)
 {
 }

+
+static inline int
+ramips_phy_connect(struct raeth_priv *re)
+{
+       return 0;
+}
+
+static inline void
+ramips_phy_disconnect(struct raeth_priv *re)
+{
+}
+
+static inline void
+ramips_phy_start(struct raeth_priv *re)
+{
+}
+
+static inline void
+ramips_phy_stop(struct raeth_priv *re)
+{
+}

 #endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT3883 */
 
 static void
 #endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT3883 */
 
 static void


@@ -546,7 +741,7 @@ ramips_eth_open(struct net_device *dev)
                     (unsigned long)dev);
        tasklet_init(&priv->rx_tasklet, ramips_eth_rx_hw, (unsigned long)dev);
 
                     (unsigned long)dev);
        tasklet_init(&priv->rx_tasklet, ramips_eth_rx_hw, (unsigned long)dev);
 

-       ramips_setup_mdio_cfg(priv);
+       ramips_phy_start(priv);

 
        ramips_fe_wr(RAMIPS_DELAY_INIT, RAMIPS_DLY_INT_CFG);
        ramips_fe_wr(RAMIPS_TX_DLY_INT | RAMIPS_RX_DLY_INT, RAMIPS_FE_INT_ENABLE);
 
        ramips_fe_wr(RAMIPS_DELAY_INIT, RAMIPS_DLY_INT_CFG);
        ramips_fe_wr(RAMIPS_TX_DLY_INT | RAMIPS_RX_DLY_INT, RAMIPS_FE_INT_ENABLE);


@@ -580,6 +775,7 @@ ramips_eth_stop(struct net_device *dev)
        /* disable all interrupts in the hw */
        ramips_fe_wr(0, RAMIPS_FE_INT_ENABLE);
 
        /* disable all interrupts in the hw */
        ramips_fe_wr(0, RAMIPS_FE_INT_ENABLE);
 

+       ramips_phy_stop(priv);

        free_irq(dev->irq, dev);
        netif_stop_queue(dev);
        tasklet_kill(&priv->tx_housekeeping_tasklet);
        free_irq(dev->irq, dev);
        netif_stop_queue(dev);
        tasklet_kill(&priv->tx_housekeeping_tasklet);


@@ -604,8 +800,20 @@ ramips_eth_probe(struct net_device *dev)
        dev->mtu = 1500;
        dev->watchdog_timeo = TX_TIMEOUT;
        spin_lock_init(&priv->page_lock);
        dev->mtu = 1500;
        dev->watchdog_timeo = TX_TIMEOUT;
        spin_lock_init(&priv->page_lock);

+       spin_lock_init(&priv->phy_lock);

 
        err = ramips_mdio_init(priv);
 
        err = ramips_mdio_init(priv);

+       if (err)
+               return err;
+
+       err = ramips_phy_connect(priv);
+       if (err)
+               goto err_mdio_cleanup;
+
+       return 0;
+
+err_mdio_cleanup:
+       ramips_mdio_cleanup(priv);

        return err;
 }
 
        return err;
 }
 


@@ -614,6 +822,7 @@ ramips_eth_uninit(struct net_device *dev)
 {
        struct raeth_priv *re = netdev_priv(dev);
 
 {
        struct raeth_priv *re = netdev_priv(dev);
 

+       ramips_phy_disconnect(re);

        ramips_mdio_cleanup(re);
 }
 
        ramips_mdio_cleanup(re);
 }
 

diff --git a/target/linux/ramips/files/drivers/net/ramips_eth.h b/target/linux/ramips/files/drivers/net/ramips_eth.h
index 4927f2a..a74732d 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips_eth.h
+++ b/target/linux/ramips/files/drivers/net/ramips_eth.h
@@ -229,10 +229,11 @@ struct raeth_priv
        unsigned int            skb_free_idx;
 
        spinlock_t              page_lock;
        unsigned int            skb_free_idx;
 
        spinlock_t              page_lock;

-       struct net_device       *netdev;
+       struct net_device       *netdev;

        struct device           *parent;
        struct ramips_eth_platform_data *plat;
 
        struct device           *parent;
        struct ramips_eth_platform_data *plat;
 

+       int                     link;

        int                     speed;
        int                     duplex;
        int                     tx_fc;
        int                     speed;
        int                     duplex;
        int                     tx_fc;


@@ -240,6 +241,8 @@ struct raeth_priv
 
        struct mii_bus          *mii_bus;
        int                     mii_irq[PHY_MAX_ADDR];
 
        struct mii_bus          *mii_bus;
        int                     mii_irq[PHY_MAX_ADDR];

+       struct phy_device       *phy_dev;
+       spinlock_t              phy_lock;

 };
 
 #endif /* RAMIPS_ETH_H */
 };
 
 #endif /* RAMIPS_ETH_H */

diff --git a/target/linux/ramips/patches-2.6.39/103-ethernet.patch b/target/linux/ramips/patches-2.6.39/103-ethernet.patch
index f6828cc..a5a9ab4 100644 (file)
--- a/target/linux/ramips/patches-2.6.39/103-ethernet.patch
+++ b/target/linux/ramips/patches-2.6.39/103-ethernet.patch
@@ -1,12 +1,13 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -494,6 +494,16 @@ config MIPS_AU1X00_ENET
+@@ -494,6 +494,17 @@ config MIPS_AU1X00_ENET

          If you have an Alchemy Semi AU1X00 based system
          say Y.  Otherwise, say N.
  
 +config MIPS_RAMIPS_NET
 +      tristate "Ethernet driver for rt288x/rt305x"
 +      depends on MIPS_RALINK
          If you have an Alchemy Semi AU1X00 based system
          say Y.  Otherwise, say N.
  
 +config MIPS_RAMIPS_NET
 +      tristate "Ethernet driver for rt288x/rt305x"
 +      depends on MIPS_RALINK

++      select PHYLIB if (SOC_RT288X || SOC_RT3883)

 +      help
 +        This driver supports the etehrnet mac inside the ralink wisocs
 +
 +      help
 +        This driver supports the etehrnet mac inside the ralink wisocs
 +

diff --git a/target/linux/ramips/patches-3.2/103-ethernet.patch b/target/linux/ramips/patches-3.2/103-ethernet.patch
index 8953f3b..ea244ef 100644 (file)
--- a/target/linux/ramips/patches-3.2/103-ethernet.patch
+++ b/target/linux/ramips/patches-3.2/103-ethernet.patch
@@ -1,12 +1,13 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -277,6 +277,16 @@ source "drivers/net/plip/Kconfig"
+@@ -277,6 +277,17 @@ source "drivers/net/plip/Kconfig"

  
  source "drivers/net/ppp/Kconfig"
  
 +config MIPS_RAMIPS_NET
 +      tristate "Ethernet driver for rt288x/rt305x"
 +      depends on MIPS_RALINK
  
  source "drivers/net/ppp/Kconfig"
  
 +config MIPS_RAMIPS_NET
 +      tristate "Ethernet driver for rt288x/rt305x"
 +      depends on MIPS_RALINK

++      select PHYLIB if (SOC_RT288X || SOC_RT3883)

 +      help
 +        This driver supports the etehrnet mac inside the ralink wisocs
 +
 +      help
 +        This driver supports the etehrnet mac inside the ralink wisocs
 +