aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-09-16 19:59:20 -0400
committerDavid S. Miller <davem@davemloft.net>2005-09-16 19:59:20 -0400
commit1cbf07478bbf3e350a2025bc5ea23fedaa95855a (patch)
tree1da3df4563187bae7eec7834d1fada04f8a9271b
parent67e6b629212fa9ffb7420e8a88a41806af637e28 (diff)
[TG3]: Add AMD K8 to list of write-reorder chipsets.
Thanks to Andy Stewart for the report and testing debug patches from Michael Chan. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tg3.c8
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 7599f52e15b3..52eae9f096e2 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -67,8 +67,8 @@
67 67
68#define DRV_MODULE_NAME "tg3" 68#define DRV_MODULE_NAME "tg3"
69#define PFX DRV_MODULE_NAME ": " 69#define PFX DRV_MODULE_NAME ": "
70#define DRV_MODULE_VERSION "3.39" 70#define DRV_MODULE_VERSION "3.40"
71#define DRV_MODULE_RELDATE "September 5, 2005" 71#define DRV_MODULE_RELDATE "September 15, 2005"
72 72
73#define TG3_DEF_MAC_MODE 0 73#define TG3_DEF_MAC_MODE 0
74#define TG3_DEF_RX_MODE 0 74#define TG3_DEF_RX_MODE 0
@@ -9271,6 +9271,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
9271 static struct pci_device_id write_reorder_chipsets[] = { 9271 static struct pci_device_id write_reorder_chipsets[] = {
9272 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 9272 { PCI_DEVICE(PCI_VENDOR_ID_AMD,
9273 PCI_DEVICE_ID_AMD_FE_GATE_700C) }, 9273 PCI_DEVICE_ID_AMD_FE_GATE_700C) },
9274 { PCI_DEVICE(PCI_VENDOR_ID_AMD,
9275 PCI_DEVICE_ID_AMD_K8_NB) },
9274 { }, 9276 { },
9275 }; 9277 };
9276 u32 misc_ctrl_reg; 9278 u32 misc_ctrl_reg;
@@ -9285,7 +9287,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
9285 tp->tg3_flags2 |= TG3_FLG2_SUN_570X; 9287 tp->tg3_flags2 |= TG3_FLG2_SUN_570X;
9286#endif 9288#endif
9287 9289
9288 /* If we have an AMD 762 chipset, write 9290 /* If we have an AMD 762 or K8 chipset, write
9289 * reordering to the mailbox registers done by the host 9291 * reordering to the mailbox registers done by the host
9290 * controller can cause major troubles. We read back from 9292 * controller can cause major troubles. We read back from
9291 * every mailbox register write to force the writes to be 9293 * every mailbox register write to force the writes to be
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 72fe3385743c..3dc161894c7b 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -491,6 +491,7 @@
491#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060 491#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060
492 492
493#define PCI_VENDOR_ID_AMD 0x1022 493#define PCI_VENDOR_ID_AMD 0x1022
494#define PCI_DEVICE_ID_AMD_K8_NB 0x1100
494#define PCI_DEVICE_ID_AMD_LANCE 0x2000 495#define PCI_DEVICE_ID_AMD_LANCE 0x2000
495#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 496#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
496#define PCI_DEVICE_ID_AMD_SCSI 0x2020 497#define PCI_DEVICE_ID_AMD_SCSI 0x2020