Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (67 commits)
  cxgb4vf: recover from failure in cxgb4vf_open()
  netfilter: ebtables: make broute table work again
  netfilter: fix race in conntrack between dump_table and destroy
  ah: reload pointers to skb data after calling skb_cow_data()
  ah: update maximum truncated ICV length
  xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC
  ehea: Increase the skb array usage
  net/fec: remove config FEC2 as it's used nowhere
  pcnet_cs: add new_id
  tcp: disallow bind() to reuse addr/port
  net/r8169: Update the function of parsing firmware
  net: ppp: use {get,put}_unaligned_be{16,32}
  CAIF: Fix IPv6 support in receive path for GPRS/3G
  arp: allow to invalidate specific ARP entries
  net_sched: factorize qdisc stats handling
  mlx4: Call alloc_etherdev to allocate RX and TX queues
  net: Add alloc_netdev_mqs function
  caif: don't set connection request param size before copying data
  cxgb4vf: fix mailbox data/control coherency domain race
  qlcnic: change module parameter permissions
  ...

1 files changed, 21 insertions, 1 deletions

diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
index 99c672d894c..5b44a8b4850 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -24,6 +24,7 @@
 #include "bnx2x.h"
 #include "bnx2x_cmn.h"
 #include "bnx2x_dump.h"
+#include "bnx2x_init.h"
 
 /* Note: in the format strings below %s is replaced by the queue-name which is
  * either its index or 'fcoe' for the fcoe queue. Make sure the format string
@@ -472,7 +473,7 @@ static int bnx2x_get_regs_len(struct net_device *dev)
 {
         struct bnx2x *bp = netdev_priv(dev);
         int regdump_len = 0;
-        int i;
+        int i, j, k;
 
         if (CHIP_IS_E1(bp)) {
                 for (i = 0; i < REGS_COUNT; i++)
@@ -502,6 +503,15 @@ static int bnx2x_get_regs_len(struct net_device *dev)
                         if (IS_E2_ONLINE(wreg_addrs_e2[i].info))
                                 regdump_len += wreg_addrs_e2[i].size *
                                         (1 + wreg_addrs_e2[i].read_regs_count);
+
+                for (i = 0; i < PAGE_MODE_VALUES_E2; i++)
+                        for (j = 0; j < PAGE_WRITE_REGS_E2; j++) {
+                                for (k = 0; k < PAGE_READ_REGS_E2; k++)
+                                        if (IS_E2_ONLINE(page_read_regs_e2[k].
+                                                         info))
+                                                regdump_len +=
+                                                page_read_regs_e2[k].size;
+                        }
         }
         regdump_len *= 4;
         regdump_len += sizeof(struct dump_hdr);
@@ -539,6 +549,12 @@ static void bnx2x_get_regs(struct net_device *dev,
         if (!netif_running(bp->dev))
                 return;
 
+        /* Disable parity attentions as long as following dump may
+         * cause false alarms by reading never written registers. We
+         * will re-enable parity attentions right after the dump.
+         */
+        bnx2x_disable_blocks_parity(bp);
+
         dump_hdr.hdr_size = (sizeof(struct dump_hdr) / 4) - 1;
         dump_hdr.dump_sign = dump_sign_all;
         dump_hdr.xstorm_waitp = REG_RD(bp, XSTORM_WAITP_ADDR);
@@ -580,6 +596,10 @@ static void bnx2x_get_regs(struct net_device *dev,
 
                 bnx2x_read_pages_regs_e2(bp, p);
         }
+        /* Re-enable parity attentions */
+        bnx2x_clear_blocks_parity(bp);
+        if (CHIP_PARITY_ENABLED(bp))
+                bnx2x_enable_blocks_parity(bp);
 }
 
 #define PHY_FW_VER_LEN                  20