diff options
| author |   PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com> | 2009-04-09 22:28:15 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-04-11 02:48:01 -0700 |
| commit | 553b449784e27bb7244c41aa27397d29f213e5a3 (patch) | |
| tree | 041c34e3d1524ffd530c3a196e7846370a8b5d5a /drivers/net/ixgbe/ixgbe_phy.h | |
| parent | ixgbe: Move PHY ops initialization to centralize bus accesses (diff) | |
| download | linux-dev-553b449784e27bb7244c41aa27397d29f213e5a3.tar.xz linux-dev-553b449784e27bb7244c41aa27397d29f213e5a3.zip | |
ixgbe: Remove unnecessary PHY reset, properly identify multispeed fiber modules
This patch does two things:
1) On 82599, the PHY is emedded in the MAC. On 82598, the SFP+ NIC has an external PHY. The reset in the SFP+ setup patch for 82598 is unnecessary on 82599, and adds extra dead time to device initialization. This removes that PHY reset for 82599 only.
2) On 82599, the SFP+ modules are multispeed fiber modules (10G/1G). We need to make sure to identify them properly for the remaining init sections to properly set them up.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_phy.h')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_phy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/ixgbe_phy.h index cc5f1b3287e1..c9964b7ce1b9 100644 --- a/drivers/net/ixgbe/ixgbe_phy.h +++ b/drivers/net/ixgbe/ixgbe_phy.h @@ -44,6 +44,7 @@ /* Bitmasks */ #define IXGBE_SFF_TWIN_AX_CAPABLE 0x80 #define IXGBE_SFF_1GBASESX_CAPABLE 0x1 +#define IXGBE_SFF_1GBASELX_CAPABLE 0x2 #define IXGBE_SFF_10GBASESR_CAPABLE 0x10 #define IXGBE_SFF_10GBASELR_CAPABLE 0x20 #define IXGBE_I2C_EEPROM_READ_MASK 0x100 |