Commit 7c25769f authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Garzik
Browse files

e1000e: cleanup several stats issues 



Several stats registers are completely unused and we just waste pci
bus time reading them. We also omit using the high 32 bits of the GORC/
GOTC counters. We can just read clear them and only read the low registers.

Mii-tool can also break es2lan if it executes a MII PHY register
ioctl while the device is in autonegotiation. Unfortunately it seems
that several applications and installations still perform this ioctl
call periodically and especially in this crucial startup time. We
can fool the ioctl by providing fail safe information that mimics
the "down" link state and only perform the dangerous PHY reads once
after link comes up to fill in the real values. As long as link
stays up the information will not change.

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 avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c9fcbf47

drivers/net/e1000e/82571.c

+0 −6
Original line number Diff line number Diff line
@@ -1326,12 +1326,10 @@ struct e1000_info e1000_82571_info = { 
	.mac			= e1000_82571,

	.flags			= FLAG_HAS_HW_VLAN_FILTER

				  | FLAG_HAS_JUMBO_FRAMES

				  | FLAG_HAS_STATS_PTC_PRC

				  | FLAG_HAS_WOL

				  | FLAG_APME_IN_CTRL3

				  | FLAG_RX_CSUM_ENABLED

				  | FLAG_HAS_CTRLEXT_ON_LOAD

				  | FLAG_HAS_STATS_ICR_ICT

				  | FLAG_HAS_SMART_POWER_DOWN

				  | FLAG_RESET_OVERWRITES_LAA /* errata */

				  | FLAG_TARC_SPEED_MODE_BIT /* errata */
@@ -1347,12 +1345,10 @@ struct e1000_info e1000_82572_info = { 
	.mac			= e1000_82572,

	.flags			= FLAG_HAS_HW_VLAN_FILTER

				  | FLAG_HAS_JUMBO_FRAMES

				  | FLAG_HAS_STATS_PTC_PRC

				  | FLAG_HAS_WOL

				  | FLAG_APME_IN_CTRL3

				  | FLAG_RX_CSUM_ENABLED

				  | FLAG_HAS_CTRLEXT_ON_LOAD

				  | FLAG_HAS_STATS_ICR_ICT

				  | FLAG_TARC_SPEED_MODE_BIT, /* errata */

	.pba			= 38,

	.get_variants		= e1000_get_variants_82571,
@@ -1365,11 +1361,9 @@ struct e1000_info e1000_82573_info = { 
	.mac			= e1000_82573,

	.flags			= FLAG_HAS_HW_VLAN_FILTER

				  | FLAG_HAS_JUMBO_FRAMES

				  | FLAG_HAS_STATS_PTC_PRC

				  | FLAG_HAS_WOL

				  | FLAG_APME_IN_CTRL3

				  | FLAG_RX_CSUM_ENABLED

				  | FLAG_HAS_STATS_ICR_ICT

				  | FLAG_HAS_SMART_POWER_DOWN

				  | FLAG_HAS_AMT

				  | FLAG_HAS_ERT

drivers/net/e1000e/defines.h

+2 −0
Original line number Diff line number Diff line
@@ -527,8 +527,10 @@ 
#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */

#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */

#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */

#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */

#define PHY_1000T_CTRL   0x09 /* 1000Base-T Control Reg */

#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */

#define PHY_EXT_STATUS   0x0F /* Extended Status Reg */



/* NVM Control */

#define E1000_EECD_SK        0x00000001 /* NVM Clock */

drivers/net/e1000e/e1000.h

+19 −6
Original line number Diff line number Diff line
@@ -147,6 +147,18 @@ struct e1000_ring { 
	struct e1000_queue_stats stats;

};



/* PHY register snapshot values */

struct e1000_phy_regs {

	u16 bmcr;		/* basic mode control register    */

	u16 bmsr;		/* basic mode status register     */

	u16 advertise;		/* auto-negotiation advertisement */

	u16 lpa;		/* link partner ability register  */

	u16 expansion;		/* auto-negotiation expansion reg */

	u16 ctrl1000;		/* 1000BASE-T control register    */

	u16 stat1000;		/* 1000BASE-T status register     */

	u16 estatus;		/* extended status register       */

};



/* board specific private data structure */

struct e1000_adapter {

	struct timer_list watchdog_timer;
@@ -202,8 +214,8 @@ struct e1000_adapter { 
	/* Tx stats */

	u64 tpt_old;

	u64 colc_old;

	u64 gotcl_old;

	u32 gotcl;

	u32 gotc;

	u64 gotc_old;

	u32 tx_timeout_count;

	u32 tx_fifo_head;

	u32 tx_head_addr;
@@ -227,8 +239,8 @@ struct e1000_adapter { 
	u64 hw_csum_err;

	u64 hw_csum_good;

	u64 rx_hdr_split;

	u64 gorcl_old;

	u32 gorcl;

	u32 gorc;

	u64 gorc_old;

	u32 alloc_rx_buff_failed;

	u32 rx_dma_failed;
@@ -250,6 +262,9 @@ struct e1000_adapter { 
	struct e1000_phy_info phy_info;

	struct e1000_phy_stats phy_stats;



	/* Snapshot of PHY registers */

	struct e1000_phy_regs phy_regs;



	struct e1000_ring test_tx_ring;

	struct e1000_ring test_rx_ring;

	u32 test_icr;
@@ -286,8 +301,6 @@ struct e1000_info { 
#define FLAG_HAS_CTRLEXT_ON_LOAD          (1 << 5)

#define FLAG_HAS_SWSM_ON_LOAD             (1 << 6)

#define FLAG_HAS_JUMBO_FRAMES             (1 << 7)

#define FLAG_HAS_STATS_ICR_ICT            (1 << 9)

#define FLAG_HAS_STATS_PTC_PRC            (1 << 10)

#define FLAG_HAS_SMART_POWER_DOWN         (1 << 11)

#define FLAG_IS_QUAD_PORT_A               (1 << 12)

#define FLAG_IS_QUAD_PORT                 (1 << 13)

drivers/net/e1000e/es2lan.c

+0 −2
Original line number Diff line number Diff line
@@ -1231,12 +1231,10 @@ struct e1000_info e1000_es2_info = { 
	.mac			= e1000_80003es2lan,

	.flags			= FLAG_HAS_HW_VLAN_FILTER

				  | FLAG_HAS_JUMBO_FRAMES

				  | FLAG_HAS_STATS_PTC_PRC

				  | FLAG_HAS_WOL

				  | FLAG_APME_IN_CTRL3

				  | FLAG_RX_CSUM_ENABLED

				  | FLAG_HAS_CTRLEXT_ON_LOAD

				  | FLAG_HAS_STATS_ICR_ICT

				  | FLAG_RX_NEEDS_RESTART /* errata */

				  | FLAG_TARC_SET_BIT_ZERO /* errata */

				  | FLAG_APME_CHECK_PORT_B

drivers/net/e1000e/ethtool.c

+3 −3
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ struct e1000_stats { 
static const struct e1000_stats e1000_gstrings_stats[] = {

	{ "rx_packets", E1000_STAT(stats.gprc) },

	{ "tx_packets", E1000_STAT(stats.gptc) },

	{ "rx_bytes", E1000_STAT(stats.gorcl) },

	{ "tx_bytes", E1000_STAT(stats.gotcl) },

	{ "rx_bytes", E1000_STAT(stats.gorc) },

	{ "tx_bytes", E1000_STAT(stats.gotc) },

	{ "rx_broadcast", E1000_STAT(stats.bprc) },

	{ "tx_broadcast", E1000_STAT(stats.bptc) },

	{ "rx_multicast", E1000_STAT(stats.mprc) },
@@ -83,7 +83,7 @@ static const struct e1000_stats e1000_gstrings_stats[] = { 
	{ "rx_flow_control_xoff", E1000_STAT(stats.xoffrxc) },

	{ "tx_flow_control_xon", E1000_STAT(stats.xontxc) },

	{ "tx_flow_control_xoff", E1000_STAT(stats.xofftxc) },

	{ "rx_long_byte_count", E1000_STAT(stats.gorcl) },

	{ "rx_long_byte_count", E1000_STAT(stats.gorc) },

	{ "rx_csum_offload_good", E1000_STAT(hw_csum_good) },

	{ "rx_csum_offload_errors", E1000_STAT(hw_csum_err) },

	{ "rx_header_split", E1000_STAT(rx_hdr_split) },

CRA Git | Maintained and supported by SUSTech CRA and CCSE