[kernel/f20] Add support for BCM57786 devices to tg3 (rhbz 1044471)

Mon Jan 6 19:30:52 UTC 2014

commit 9a3ad8d77e877c6eb8eda1e25d1dc98b1cde5b7b
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Mon Jan 6 14:30:31 2014 -0500

    Add support for BCM57786 devices to tg3 (rhbz 1044471)

 kernel.spec                                    |    7 ++
 tg3-Add-support-for-new-577xx-device-ids.patch |   80 ++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 0 deletions(-)
---

diff --git a/kernel.spec b/kernel.spec
index 45ce608..9517e46 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -760,6 +760,9 @@ Patch25179: KVM-MMU-handle-invalid-root_hpa-at-__direct_map.patch
 #rhbz 1047892
 Patch25180: KVM-VMX-fix-use-after-free-of-vmx-loaded_vmcs.patch
 
+#rhbz 1044471
+Patch25181: tg3-Add-support-for-new-577xx-device-ids.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1475,6 +1478,9 @@ ApplyPatch KVM-MMU-handle-invalid-root_hpa-at-__direct_map.patch
 #rhbz 1047892
 ApplyPatch KVM-VMX-fix-use-after-free-of-vmx-loaded_vmcs.patch
 
+#rhbz 1044471
+ApplyPatch tg3-Add-support-for-new-577xx-device-ids.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2278,6 +2284,7 @@ fi
 #                 ||     ||
 %changelog
 * Mon Jan 06 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Add support for BCM57786 devices to tg3 (rhbz 1044471)
 - Fix use after free crash in KVM (rhbz 1047892)
 - Fix oops in KVM with invalid root_hpa (rhbz 924916)
 - CVE-2013-4579: ath9k_htc improper MAC update (rhbz 1032753 1033072)
diff --git a/tg3-Add-support-for-new-577xx-device-ids.patch b/tg3-Add-support-for-new-577xx-device-ids.patch
new file mode 100644
index 0000000..585acbd
--- /dev/null
+++ b/tg3-Add-support-for-new-577xx-device-ids.patch
@@ -0,0 +1,80 @@
+Bugzilla: 1044471
+Upstream-status: 3.13
+
+From 68273712a19e9107a498a371532b3b3eb6dbb14c Mon Sep 17 00:00:00 2001
+From: Nithin Sujir <nsujir at broadcom.com>
+Date: Fri, 20 Sep 2013 16:46:56 -0700
+Subject: [PATCH] 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 at broadcom.com>
+Signed-off-by: Michael Chan <mchan at broadcom.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/ethernet/broadcom/tg3.c | 15 +++++++++++++--
+ drivers/net/ethernet/broadcom/tg3.h |  3 +++
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
+index bcb92d4..c98f6b0 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) = {
+ 	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5762)},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5725)},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5727)},
++	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57764)},
++	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57767)},
++	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57787)},
++	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57782)},
++	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57786)},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)},
+ 	{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)
+ 		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
+ 		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719 ||
+ 		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5720 ||
++		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57767 ||
++		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57764 ||
+ 		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5762 ||
+ 		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5725 ||
+-		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727)
++		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727 ||
++		    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57787)
+ 			reg = TG3PCI_GEN2_PRODID_ASICREV;
+ 		else if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_57781 ||
+ 			 tp->pdev->device == TG3PCI_DEVICE_TIGON3_57785 ||
+@@ -17411,9 +17419,12 @@ static int tg3_init_one(struct pci_dev *pdev,
+ 	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
+ 	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719 ||
+ 	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5720 ||
++	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57767 ||
++	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57764 ||
+ 	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5762 ||
+ 	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5725 ||
+-	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727) {
++	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727 ||
++	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57787) {
+ 		tg3_flag_set(tp, ENABLE_APE);
+ 		tp->aperegs = pci_ioremap_bar(pdev, BAR_2);
+ 		if (!tp->aperegs) {
+diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
+index 7025780..5c3835a 100644
+--- a/drivers/net/ethernet/broadcom/tg3.h
++++ b/drivers/net/ethernet/broadcom/tg3.h
+@@ -68,6 +68,9 @@
+ #define  TG3PCI_DEVICE_TIGON3_5762	 0x1687
+ #define  TG3PCI_DEVICE_TIGON3_5725	 0x1643
+ #define  TG3PCI_DEVICE_TIGON3_5727	 0x16f3
++#define  TG3PCI_DEVICE_TIGON3_57764	 0x1642
++#define  TG3PCI_DEVICE_TIGON3_57767	 0x1683
++#define  TG3PCI_DEVICE_TIGON3_57787	 0x1641
+ /* 0x04 --> 0x2c unused */
+ #define TG3PCI_SUBVENDOR_ID_BROADCOM		PCI_VENDOR_ID_BROADCOM
+ #define TG3PCI_SUBDEVICE_ID_BROADCOM_95700A6	0x1644
+-- 
+1.8.4.2
+
