From: Matt Carlson Date: Mon, 13 Feb 2012 15:20:11 +0000 (+0000) Subject: tg3: Fix NVRAM page writes on newer devices X-Git-Tag: v2.6.39-400.9.0~338^2~170 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5469fcdfec0dda262ad0d7558e9cb174213ad17b;p=users%2Fjedix%2Flinux-maple.git tg3: Fix NVRAM page writes on newer devices On newer devices, the hardware expects the NVRAM address register to be written only once per NVRAM page. To do otherwise causes NVRAM corruption. This patch fixes the problem. (cherry picked from commit 422782249927e887a4c032d1d7e1f59de281ecbb) Signed-off-by: Matt Carlson Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 5236c87a944a..f373d12972c8 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -3144,8 +3144,6 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len, phy_addr = tg3_nvram_phys_addr(tp, offset); - tw32(NVRAM_ADDR, phy_addr); - nvram_cmd = NVRAM_CMD_GO | NVRAM_CMD_DONE | NVRAM_CMD_WR; if (page_off == 0 || i == 0) @@ -3156,6 +3154,11 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len, if (i == (len - 4)) nvram_cmd |= NVRAM_CMD_LAST; + if ((nvram_cmd & NVRAM_CMD_FIRST) || + !tg3_flag(tp, FLASH) || + !tg3_flag(tp, 57765_PLUS)) + tw32(NVRAM_ADDR, phy_addr); + if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5752 && !tg3_flag(tp, 5755_PLUS) && (tp->nvram_jedecnum == JEDEC_ST) &&