Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 13 insertions, 58 deletions

diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index eeaf0bd64bd3..7ab385c8136d 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2011 Solarflare Communications Inc.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -15,7 +15,6 @@
 #include "net_driver.h"
 #include "mdio_10g.h"
 #include "workarounds.h"
-#include "nic.h"
 
 unsigned efx_mdio_id_oui(u32 id)
 {
@@ -52,13 +51,10 @@ int efx_mdio_reset_mmd(struct efx_nic *port, int mmd,
         return spins ? spins : -ETIMEDOUT;
 }
 
-static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd, int fault_fatal)
+static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd)
 {
         int status;
 
-        if (LOOPBACK_INTERNAL(efx))
-                return 0;
-
         if (mmd != MDIO_MMD_AN) {
                 /* Read MMD STATUS2 to check it is responding. */
                 status = efx_mdio_read(efx, mmd, MDIO_STAT2);
@@ -69,20 +65,6 @@ static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd, int fault_fatal)
                 }
         }
 
-        /* Read MMD STATUS 1 to check for fault. */
-        status = efx_mdio_read(efx, mmd, MDIO_STAT1);
-        if (status & MDIO_STAT1_FAULT) {
-                if (fault_fatal) {
-                        netif_err(efx, hw, efx->net_dev,
-                                  "PHY MMD %d reporting fatal"
-                                  " fault: status %x\n", mmd, status);
-                        return -EIO;
-                } else {
-                        netif_dbg(efx, hw, efx->net_dev,
-                                  "PHY MMD %d reporting status"
-                                  " %x (expected)\n", mmd, status);
-                }
-        }
         return 0;
 }
 
@@ -131,8 +113,7 @@ int efx_mdio_wait_reset_mmds(struct efx_nic *efx, unsigned int mmd_mask)
         return rc;
 }
 
-int efx_mdio_check_mmds(struct efx_nic *efx,
-                        unsigned int mmd_mask, unsigned int fatal_mask)
+int efx_mdio_check_mmds(struct efx_nic *efx, unsigned int mmd_mask)
 {
         int mmd = 0, probe_mmd, devs1, devs2;
         u32 devices;
@@ -162,13 +143,9 @@ int efx_mdio_check_mmds(struct efx_nic *efx,
 
         /* Check all required MMDs are responding and happy. */
         while (mmd_mask) {
-                if (mmd_mask & 1) {
-                        int fault_fatal = fatal_mask & 1;
-                        if (efx_mdio_check_mmd(efx, mmd, fault_fatal))
-                                return -EIO;
-                }
+                if ((mmd_mask & 1) && efx_mdio_check_mmd(efx, mmd))
+                        return -EIO;
                 mmd_mask = mmd_mask >> 1;
-                fatal_mask = fatal_mask >> 1;
                 mmd++;
         }
 
@@ -255,12 +232,12 @@ void efx_mdio_set_mmds_lpower(struct efx_nic *efx,
  */
 int efx_mdio_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
 {
-        struct ethtool_cmd prev;
+        struct ethtool_cmd prev = { .cmd = ETHTOOL_GSET };
 
         efx->phy_op->get_settings(efx, &prev);
 
         if (ecmd->advertising == prev.advertising &&
-            ecmd->speed == prev.speed &&
+            ethtool_cmd_speed(ecmd) == ethtool_cmd_speed(&prev) &&
             ecmd->duplex == prev.duplex &&
             ecmd->port == prev.port &&
             ecmd->autoneg == prev.autoneg)
@@ -286,50 +263,28 @@ int efx_mdio_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
  */
 void efx_mdio_an_reconfigure(struct efx_nic *efx)
 {
-        bool xnp = (efx->link_advertising & ADVERTISED_10000baseT_Full
-                    || EFX_WORKAROUND_13204(efx));
         int reg;
 
         WARN_ON(!(efx->mdio.mmds & MDIO_DEVS_AN));
 
         /* Set up the base page */
-        reg = ADVERTISE_CSMA;
-        if (efx->link_advertising & ADVERTISED_10baseT_Half)
-                reg |= ADVERTISE_10HALF;
-        if (efx->link_advertising & ADVERTISED_10baseT_Full)
-                reg |= ADVERTISE_10FULL;
-        if (efx->link_advertising & ADVERTISED_100baseT_Half)
-                reg |= ADVERTISE_100HALF;
-        if (efx->link_advertising & ADVERTISED_100baseT_Full)
-                reg |= ADVERTISE_100FULL;
-        if (xnp)
-                reg |= ADVERTISE_RESV;
-        else if (efx->link_advertising & (ADVERTISED_1000baseT_Half |
-                                          ADVERTISED_1000baseT_Full))
-                reg |= ADVERTISE_NPAGE;
+        reg = ADVERTISE_CSMA | ADVERTISE_RESV;
         if (efx->link_advertising & ADVERTISED_Pause)
                 reg |= ADVERTISE_PAUSE_CAP;
         if (efx->link_advertising & ADVERTISED_Asym_Pause)
                 reg |= ADVERTISE_PAUSE_ASYM;
         efx_mdio_write(efx, MDIO_MMD_AN, MDIO_AN_ADVERTISE, reg);
 
-        /* Set up the (extended) next page if necessary */
-        if (efx->phy_op->set_npage_adv)
-                efx->phy_op->set_npage_adv(efx, efx->link_advertising);
+        /* Set up the (extended) next page */
+        efx->phy_op->set_npage_adv(efx, efx->link_advertising);
 
         /* Enable and restart AN */
         reg = efx_mdio_read(efx, MDIO_MMD_AN, MDIO_CTRL1);
-        reg |= MDIO_AN_CTRL1_ENABLE;
-        if (!(EFX_WORKAROUND_15195(efx) && LOOPBACK_EXTERNAL(efx)))
-                reg |= MDIO_AN_CTRL1_RESTART;
-        if (xnp)
-                reg |= MDIO_AN_CTRL1_XNP;
-        else
-                reg &= ~MDIO_AN_CTRL1_XNP;
+        reg |= MDIO_AN_CTRL1_ENABLE | MDIO_AN_CTRL1_RESTART | MDIO_AN_CTRL1_XNP;
         efx_mdio_write(efx, MDIO_MMD_AN, MDIO_CTRL1, reg);
 }
 
-enum efx_fc_type efx_mdio_get_pause(struct efx_nic *efx)
+u8 efx_mdio_get_pause(struct efx_nic *efx)
 {
         BUILD_BUG_ON(EFX_FC_AUTO & (EFX_FC_RX | EFX_FC_TX));
 
@@ -360,7 +315,7 @@ int efx_mdio_test_alive(struct efx_nic *efx)
                           "no MDIO PHY present with ID %d\n", efx->mdio.prtad);
                 rc = -EINVAL;
         } else {
-                rc = efx_mdio_check_mmds(efx, efx->mdio.mmds, 0);
+                rc = efx_mdio_check_mmds(efx, efx->mdio.mmds);
         }
 
         mutex_unlock(&efx->mac_lock);