Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 497fce5e authored by Jeff Kirsher's avatar Jeff Kirsher Committed by root
Browse files

e1000: Fix 82543 issue when reading eeprom 




Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
parent 20a44028

drivers/net/e1000/e1000_hw.c

+7 −1
Original line number Diff line number Diff line
@@ -907,6 +907,12 @@ e1000_setup_link(struct e1000_hw *hw) 
     * or e1000_phy_setup() is called.

     */

    if (hw->mac_type == e1000_82543) {

		ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG,

									1, &eeprom_data);

		if (ret_val) {

			DEBUGOUT("EEPROM Read Error\n");

			return -E1000_ERR_EEPROM;

		}

        ctrl_ext = ((eeprom_data & EEPROM_WORD0F_SWPDIO_EXT) <<

                    SWDPIO__EXT_SHIFT);

        E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);