aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Nat Gurumoorthy <natg@google.com> 2013-12-09 10:43:21 -0800
committerGravatar David S. Miller <davem@davemloft.net> 2013-12-10 22:23:35 -0500
commit388d3335575f4c056dcf7138a30f1454e2145cd8 (patch)
treeca04632a5c4d2bdf14a21af5b1f76a6a5cb0bb7b
parentnet: Revert macvtap/tun truncation signalling changes. (diff)
downloadlinux-388d3335575f4c056dcf7138a30f1454e2145cd8.tar.gz
linux-388d3335575f4c056dcf7138a30f1454e2145cd8.tar.bz2
linux-388d3335575f4c056dcf7138a30f1454e2145cd8.zip
tg3: Initialize REG_BASE_ADDR at PCI config offset 120 to 0
The new tg3 driver leaves REG_BASE_ADDR (PCI config offset 120) uninitialized. From power on reset this register may have garbage in it. The Register Base Address register defines the device local address of a register. The data pointed to by this location is read or written using the Register Data register (PCI config offset 128). When REG_BASE_ADDR has garbage any read or write of Register Data Register (PCI 128) will cause the PCI bus to lock up. The TCO watchdog will fire and bring down the system. Signed-off-by: Nat Gurumoorthy <natg@google.com> Acked-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 472305cdff4f..f3dd93b4aeaa 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -16503,6 +16503,9 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
/* Clear this out for sanity. */
tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
+ /* Clear TG3PCI_REG_BASE_ADDR to prevent hangs. */
+ tw32(TG3PCI_REG_BASE_ADDR, 0);
+
pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE,
&pci_state_reg);
if ((pci_state_reg & PCISTATE_CONV_PCI_MODE) == 0 &&