aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNithin Sujir <nsujir@broadcom.com>2013-09-20 19:46:56 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-21 14:04:52 -0400
commit68273712a19e9107a498a371532b3b3eb6dbb14c (patch)
tree31eebb9618d9c206dc6fac79f7ee0730914582c2
parent3ab7107133289324b77c466bb40617c5fdd24f0c (diff)
tg3: Add support for new 577xx device ids
This patch adds support for 57764, 57765, 57787, 57782 and 57786 devices. Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c15
-rw-r--r--drivers/net/ethernet/broadcom/tg3.h3
2 files changed, 16 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index bcb92d497b44..c98f6b04b559 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -337,6 +337,11 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
337 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5762)}, 337 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5762)},
338 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5725)}, 338 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5725)},
339 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5727)}, 339 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5727)},
340 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57764)},
341 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57767)},
342 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57787)},
343 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57782)},
344 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57786)},
340 {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)}, 345 {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)},
341 {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)}, 346 {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)},
342 {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)}, 347 {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)},
@@ -15761,9 +15766,12 @@ static void tg3_detect_asic_rev(struct tg3 *tp, u32 misc_ctrl_reg)
15761 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 || 15766 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
15762 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719 || 15767 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719 ||
15763 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5720 || 15768 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5720 ||
15769 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57767 ||
15770 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57764 ||
15764 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5762 || 15771 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5762 ||
15765 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5725 || 15772 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5725 ||
15766 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727) 15773 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727 ||
15774 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57787)
15767 reg = TG3PCI_GEN2_PRODID_ASICREV; 15775 reg = TG3PCI_GEN2_PRODID_ASICREV;
15768 else if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_57781 || 15776 else if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_57781 ||
15769 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57785 || 15777 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57785 ||
@@ -17411,9 +17419,12 @@ static int tg3_init_one(struct pci_dev *pdev,
17411 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 || 17419 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
17412 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719 || 17420 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719 ||
17413 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5720 || 17421 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5720 ||
17422 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57767 ||
17423 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57764 ||
17414 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5762 || 17424 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5762 ||
17415 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5725 || 17425 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5725 ||
17416 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727) { 17426 tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727 ||
17427 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57787) {
17417 tg3_flag_set(tp, ENABLE_APE); 17428 tg3_flag_set(tp, ENABLE_APE);
17418 tp->aperegs = pci_ioremap_bar(pdev, BAR_2); 17429 tp->aperegs = pci_ioremap_bar(pdev, BAR_2);
17419 if (!tp->aperegs) { 17430 if (!tp->aperegs) {
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 70257808aa37..5c3835aa1e1b 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -68,6 +68,9 @@
68#define TG3PCI_DEVICE_TIGON3_5762 0x1687 68#define TG3PCI_DEVICE_TIGON3_5762 0x1687
69#define TG3PCI_DEVICE_TIGON3_5725 0x1643 69#define TG3PCI_DEVICE_TIGON3_5725 0x1643
70#define TG3PCI_DEVICE_TIGON3_5727 0x16f3 70#define TG3PCI_DEVICE_TIGON3_5727 0x16f3
71#define TG3PCI_DEVICE_TIGON3_57764 0x1642
72#define TG3PCI_DEVICE_TIGON3_57767 0x1683
73#define TG3PCI_DEVICE_TIGON3_57787 0x1641
71/* 0x04 --> 0x2c unused */ 74/* 0x04 --> 0x2c unused */
72#define TG3PCI_SUBVENDOR_ID_BROADCOM PCI_VENDOR_ID_BROADCOM 75#define TG3PCI_SUBVENDOR_ID_BROADCOM PCI_VENDOR_ID_BROADCOM
73#define TG3PCI_SUBDEVICE_ID_BROADCOM_95700A6 0x1644 76#define TG3PCI_SUBDEVICE_ID_BROADCOM_95700A6 0x1644