Commit 60ffa478 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by Auke Kok
Browse files

e100: Fix MDIO/MDIO-X 



MDIO/MDIO-X was broken due to a wrong errata. Removing the workaround
code fixes for affected NICs.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 09e590e5

drivers/net/e100.c

+5 −9
Original line number Diff line number Diff line
@@ -1391,15 +1391,11 @@ static int e100_phy_init(struct nic *nic) 
	}



	if((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&

	   (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000))) {

		/* enable/disable MDI/MDI-X auto-switching.

		   MDI/MDI-X auto-switching is disabled for 82551ER/QM chips */

		if((nic->mac == mac_82551_E) || (nic->mac == mac_82551_F) ||

		   (nic->mac == mac_82551_10) || (nic->mii.force_media) ||

		   !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))

			mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, 0);

		else

			mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, NCONFIG_AUTO_SWITCH);

	   (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&

		!(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {

		/* enable/disable MDI/MDI-X auto-switching. */

		mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,

				nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);

	}



	return 0;