From: Bill Hayes <bill.hayes@hp.com>
Port alternate MAC address support from the sourceforge

e1000 driver to the upstream e1000e driver.
Signed-off-by: Bill Hayes <bill.hayes@hp.com>

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---
 drivers/net/e1000e/82571.c   |    4 ++++

 drivers/net/e1000e/defines.h |    1 +

 drivers/net/e1000e/hw.h      |    1 +

 drivers/net/e1000e/lib.c     |   39 +++++++++++++++++++++++++++++++++++++--

 4 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c

index 14141a5..b6401ab 100644

--- a/drivers/net/e1000e/82571.c

+++ b/drivers/net/e1000e/82571.c

@@ -752,6 +752,10 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)

 	ew32(IMC, 0xffffffff);

 	icr = er32(ICR);
+	if (hw->mac.type == e1000_82571 &&

+		hw->dev_spec.e82571.alt_mac_addr_is_present)

+			e1000e_set_laa_state_82571(hw, true);

+

 	return 0;

 }
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h

index b32ed45..f2175ea 100644

--- a/drivers/net/e1000e/defines.h

+++ b/drivers/net/e1000e/defines.h

@@ -557,6 +557,7 @@

 #define NVM_INIT_3GIO_3            0x001A

 #define NVM_INIT_CONTROL3_PORT_A   0x0024

 #define NVM_CFG                    0x0012

+#define NVM_ALT_MAC_ADDR_PTR       0x0037

 #define NVM_CHECKSUM_REG           0x003F
 #define E1000_NVM_CFG_DONE_PORT_0  0x40000 /* MNG config cycle done */

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h

index 6451578..1bb2052 100644

--- a/drivers/net/e1000e/hw.h

+++ b/drivers/net/e1000e/hw.h

@@ -816,6 +816,7 @@ struct e1000_bus_info {
 struct e1000_dev_spec_82571 {

 	bool laa_is_present;

+	bool alt_mac_addr_is_present;

 };
 struct e1000_shadow_ram {

diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c

index 0bdeca3..16f35fa 100644

--- a/drivers/net/e1000e/lib.c

+++ b/drivers/net/e1000e/lib.c

@@ -2059,9 +2059,44 @@ s32 e1000e_read_mac_addr(struct e1000_hw *hw)

 {

 	s32 ...
[ message continues ]

While cleaning up the internal API focussing on Fiber and CX4 code

we found that I had broken the copper PHY initialization code. This

patch restores the PHY-specific code. This is mostly uninteresting

since no copper PHY boards are yet available. The changes have been

tested against Fiber only as I do not even have copper PHY versions

of 82598 macs.
This change actually cleans up the API code a bit more and we

lose some initialization code. A few PHY link detection helper

lines of code have been snuck into this patch, as well as a

read flush where it was suspected that this might cause issues.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---
 drivers/net/ixgbe/ixgbe.h        |    8 --

 drivers/net/ixgbe/ixgbe_82598.c  |  156 +++++++++++---------------------------

 drivers/net/ixgbe/ixgbe_common.c |   10 ++

 drivers/net/ixgbe/ixgbe_main.c   |   19 ++---

 drivers/net/ixgbe/ixgbe_phy.h    |    1

 drivers/net/ixgbe/ixgbe_type.h   |   13 ++-

 6 files changed, 71 insertions(+), 136 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h

index bc51432..a021a6e 100644

--- a/drivers/net/ixgbe/ixgbe.h

+++ b/drivers/net/ixgbe/ixgbe.h

@@ -234,14 +234,10 @@ enum ixbge_state_t {

 };
 enum ixgbe_boards {

-	board_82598AF,

-	board_82598EB,

-	board_82598AT,

+	board_82598,

 };
-extern struct ixgbe_info ixgbe_82598AF_info;

-extern struct ixgbe_info ixgbe_82598EB_info;

-extern struct ixgbe_info ixgbe_82598AT_info;

+extern struct ixgbe_info ixgbe_82598_info;
 extern char ixgbe_driver_name[];

 extern const char ixgbe_driver_version[];

diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c

index 4d64673..6321b05 100644

--- a/drivers/net/ixgbe/ixgbe_82598.c

+++ b/drivers/net/ixgbe/ixgbe_82598.c

@@ -50,8 +50,6 @@ static s32 ixgbe_setup_mac_link_speed_82598(struct ixgbe_hw *hw, u32 speed,

 					    bool autoneg,

 					    bool autoneg_wait_to_complete);

 static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw);

-...
[ message continues ]

e1000e will from now on support the PCI-Express adapters that

previously were supported by e1000. This support means better

performance and easier debugging from now on for both the old

PCI-X/PCI hardware and PCI-Express adapters.
This patch also moves 3 recently merged device IDs over to e1000e

that are identical to quad-port versions of already existing

dual port versions. With this last bit every former e1000 pci-e

device should work now with e1000e.
Here is a brief list of which gigabit driver to use with which

adapter:
  e1000:

	82540 -> 82547
  e1000e:

	82571 -> 82573

	ich8, ich9       (82562 or 82566)

	es2lan           (80003eslan)
  igb: (not yet merged, only available from e1000.sf.net)

	82575
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---
 drivers/net/e1000/e1000_main.c |   27 ---------------------------

 drivers/net/e1000e/82571.c     |    6 ++++++

 drivers/net/e1000e/hw.h        |    3 +++

 drivers/net/e1000e/netdev.c    |    9 +++------

 4 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c

index 72deff0..d1b88e4 100644

--- a/drivers/net/e1000/e1000_main.c

+++ b/drivers/net/e1000/e1000_main.c

@@ -73,14 +73,6 @@ static struct pci_device_id e1000_pci_tbl[] = {

 	INTEL_E1000_ETHERNET_DEVICE(0x1026),

 	INTEL_E1000_ETHERNET_DEVICE(0x1027),

 	INTEL_E1000_ETHERNET_DEVICE(0x1028),

-	INTEL_E1000_ETHERNET_DEVICE(0x1049),

-	INTEL_E1000_ETHERNET_DEVICE(0x104A),

-	INTEL_E1000_ETHERNET_DEVICE(0x104B),

-	INTEL_E1000_ETHERNET_DEVICE(0x104C),

-	INTEL_E1000_ETHERNET_DEVICE(0x104D),

-	INTEL_E1000_ETHERNET_DEVICE(0x105E),

-	INTEL_E1000_ETHERNET_DEVICE(0x105F),

-	INTEL_E1000_ETHERNET_DEVICE(0x1060),

 	INTEL_E1000_ETHERNET_DEVICE(0x1075),

 	INTEL_E1000_ETHERNET_DEVICE(0x1076),

 	INTEL_E1000_ETHERNET_DEVICE(0x1077),

@@ -89,28 +81,9 @@ static struct pci_device_id e1000_pci_tbl[] = {

 	INTEL_E1000_ETHERNET_DEVICE(0x107A),

 	INTEL_E1000_ETHERNET_DEVICE(0x107B),

 	INTEL_E1...
[ message continues ]

L1 ASPM link (pci-e link power savings) has significant benefits

(~1W savings when link is active) but unfortunately does not work

correctly on any of the chipsets that have 82573 on mobile platforms

which causes various nuisances:

 - eeprom reads return garbage information leading to bad eeprom

   checksums

 - long ping times (up to 2 seconds)

 - complete system hangs (freeze/lockup)
A lot of T60 owners have been plagued by this, but other mobile

solutions also suffer from these symptoms.
Disabling L1 ASPM before we activate the PCI-E link fixes all of

these issues at the cost of some power consumption.
Remove a workaround RDTR adjustment that is no longer needed with

this new one.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

---
 drivers/net/e1000e/82571.c  |    1 -

 drivers/net/e1000e/e1000.h  |    1 -

 drivers/net/e1000e/netdev.c |   30 ++++++++++++++++++++++++++++++

 drivers/net/e1000e/param.c  |    7 -------

 4 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c

index b6401ab..45f5ee2 100644

--- a/drivers/net/e1000e/82571.c

+++ b/drivers/net/e1000e/82571.c

@@ -1343,7 +1343,6 @@ struct e1000_info e1000_82573_info = {

 				  | FLAG_HAS_STATS_ICR_ICT

 				  | FLAG_HAS_SMART_POWER_DOWN

 				  | FLAG_HAS_AMT

-				  | FLAG_HAS_ASPM

 				  | FLAG_HAS_ERT

 				  | FLAG_HAS_SWSM_ON_LOAD,

 	.pba			= 20,

diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h

index 473f78d..8b88c22 100644

--- a/drivers/net/e1000e/e1000.h

+++ b/drivers/net/e1000e/e1000.h

@@ -288,7 +288,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_ASPM                     (1 << 8)

 #define FLAG_HAS_STATS_ICR_ICT            (1 << 9)

 #define FLAG_HAS_STATS_PTC_PRC            (1 << 10)

 #define FLAG_HAS_SMART_POWER_DOWN      ...
[ message continues ]