]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ixgbe: fix incorrect PHY register reads
authorEmil Tantilov <emil.s.tantilov@intel.com>
Sat, 10 Dec 2011 08:21:47 +0000 (08:21 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 14:34:53 +0000 (22:34 +0800)
Fix some register reads that had the opcode and register parameters swapped.
Also use define instead of a magic (0x3) number.

(cherry picked from commit c1085b10925a3271f90cb9619f22835e701e8657)
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/ixgbe/ixgbe_common.c

index f1365fef4ed2b7b4e9e3050dce1715ac41c63edc..7c3fb072c33abfcf9a9a776ef182106b4a902d2f 100644 (file)
@@ -266,10 +266,10 @@ s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw)
        if (hw->mac.type == ixgbe_mac_X540) {
                if (hw->phy.id == 0)
                        hw->phy.ops.identify(hw);
-               hw->phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECL, &i);
-               hw->phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECH, &i);
-               hw->phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECL, &i);
-               hw->phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECH, &i);
+               hw->phy.ops.read_reg(hw, IXGBE_PCRC8ECL, MDIO_MMD_PCS, &i);
+               hw->phy.ops.read_reg(hw, IXGBE_PCRC8ECH, MDIO_MMD_PCS, &i);
+               hw->phy.ops.read_reg(hw, IXGBE_LDPCECL, MDIO_MMD_PCS, &i);
+               hw->phy.ops.read_reg(hw, IXGBE_LDPCECH, MDIO_MMD_PCS, &i);
        }
 
        return 0;