1 files changed, 10 insertions, 27 deletions

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index ae9bb7b7fd67..556962f9612d 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -72,7 +72,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
 
-#define MYRI10GE_VERSION_STR "1.3.1-1.248"
+#define MYRI10GE_VERSION_STR "1.3.2-1.269"
 
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -2514,26 +2514,20 @@ static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
 {
         struct pci_dev *pdev = mgp->pdev;
         struct device *dev = &pdev->dev;
-        int cap, status;
-        u16 val;
+        int status;
 
         mgp->tx.boundary = 4096;
         /*
          * Verify the max read request size was set to 4KB
          * before trying the test with 4KB.
          */
-        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-        if (cap < 64) {
-                dev_err(dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
-                goto abort;
-        }
-        status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
-        if (status != 0) {
+        status = pcie_get_readrq(pdev);
+        if (status < 0) {
                 dev_err(dev, "Couldn't read max read req size: %d\n", status);
                 goto abort;
         }
-        if ((val & (5 << 12)) != (5 << 12)) {
-                dev_warn(dev, "Max Read Request size != 4096 (0x%x)\n", val);
+        if (status != 4096) {
+                dev_warn(dev, "Max Read Request size != 4096 (%d)\n", status);
                 mgp->tx.boundary = 2048;
         }
         /*
@@ -2850,9 +2844,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         size_t bytes;
         int i;
         int status = -ENXIO;
-        int cap;
         int dac_enabled;
-        u16 val;
 
         netdev = alloc_etherdev(sizeof(*mgp));
         if (netdev == NULL) {
@@ -2884,19 +2876,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
             = pci_find_capability(pdev, PCI_CAP_ID_VNDR);
 
         /* Set our max read request to 4KB */
-        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-        if (cap < 64) {
-                dev_err(&pdev->dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
-                goto abort_with_netdev;
-        }
-        status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
-        if (status != 0) {
-                dev_err(&pdev->dev, "Error %d reading PCI_EXP_DEVCTL\n",
-                        status);
-                goto abort_with_netdev;
-        }
-        val = (val & ~PCI_EXP_DEVCTL_READRQ) | (5 << 12);
-        status = pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, val);
+        status = pcie_set_readrq(pdev, 4096);
         if (status != 0) {
                 dev_err(&pdev->dev, "Error %d writing PCI_EXP_DEVCTL\n",
                         status);
@@ -3114,9 +3094,12 @@ static void myri10ge_remove(struct pci_dev *pdev)
 }
 
 #define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E      0x0008
+#define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9    0x0009
 
 static struct pci_device_id myri10ge_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E)},
+        {PCI_DEVICE
+         (PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9)},
         {0},
 };