Commit a02d26fe authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2020-07-27

This series contains updates to igc driver only.

Sasha cleans up double definitions, unneeded and non applicable
registers, and removes unused fields in structs. Ensures the Receive
Descriptor Minimum Threshold Count is cleared and fixes a static checker
error.

v2: Remove fields from hw_stats in patches that removed their uses.
Reworded patch descriptions for patches 1, 2, and 4.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 35406697 360d749e

drivers/net/ethernet/intel/igc/igc_hw.h

+0 −20
Original line number Diff line number Diff line
@@ -82,13 +82,7 @@ struct igc_mac_info { 


	enum igc_mac_type type;



	u32 collision_delta;

	u32 ledctl_default;

	u32 ledctl_mode1;

	u32 ledctl_mode2;

	u32 mc_filter_type;

	u32 tx_packet_delta;

	u32 txcw;



	u16 mta_reg_count;

	u16 uta_reg_count;
@@ -98,8 +92,6 @@ struct igc_mac_info { 


	u8 forced_speed_duplex;



	bool adaptive_ifs;

	bool has_fwsm;

	bool asf_firmware_present;

	bool arc_subsystem_valid;
@@ -276,21 +268,9 @@ struct igc_hw_stats { 
	u64 tsctc;

	u64 tsctfc;

	u64 iac;

	u64 icrxptc;

	u64 icrxatc;

	u64 ictxptc;

	u64 ictxatc;

	u64 ictxqec;

	u64 ictxqmtc;

	u64 icrxdmtc;

	u64 icrxoc;

	u64 cbtmpc;

	u64 htdpmc;

	u64 cbrdpc;

	u64 cbrmpc;

	u64 rpthc;

	u64 hgptc;

	u64 htcbdpc;

	u64 hgorc;

	u64 hgotc;

	u64 lenerrs;

drivers/net/ethernet/intel/igc/igc_mac.c

+2 −10
Original line number Diff line number Diff line
@@ -295,20 +295,12 @@ void igc_clear_hw_cntrs_base(struct igc_hw *hw) 
	rd32(IGC_MGTPTC);



	rd32(IGC_IAC);

	rd32(IGC_ICRXOC);



	rd32(IGC_ICRXPTC);

	rd32(IGC_ICRXATC);

	rd32(IGC_ICTXPTC);

	rd32(IGC_ICTXATC);

	rd32(IGC_ICTXQEC);

	rd32(IGC_ICTXQMTC);

	rd32(IGC_ICRXDMTC);



	rd32(IGC_RPTHC);

	rd32(IGC_TLPIC);

	rd32(IGC_RLPIC);

	rd32(IGC_HGPTC);

	rd32(IGC_RXDMTC);

	rd32(IGC_HGORCL);

	rd32(IGC_HGORCH);

	rd32(IGC_HGOTCL);
@@ -363,8 +355,8 @@ void igc_rar_set(struct igc_hw *hw, u8 *addr, u32 index) 
s32 igc_check_for_copper_link(struct igc_hw *hw)

{

	struct igc_mac_info *mac = &hw->mac;

	bool link = false;

	s32 ret_val;

	bool link;



	/* We only want to go out to the PHY registers to see if Auto-Neg

	 * has completed and/or if our link status has changed.  The

drivers/net/ethernet/intel/igc/igc_main.c

+0 −8
Original line number Diff line number Diff line
@@ -3730,14 +3730,6 @@ void igc_update_stats(struct igc_adapter *adapter) 
	adapter->stats.tsctc += rd32(IGC_TSCTC);



	adapter->stats.iac += rd32(IGC_IAC);

	adapter->stats.icrxoc += rd32(IGC_ICRXOC);

	adapter->stats.icrxptc += rd32(IGC_ICRXPTC);

	adapter->stats.icrxatc += rd32(IGC_ICRXATC);

	adapter->stats.ictxptc += rd32(IGC_ICTXPTC);

	adapter->stats.ictxatc += rd32(IGC_ICTXATC);

	adapter->stats.ictxqec += rd32(IGC_ICTXQEC);

	adapter->stats.ictxqmtc += rd32(IGC_ICTXQMTC);

	adapter->stats.icrxdmtc += rd32(IGC_ICRXDMTC);



	/* Fill out the OS statistics structure */

	net_stats->multicast = adapter->stats.mprc;

drivers/net/ethernet/intel/igc/igc_regs.h

+0 −14
Original line number Diff line number Diff line
@@ -58,16 +58,6 @@ 
#define IGC_IVAR_MISC		0x01740  /* IVAR for "other" causes - RW */

#define IGC_GPIE		0x01514  /* General Purpose Intr Enable - RW */



/* Interrupt Cause */

#define IGC_ICRXPTC		0x04104  /* Rx Packet Timer Expire Count */

#define IGC_ICRXATC		0x04108  /* Rx Absolute Timer Expire Count */

#define IGC_ICTXPTC		0x0410C  /* Tx Packet Timer Expire Count */

#define IGC_ICTXATC		0x04110  /* Tx Absolute Timer Expire Count */

#define IGC_ICTXQEC		0x04118  /* Tx Queue Empty Count */

#define IGC_ICTXQMTC		0x0411C  /* Tx Queue Min Threshold Count */

#define IGC_ICRXDMTC		0x04120  /* Rx Descriptor Min Threshold Count */

#define IGC_ICRXOC		0x04124  /* Receiver Overrun Count */



/* MSI-X Table Register Descriptions */

#define IGC_PBACL		0x05B68  /* MSIx PBA Clear - R/W 1 to clear */
@@ -182,10 +172,6 @@ 
#define IGC_BPTC	0x040F4  /* Broadcast Packets Tx Count - R/clr */

#define IGC_TSCTC	0x040F8  /* TCP Segmentation Context Tx - R/clr */

#define IGC_IAC		0x04100  /* Interrupt Assertion Count */

#define IGC_ICTXPTC	0x0410C  /* Interrupt Cause Tx Pkt Timer Expire Count */

#define IGC_ICTXATC	0x04110  /* Interrupt Cause Tx Abs Timer Expire Count */

#define IGC_ICTXQEC	0x04118  /* Interrupt Cause Tx Queue Empty Count */

#define IGC_ICTXQMTC	0x0411C  /* Interrupt Cause Tx Queue Min Thresh Count */

#define IGC_RPTHC	0x04104  /* Rx Packets To Host */

#define IGC_TLPIC	0x04148  /* EEE Tx LPI Count */

#define IGC_RLPIC	0x0414C  /* EEE Rx LPI Count */

CRA Git | Maintained and supported by SUSTech CRA and CCSE