|
@@ -1570,26 +1570,26 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
|
|
|
|
|
|
/* X540 needs to set the MACC.FLU bit to force link up */
|
|
|
if (adapter->hw.mac.type == ixgbe_mac_X540) {
|
|
|
- reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_MACC);
|
|
|
+ reg_data = IXGBE_READ_REG(hw, IXGBE_MACC);
|
|
|
reg_data |= IXGBE_MACC_FLU;
|
|
|
- IXGBE_WRITE_REG(&adapter->hw, IXGBE_MACC, reg_data);
|
|
|
+ IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data);
|
|
|
}
|
|
|
|
|
|
/* right now we only support MAC loopback in the driver */
|
|
|
- reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_HLREG0);
|
|
|
+ reg_data = IXGBE_READ_REG(hw, IXGBE_HLREG0);
|
|
|
/* Setup MAC loopback */
|
|
|
reg_data |= IXGBE_HLREG0_LPBK;
|
|
|
- IXGBE_WRITE_REG(&adapter->hw, IXGBE_HLREG0, reg_data);
|
|
|
+ IXGBE_WRITE_REG(hw, IXGBE_HLREG0, reg_data);
|
|
|
|
|
|
- reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_FCTRL);
|
|
|
+ reg_data = IXGBE_READ_REG(hw, IXGBE_FCTRL);
|
|
|
reg_data |= IXGBE_FCTRL_BAM | IXGBE_FCTRL_SBP | IXGBE_FCTRL_MPE;
|
|
|
- IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCTRL, reg_data);
|
|
|
+ IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg_data);
|
|
|
|
|
|
- reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_AUTOC);
|
|
|
+ reg_data = IXGBE_READ_REG(hw, IXGBE_AUTOC);
|
|
|
reg_data &= ~IXGBE_AUTOC_LMS_MASK;
|
|
|
reg_data |= IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU;
|
|
|
- IXGBE_WRITE_REG(&adapter->hw, IXGBE_AUTOC, reg_data);
|
|
|
- IXGBE_WRITE_FLUSH(&adapter->hw);
|
|
|
+ IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_data);
|
|
|
+ IXGBE_WRITE_FLUSH(hw);
|
|
|
usleep_range(10000, 20000);
|
|
|
|
|
|
/* Disable Atlas Tx lanes; re-enabled in reset path */
|