Skip to contentSkip to conversation

tg3: Restore LAA sooner in shutdown sequence

PATCH Applied Matt Carlson 2 participants 2 messages Apr 20, 2009 – Apr 21, 2009

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Matt Carlson

author
#0 lore raw

PATCH 7/8 tg3: Restore LAA sooner in shutdown sequence

After a shutdown reset, the LAA needs to be restored before posting the post-reset signature in shared memory. If the LAA is not restored before then, the bootcode will assume the factory default MAC address and WOL will not work with the LAA.

Signed-off-by Matt Carlson <[email protected]>
Signed-off-by Michael Chan <[email protected]>
---
 drivers/net/tg3.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/tg3.c +2 -2
index 0501fb4..f2b7ff8 100644
@@ -2456,8 +2456,6 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
 		}
 	}
 
-	__tg3_set_mac_addr(tp, 0);
-
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
 		u32 val;
 

@@ -6357,6 +6355,8 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent)
 	tg3_abort_hw(tp, silent);
 	err = tg3_chip_reset(tp);
 
+	__tg3_set_mac_addr(tp, 0);
+
 	tg3_write_sig_legacy(tp, kind);
 	tg3_write_sig_post_reset(tp, kind);
Signature · 1 line
1.6.0.6
maintainer Applied
#1 lore raw

From: "Matt Carlson" <[email protected]>
Date: Mon, 20 Apr 2009 09:58:52 -0700

Quoted 7 lines

After a shutdown reset, the LAA needs to be restored before posting the post-reset signature in shared memory. If the LAA is not restored before then, the bootcode will assume the factory default MAC address and WOL will not work with the LAA.

Signed-off-by Matt Carlson <[email protected]>
Signed-off-by Michael Chan <[email protected]>

Applied.