|
@@ -1400,16 +1400,20 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
|
|
|
if (((hw->mac.type == e1000_pch2lan) ||
|
|
|
(hw->mac.type == e1000_pch_lpt) ||
|
|
|
(hw->mac.type == e1000_pch_spt)) && link) {
|
|
|
- u32 reg;
|
|
|
+ u16 speed, duplex;
|
|
|
|
|
|
- reg = er32(STATUS);
|
|
|
+ e1000e_get_speed_and_duplex_copper(hw, &speed, &duplex);
|
|
|
tipg_reg = er32(TIPG);
|
|
|
tipg_reg &= ~E1000_TIPG_IPGT_MASK;
|
|
|
|
|
|
- if (!(reg & (E1000_STATUS_FD | E1000_STATUS_SPEED_MASK))) {
|
|
|
+ if (duplex == HALF_DUPLEX && speed == SPEED_10) {
|
|
|
tipg_reg |= 0xFF;
|
|
|
/* Reduce Rx latency in analog PHY */
|
|
|
emi_val = 0;
|
|
|
+ } else if (hw->mac.type == e1000_pch_spt &&
|
|
|
+ duplex == FULL_DUPLEX && speed != SPEED_1000) {
|
|
|
+ tipg_reg |= 0xC;
|
|
|
+ emi_val = 1;
|
|
|
} else {
|
|
|
|
|
|
/* Roll back the default values */
|