6 files changed, 81 insertions, 74 deletions

diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index e1f8de2c74a2..b6437f47a77f 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -18,6 +18,7 @@
 #include <linux/timer.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
+#include <linux/ethtool.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
@@ -69,6 +70,8 @@ static struct platform_device rd88f6281_nand_flash = {
 
 static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {
         .phy_addr       = -1,
+        .speed          = SPEED_1000,
+        .duplex         = DUPLEX_FULL,
 };
 
 static struct mv_sata_platform_data rd88f6281_sata_data = {
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index d50e3650a09e..73e9242da7ad 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -15,6 +15,7 @@
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx_eth.h>
+#include <linux/ethtool.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
 #include <asm/leds.h>
@@ -88,6 +89,8 @@ static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = {
 
 static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = {
         .phy_addr       = -1,
+        .speed          = SPEED_1000,
+        .duplex         = DUPLEX_FULL,
 };
 
 static void __init rd88f5181l_fxo_init(void)
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index b56447d32e17..ac482019abbf 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -15,6 +15,7 @@
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx_eth.h>
+#include <linux/ethtool.h>
 #include <linux/i2c.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
@@ -89,6 +90,8 @@ static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = {
 
 static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {
         .phy_addr       = -1,
+        .speed          = SPEED_1000,
+        .duplex         = DUPLEX_FULL,
 };
 
 static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = {
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c
index 1af093ff8cf3..25568c2a3d29 100644
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx_eth.h>
+#include <linux/ethtool.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
@@ -92,6 +93,8 @@ static struct platform_device wnr854t_nor_flash = {
 
 static struct mv643xx_eth_platform_data wnr854t_eth_data = {
         .phy_addr       = -1,
+        .speed          = SPEED_1000,
+        .duplex         = DUPLEX_FULL,
 };
 
 static void __init wnr854t_init(void)
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index aeab55c6a82d..9b8ee8c48bf0 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx_eth.h>
+#include <linux/ethtool.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
@@ -100,6 +101,8 @@ static struct platform_device wrt350n_v2_nor_flash = {
 
 static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = {
         .phy_addr       = -1,
+        .speed          = SPEED_1000,
+        .duplex         = DUPLEX_FULL,
 };
 
 static void __init wrt350n_v2_init(void)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 006ad45ddb84..29d4fe37cd50 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -91,6 +91,7 @@ static char mv643xx_eth_driver_version[] = "1.1";
 #define PORT_STATUS(p)                  (0x0444 + ((p) << 10))
 #define  TX_FIFO_EMPTY                  0x00000400
 #define  TX_IN_PROGRESS                 0x00000080
+#define  LINK_UP                        0x00000002
 #define TXQ_COMMAND(p)                  (0x0448 + ((p) << 10))
 #define TXQ_FIX_PRIO_CONF(p)            (0x044c + ((p) << 10))
 #define TX_BW_RATE(p)                   (0x0450 + ((p) << 10))
@@ -156,7 +157,6 @@ static char mv643xx_eth_driver_version[] = "1.1";
 #define SET_GMII_SPEED_TO_1000                  (1 << 23)
 #define SET_FULL_DUPLEX_MODE                    (1 << 21)
 #define MAX_RX_PACKET_9700BYTE                  (5 << 17)
-#define MAX_RX_PACKET_MASK                      (7 << 17)
 #define DISABLE_AUTO_NEG_SPEED_GMII             (1 << 13)
 #define DO_NOT_FORCE_LINK_FAIL                  (1 << 10)
 #define SERIAL_PORT_CONTROL_RESERVED            (1 << 9)
@@ -1135,10 +1135,28 @@ static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *
 
 static int mv643xx_eth_get_settings_phyless(struct net_device *dev, struct ethtool_cmd *cmd)
 {
+        struct mv643xx_eth_private *mp = netdev_priv(dev);
+        u32 port_status;
+
+        port_status = rdl(mp, PORT_STATUS(mp->port_num));
+
         cmd->supported = SUPPORTED_MII;
         cmd->advertising = ADVERTISED_MII;
-        cmd->speed = SPEED_1000;
-        cmd->duplex = DUPLEX_FULL;
+        switch (port_status & PORT_SPEED_MASK) {
+        case PORT_SPEED_10:
+                cmd->speed = SPEED_10;
+                break;
+        case PORT_SPEED_100:
+                cmd->speed = SPEED_100;
+                break;
+        case PORT_SPEED_1000:
+                cmd->speed = SPEED_1000;
+                break;
+        default:
+                cmd->speed = -1;
+                break;
+        }
+        cmd->duplex = (port_status & FULL_DUPLEX) ? DUPLEX_FULL : DUPLEX_HALF;
         cmd->port = PORT_MII;
         cmd->phy_address = 0;
         cmd->transceiver = XCVR_INTERNAL;
@@ -1661,51 +1679,6 @@ static void txq_deinit(struct tx_queue *txq)
 
 
 /* netdev ops and related ***************************************************/
-static void update_pscr(struct mv643xx_eth_private *mp, int speed, int duplex)
-{
-        u32 pscr_o;
-        u32 pscr_n;
-
-        pscr_o = rdl(mp, PORT_SERIAL_CONTROL(mp->port_num));
-
-        /* clear speed, duplex and rx buffer size fields */
-        pscr_n = pscr_o & ~(SET_MII_SPEED_TO_100   |
-                            SET_GMII_SPEED_TO_1000 |
-                            SET_FULL_DUPLEX_MODE   |
-                            MAX_RX_PACKET_MASK);
-
-        pscr_n |= MAX_RX_PACKET_9700BYTE;
-
-        if (speed == SPEED_1000)
-                pscr_n |= SET_GMII_SPEED_TO_1000;
-        else if (speed == SPEED_100)
-                pscr_n |= SET_MII_SPEED_TO_100;
-
-        if (duplex == DUPLEX_FULL)
-                pscr_n |= SET_FULL_DUPLEX_MODE;
-
-        if (pscr_n != pscr_o) {
-                if ((pscr_o & SERIAL_PORT_ENABLE) == 0)
-                        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr_n);
-                else {
-                        int i;
-
-                        for (i = 0; i < 8; i++)
-                                if (mp->txq_mask & (1 << i))
-                                        txq_disable(mp->txq + i);
-
-                        pscr_o &= ~SERIAL_PORT_ENABLE;
-                        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr_o);
-                        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr_n);
-                        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr_n);
-
-                        for (i = 0; i < 8; i++)
-                                if (mp->txq_mask & (1 << i))
-                                        txq_enable(mp->txq + i);
-                }
-        }
-}
-
 static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *)dev_id;
@@ -1726,14 +1699,7 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
         }
 
         if (int_cause_ext & (INT_EXT_PHY | INT_EXT_LINK)) {
-                if (mp->phy_addr == -1 || mii_link_ok(&mp->mii)) {
-                        if (mp->phy_addr != -1) {
-                                struct ethtool_cmd cmd;
-
-                                mii_ethtool_gset(&mp->mii, &cmd);
-                                update_pscr(mp, cmd.speed, cmd.duplex);
-                        }
-
+                if (rdl(mp, PORT_STATUS(mp->port_num)) & LINK_UP) {
                         if (!netif_carrier_ok(dev)) {
                                 netif_carrier_on(dev);
                                 netif_wake_queue(dev);
@@ -1847,23 +1813,6 @@ static void port_start(struct mv643xx_eth_private *mp)
         int i;
 
         /*
-         * Configure basic link parameters.
-         */
-        pscr = rdl(mp, PORT_SERIAL_CONTROL(mp->port_num));
-        pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
-        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr);
-        pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
-                DISABLE_AUTO_NEG_SPEED_GMII    |
-                DISABLE_AUTO_NEG_FOR_DUPLEX    |
-                DO_NOT_FORCE_LINK_FAIL         |
-                SERIAL_PORT_CONTROL_RESERVED;
-        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr);
-        pscr |= SERIAL_PORT_ENABLE;
-        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr);
-
-        wrl(mp, SDMA_CONFIG(mp->port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
-
-        /*
          * Perform PHY reset, if there is a PHY.
          */
         if (mp->phy_addr != -1) {
@@ -1875,6 +1824,21 @@ static void port_start(struct mv643xx_eth_private *mp)
         }
 
         /*
+         * Configure basic link parameters.
+         */
+        pscr = rdl(mp, PORT_SERIAL_CONTROL(mp->port_num));
+
+        pscr |= SERIAL_PORT_ENABLE;
+        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr);
+
+        pscr |= DO_NOT_FORCE_LINK_FAIL;
+        if (mp->phy_addr == -1)
+                pscr |= FORCE_LINK_PASS;
+        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr);
+
+        wrl(mp, SDMA_CONFIG(mp->port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
+
+        /*
          * Configure TX path and queues.
          */
         tx_set_rate(mp, 1000000000, 16777216);
@@ -2441,12 +2405,39 @@ static int phy_init(struct mv643xx_eth_private *mp,
                 cmd.duplex = pd->duplex;
         }
 
-        update_pscr(mp, cmd.speed, cmd.duplex);
         mv643xx_eth_set_settings(mp->dev, &cmd);
 
         return 0;
 }
 
+static void init_pscr(struct mv643xx_eth_private *mp, int speed, int duplex)
+{
+        u32 pscr;
+
+        pscr = rdl(mp, PORT_SERIAL_CONTROL(mp->port_num));
+        if (pscr & SERIAL_PORT_ENABLE) {
+                pscr &= ~SERIAL_PORT_ENABLE;
+                wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr);
+        }
+
+        pscr = MAX_RX_PACKET_9700BYTE | SERIAL_PORT_CONTROL_RESERVED;
+        if (mp->phy_addr == -1) {
+                pscr |= DISABLE_AUTO_NEG_SPEED_GMII;
+                if (speed == SPEED_1000)
+                        pscr |= SET_GMII_SPEED_TO_1000;
+                else if (speed == SPEED_100)
+                        pscr |= SET_MII_SPEED_TO_100;
+
+                pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL;
+
+                pscr |= DISABLE_AUTO_NEG_FOR_DUPLEX;
+                if (duplex == DUPLEX_FULL)
+                        pscr |= SET_FULL_DUPLEX_MODE;
+        }
+
+        wrl(mp, PORT_SERIAL_CONTROL(mp->port_num), pscr);
+}
+
 static int mv643xx_eth_probe(struct platform_device *pdev)
 {
         struct mv643xx_eth_platform_data *pd;
@@ -2500,6 +2491,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         } else {
                 SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops_phyless);
         }
+        init_pscr(mp, pd->speed, pd->duplex);
 
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);