tg3: Recode PCI MRRS adjustment as a PCI quirk

This patch recodes the MRRS cap for 5719 A0 devices as a PCI quirk.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 19 insertions, 6 deletions

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index a8490a473a1c..bc236b6a7a91 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -14242,12 +14242,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 
                 tg3_flag_set(tp, PCI_EXPRESS);
 
-                if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0) {
-                        int readrq = pcie_get_readrq(tp->pdev);
-                        if (readrq > 2048)
-                                pcie_set_readrq(tp->pdev, 2048);
-                }
-
                 pci_read_config_word(tp->pdev,
                                      pci_pcie_cap(tp->pdev) + PCI_EXP_LNKCTL,
                                      &lnkctl);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 64765474676f..f722c5f6951a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2161,6 +2161,24 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
                         PCI_DEVICE_ID_NX2_5709S,
                         quirk_brcm_570x_limit_vpd);
 
+static void __devinit quirk_brcm_5719_limit_mrrs(struct pci_dev *dev)
+{
+        u32 rev;
+
+        pci_read_config_dword(dev, 0xf4, &rev);
+
+        /* Only CAP the MRRS if the device is a 5719 A0 */
+        if (rev == 0x05719000) {
+                int readrq = pcie_get_readrq(dev);
+                if (readrq > 2048)
+                        pcie_set_readrq(dev, 2048);
+        }
+}
+
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_BROADCOM,
+                         PCI_DEVICE_ID_TIGON3_5719,
+                         quirk_brcm_5719_limit_mrrs);
+
 /* Originally in EDAC sources for i82875P:
  * Intel tells BIOS developers to hide device 6 which
  * configures the overflow device access containing
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 31d77af2ef42..3329965ed63f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2105,6 +2105,7 @@
 #define PCI_DEVICE_ID_NX2_57711E        0x1650
 #define PCI_DEVICE_ID_TIGON3_5705       0x1653
 #define PCI_DEVICE_ID_TIGON3_5705_2     0x1654
+#define PCI_DEVICE_ID_TIGON3_5719       0x1657
 #define PCI_DEVICE_ID_TIGON3_5721       0x1659
 #define PCI_DEVICE_ID_TIGON3_5722       0x165a
 #define PCI_DEVICE_ID_TIGON3_5723       0x165b