ixgbe: do not use ixgbe specific mdio defines
Subsystems (2)
PATCH 1/2 ixgbe: do not use ixgbe specific mdio defines
Replace some ixgbe specific MDIO defines with their equivalent from the kernel.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 8 +-- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 16 ------ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 65 ++++++++++++------------- 3 files changed, 33 insertions(+), 56 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +2 -6
@@ -2396,9 +2396,7 @@ s32 ixgbe_set_copper_phy_power(struct ixgbe_hw *hw, bool on)if (!on &&ixgbe_mng_present (hw))return 0 ; - status = hw->phy.ops.read_reg (hw,IXGBE_MDIO_VENDOR_SPECIFIC_1_CONTROL , -IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE , - ®); + status = hw->phy.ops.read_reg (hw,MDIO_CTRL1 ,MDIO_MMD_VEND1 , ®);if (status)return status;
@@ -2410,8 +2408,6 @@ s32 ixgbe_set_copper_phy_power(struct ixgbe_hw *hw, bool on) reg |=IXGBE_MDIO_PHY_SET_LOW_POWER_MODE ; } - status = hw->phy.ops.write_reg (hw,IXGBE_MDIO_VENDOR_SPECIFIC_1_CONTROL , -IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE , - reg); + status = hw->phy.ops.write_reg (hw,MDIO_CTRL1 ,MDIO_MMD_VEND1 , reg);return status; }
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0 -16
@@ -874,19 +874,13 @@ struct ixgbe_thermal_sensor_data {#define IXGBE_MDIO_AUTO_NEG_VENDOR_STATUS_1GB 0x4/* 1Gb/s */ #define IXGBE_MDIO_AUTO_NEG_VENDOR_STATUS_10GB 0x6/* 10Gb/s */ -#define IXGBE_MII_10GBASE_T_AUTONEG_CTRL_REG 0x20/* 10G Control Reg */ #define IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG 0xC400/* 1G Provisioning 1 */ #define IXGBE_MII_AUTONEG_XNP_TX_REG 0x17/* 1G XNP Transmit */ -#define IXGBE_MII_AUTONEG_ADVERTISE_REG 0x10/* 100M Advertisement */ -#define IXGBE_MII_10GBASE_T_ADVERTISE 0x1000/* full duplex, bit:12*/ #define IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX 0x4000/* full duplex, bit:14*/ #define IXGBE_MII_1GBASE_T_ADVERTISE 0x8000/* full duplex, bit:15*/ #define IXGBE_MII_2_5GBASE_T_ADVERTISE 0x0400#define IXGBE_MII_5GBASE_T_ADVERTISE 0x0800 -#define IXGBE_MII_100BASE_T_ADVERTISE 0x0100/* full duplex, bit:8 */ -#define IXGBE_MII_100BASE_T_ADVERTISE_HALF 0x0080/* half duplex, bit:7 */ #define IXGBE_MII_RESTART 0x200 -#define IXGBE_MII_AUTONEG_COMPLETE 0x20#define IXGBE_MII_AUTONEG_LINK_UP 0x04#define IXGBE_MII_AUTONEG_REG 0x0
@@ -1320,30 +1314,20 @@ struct ixgbe_thermal_sensor_data {/* MDIO definitions */ #define IXGBE_MDIO_ZERO_DEV_TYPE 0x0 -#define IXGBE_MDIO_PMA_PMD_DEV_TYPE 0x1#define IXGBE_MDIO_PCS_DEV_TYPE 0x3 -#define IXGBE_MDIO_PHY_XS_DEV_TYPE 0x4 -#define IXGBE_MDIO_AUTO_NEG_DEV_TYPE 0x7 -#define IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE 0x1E/* Device 30 */ #define IXGBE_TWINAX_DEV 1#define IXGBE_MDIO_COMMAND_TIMEOUT 100/* PHY Timeout for 1 GB mode */ -#define IXGBE_MDIO_VENDOR_SPECIFIC_1_CONTROL 0x0/* VS1 Control Reg */ -#define IXGBE_MDIO_VENDOR_SPECIFIC_1_STATUS 0x1/* VS1 Status Reg */ #define IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS 0x0008/* 1 = Link Up */ #define IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS 0x0010/* 0 - 10G, 1 - 1G */ #define IXGBE_MDIO_VENDOR_SPECIFIC_1_10G_SPEED 0x0018#define IXGBE_MDIO_VENDOR_SPECIFIC_1_1G_SPEED 0x0010 -#define IXGBE_MDIO_AUTO_NEG_CONTROL 0x0/* AUTO_NEG Control Reg */ -#define IXGBE_MDIO_AUTO_NEG_STATUS 0x1/* AUTO_NEG Status Reg */ #define IXGBE_MDIO_AUTO_NEG_VENDOR_STAT 0xC800/* AUTO_NEG Vendor Status Reg */ #define IXGBE_MDIO_AUTO_NEG_VENDOR_TX_ALARM 0xCC00/* AUTO_NEG Vendor TX Reg */ #define IXGBE_MDIO_AUTO_NEG_VENDOR_TX_ALARM2 0xCC01/* AUTO_NEG Vendor Tx Reg */ #define IXGBE_MDIO_AUTO_NEG_VEN_LSC 0x1/* AUTO_NEG Vendor Tx LSC */ -#define IXGBE_MDIO_AUTO_NEG_ADVT 0x10/* AUTO_NEG Advt Reg */ -#define IXGBE_MDIO_AUTO_NEG_LP 0x13/* AUTO_NEG LP Status Reg */ #define IXGBE_MDIO_AUTO_NEG_EEE_ADVT 0x3C/* AUTO_NEG EEE Advt Reg */ #define IXGBE_MDIO_PHY_SET_LOW_POWER_MODE 0x0800/* Set low power mode */
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +31 -34
232 lines not on this page · raw message
PATCH 2/2 ixgbe: fix link status check for copper X550em
Read the PHY register twice in order to get the correct value for autoneg_status.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +13 -8
@@ -1556,7 +1556,7 @@ static s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw, bool link_up_wait_to_complete) {u32 status; -u16 autoneg_status; +u16 i, autoneg_status;if (hw->mac.ops.get_media_type (hw) != ixgbe_media_type_copper)return IXGBE_ERR_CONFIG ;
@@ -1568,13 +1568,18 @@ static s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw,if (status || !(*link_up))return status; -/* MAC link is up, so check external PHY link. -* Read this twice back to back to indicate current status. -*/ - status = hw->phy.ops.read_reg (hw,MDIO_STAT1 ,MDIO_MMD_AN , - &autoneg_status); -if (status) -return status; +/* MAC link is up, so check external PHY link. +* Link status is latching low, and can only be used to detect link +* drop, and not the current status of the link without performing +* back-to-back reads. +*/ +for (i =0 ; i <2 ; i++) { + status = hw->phy.ops.read_reg (hw,MDIO_STAT1 ,MDIO_MMD_AN , + &autoneg_status); + +if (status) +return status; + }/* If external PHY link is not up, then indicate link not up */ if (!(autoneg_status &IXGBE_MDIO_AUTO_NEG_LINK_STATUS ))
Singh
PATCH 2/2 ixgbe: fix link status check for copper X550em
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Monday, September 26, 2016 2:08 PM
To: [email protected]
Subject: [Intel-wired-lan] [PATCH 2/2] ixgbe: fix link status check for copper X550em
Read the PHY register twice in order to get the correct value for autoneg_status.
---
Singh
PATCH 1/2 ixgbe: do not use ixgbe specific mdio defines
In reply to Emil Tantilov-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Monday, September 26, 2016 2:08 PM
To: [email protected]
Subject: [Intel-wired-lan] [PATCH 1/2] ixgbe: do not use ixgbe specific mdio defines
Replace some ixgbe specific MDIO defines with their equivalent from the kernel.
---