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

Commit 3f007891 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Preserve LAA when device control is released 



This patch moves the __tg3_set_mac_addr() function earlier in the file
listing, to avoid a function prototype, and calls the function to
restore the LAA after a driver unload chip reset.  With this code in
place, the administrator can wake the machine using the LAA.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2aee154

drivers/net/tg3.c

+39 −37
Original line number Diff line number Diff line
@@ -2014,6 +2014,43 @@ static void tg3_power_down_phy(struct tg3 *tp) 
	tg3_writephy(tp, MII_BMCR, BMCR_PDOWN);

}



/* tp->lock is held. */

static void __tg3_set_mac_addr(struct tg3 *tp, int skip_mac_1)

{

	u32 addr_high, addr_low;

	int i;



	addr_high = ((tp->dev->dev_addr[0] << 8) |

		     tp->dev->dev_addr[1]);

	addr_low = ((tp->dev->dev_addr[2] << 24) |

		    (tp->dev->dev_addr[3] << 16) |

		    (tp->dev->dev_addr[4] <<  8) |

		    (tp->dev->dev_addr[5] <<  0));

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

		if (i == 1 && skip_mac_1)

			continue;

		tw32(MAC_ADDR_0_HIGH + (i * 8), addr_high);

		tw32(MAC_ADDR_0_LOW + (i * 8), addr_low);

	}



	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {

		for (i = 0; i < 12; i++) {

			tw32(MAC_EXTADDR_0_HIGH + (i * 8), addr_high);

			tw32(MAC_EXTADDR_0_LOW + (i * 8), addr_low);

		}

	}



	addr_high = (tp->dev->dev_addr[0] +

		     tp->dev->dev_addr[1] +

		     tp->dev->dev_addr[2] +

		     tp->dev->dev_addr[3] +

		     tp->dev->dev_addr[4] +

		     tp->dev->dev_addr[5]) &

		TX_BACKOFF_SEED_MASK;

	tw32(MAC_TX_BACKOFF_SEED, addr_high);

}



static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)

{

	u32 misc_host_ctrl;
@@ -2101,6 +2138,8 @@ 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;
@@ -6901,43 +6940,6 @@ static int tg3_load_tso_firmware(struct tg3 *tp) 
}





/* tp->lock is held. */

static void __tg3_set_mac_addr(struct tg3 *tp, int skip_mac_1)

{

	u32 addr_high, addr_low;

	int i;



	addr_high = ((tp->dev->dev_addr[0] << 8) |

		     tp->dev->dev_addr[1]);

	addr_low = ((tp->dev->dev_addr[2] << 24) |

		    (tp->dev->dev_addr[3] << 16) |

		    (tp->dev->dev_addr[4] <<  8) |

		    (tp->dev->dev_addr[5] <<  0));

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

		if (i == 1 && skip_mac_1)

			continue;

		tw32(MAC_ADDR_0_HIGH + (i * 8), addr_high);

		tw32(MAC_ADDR_0_LOW + (i * 8), addr_low);

	}



	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {

		for (i = 0; i < 12; i++) {

			tw32(MAC_EXTADDR_0_HIGH + (i * 8), addr_high);

			tw32(MAC_EXTADDR_0_LOW + (i * 8), addr_low);

		}

	}



	addr_high = (tp->dev->dev_addr[0] +

		     tp->dev->dev_addr[1] +

		     tp->dev->dev_addr[2] +

		     tp->dev->dev_addr[3] +

		     tp->dev->dev_addr[4] +

		     tp->dev->dev_addr[5]) &

		TX_BACKOFF_SEED_MASK;

	tw32(MAC_TX_BACKOFF_SEED, addr_high);

}



static int tg3_set_mac_addr(struct net_device *dev, void *p)

{

	struct tg3 *tp = netdev_priv(dev);