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

Commit 83ab50a5 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: cleanup "todo" code found in igb_ethtool.c 



This patch moves some defines into the e1000_regs.h file since this is the
correct place for register defines and not inside of igb_ethtool.c

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4eefa8f0

drivers/net/igb/e1000_regs.h

+7 −0
Original line number Diff line number Diff line
@@ -288,10 +288,17 @@ enum { 
#define E1000_MTA      0x05200  /* Multicast Table Array - RW Array */

#define E1000_RA       0x05400  /* Receive Address - RW Array */

#define E1000_RA2      0x054E0  /* 2nd half of receive address array - RW Array */

#define E1000_PSRTYPE(_i)       (0x05480 + ((_i) * 4))

#define E1000_RAL(_i)  (((_i) <= 15) ? (0x05400 + ((_i) * 8)) : \

                                       (0x054E0 + ((_i - 16) * 8)))

#define E1000_RAH(_i)  (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \

                                       (0x054E4 + ((_i - 16) * 8)))

#define E1000_IP4AT_REG(_i)     (0x05840 + ((_i) * 8))

#define E1000_IP6AT_REG(_i)     (0x05880 + ((_i) * 4))

#define E1000_WUPM_REG(_i)      (0x05A00 + ((_i) * 4))

#define E1000_FFMT_REG(_i)      (0x09000 + ((_i) * 8))

#define E1000_FFVT_REG(_i)      (0x09800 + ((_i) * 8))

#define E1000_FFLT_REG(_i)      (0x05F00 + ((_i) * 8))

#define E1000_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */

#define E1000_VT_CTL   0x0581C  /* VMDq Control - RW */

#define E1000_WUC      0x05800  /* Wakeup Control - RW */

drivers/net/igb/igb_ethtool.c

+1 −10
Original line number Diff line number Diff line
@@ -502,19 +502,10 @@ static void igb_get_regs(struct net_device *netdev, 
	regs_buff[119] = adapter->stats.scvpc;

	regs_buff[120] = adapter->stats.hrmpc;



	/* These should probably be added to e1000_regs.h instead */

	#define E1000_PSRTYPE_REG(_i) (0x05480 + ((_i) * 4))

	#define E1000_IP4AT_REG(_i)   (0x05840 + ((_i) * 8))

	#define E1000_IP6AT_REG(_i)   (0x05880 + ((_i) * 4))

	#define E1000_WUPM_REG(_i)    (0x05A00 + ((_i) * 4))

	#define E1000_FFMT_REG(_i)    (0x09000 + ((_i) * 8))

	#define E1000_FFVT_REG(_i)    (0x09800 + ((_i) * 8))

	#define E1000_FFLT_REG(_i)    (0x05F00 + ((_i) * 8))



	for (i = 0; i < 4; i++)

		regs_buff[121 + i] = rd32(E1000_SRRCTL(i));

	for (i = 0; i < 4; i++)

		regs_buff[125 + i] = rd32(E1000_PSRTYPE_REG(i));

		regs_buff[125 + i] = rd32(E1000_PSRTYPE(i));

	for (i = 0; i < 4; i++)

		regs_buff[129 + i] = rd32(E1000_RDBAL(i));

	for (i = 0; i < 4; i++)