Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07818950 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: replace incorrect use of GG82563_REG macro 



The GG82563_REG() macro should not be used to determine the offset provided
to the e1000e_[read|write]_kmrn_reg() functions since the first argument to
the macro is already implied and gets masked off anyway in the functions.
The resultant register reads/writes with this patch are functionally the
same as before.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93a23f48

drivers/net/e1000e/hw.h

+2 −0
Original line number Diff line number Diff line
@@ -302,6 +302,8 @@ enum e1e_registers { 
#define E1000_KMRNCTRLSTA_OFFSET_SHIFT	16

#define E1000_KMRNCTRLSTA_REN		0x00200000

#define E1000_KMRNCTRLSTA_DIAG_OFFSET	0x3    /* Kumeran Diagnostic */

#define E1000_KMRNCTRLSTA_TIMEOUTS	0x4    /* Kumeran Timeouts */

#define E1000_KMRNCTRLSTA_INBAND_PARAM	0x9    /* Kumeran InBand Parameters */

#define E1000_KMRNCTRLSTA_DIAG_NELPBK	0x1000 /* Nearend Loopback mode */

#define E1000_KMRNCTRLSTA_K1_CONFIG	0x7

#define E1000_KMRNCTRLSTA_K1_ENABLE	0x140E

drivers/net/e1000e/ich8lan.c

+5 −3
Original line number Diff line number Diff line
@@ -2755,14 +2755,16 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw) 
	 * and increase the max iterations when polling the phy;

	 * this fixes erroneous timeouts at 10Mbps.

	 */

	ret_val = e1000e_write_kmrn_reg(hw, GG82563_REG(0x34, 4), 0xFFFF);

	ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_TIMEOUTS, 0xFFFF);

	if (ret_val)

		return ret_val;

	ret_val = e1000e_read_kmrn_reg(hw, GG82563_REG(0x34, 9), &reg_data);

	ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,

	                               &reg_data);

	if (ret_val)

		return ret_val;

	reg_data |= 0x3F;

	ret_val = e1000e_write_kmrn_reg(hw, GG82563_REG(0x34, 9), reg_data);

	ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,

	                                reg_data);

	if (ret_val)

		return ret_val;