diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-02-17 07:02:46 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-02-17 07:02:46 +0000 |
| commit | b2bfcbef522c26445610375ce13c90a17365507c (patch) | |
| tree | ad6b1d20fe5112a798f02b5d60861fae231aa816 /sys/dev/pci/if_em_hw.c | |
| parent | 14f35f47326c35e03568ba96b30bb08b08edd430 (diff) | |
Add initial support for i354 MAC and M88E1543 PHY.
Currently treated the same as i350, i354 specific EEE settings
and 2.5Gb backplane connections not properly handled yet.
Tested by Andrew Lester on a Supermicro A1SRi-2758F.
Diffstat (limited to 'sys/dev/pci/if_em_hw.c')
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 7d04815aca4..7af8837f52f 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.75 2013/11/27 01:13:10 jsg Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.76 2014/02/17 07:02:45 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -225,6 +225,7 @@ em_set_phy_type(struct em_hw *hw) case M88E1000_I_PHY_ID: case M88E1011_I_PHY_ID: case M88E1111_I_PHY_ID: + case M88E1543_E_PHY_ID: hw->phy_type = em_phy_m88; break; case IGP01E1000_I_PHY_ID: @@ -523,6 +524,9 @@ em_set_mac_type(struct em_hw *hw) case E1000_DEV_ID_I350_SERDES: case E1000_DEV_ID_I350_SGMII: case E1000_DEV_ID_I350_DA4: + case E1000_DEV_ID_I354_BACKPLANE_1GBPS: + case E1000_DEV_ID_I354_SGMII: + case E1000_DEV_ID_I354_BACKPLANE_2_5GBPS: hw->mac_type = em_i350; hw->initialize_hw_bits_disable = 1; hw->eee_enable = 1; @@ -5178,7 +5182,9 @@ em_match_gig_phy(struct em_hw *hw) break; case em_82580: case em_i350: - if (hw->phy_id == I82580_I_PHY_ID || hw->phy_id == I350_I_PHY_ID) { + if (hw->phy_id == I82580_I_PHY_ID || + hw->phy_id == I350_I_PHY_ID || + hw->phy_id == M88E1543_E_PHY_ID) { uint32_t mdic; mdic = EM_READ_REG(hw, E1000_MDICNFG); |