ixgbe: Fix an accounting problem when the Rx FIFO is full

The rx_no_dma_resources counter reported by ethtool -S ethX is not
counting correctly.  In 82599, the queue mappings for the counters need
to be mapped properly, and accounted for properly.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Acked-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index d0b98708e6ce278dc3b0bf6fd396c8d6255e9b9c..86c8bad609b9b3f2b892409401da850f701308a0 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3629,6 +3629,12 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
        u64 total_mpc = 0;
        u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
 
+       if (hw->mac.type == ixgbe_mac_82599EB) {
+               for (i = 0; i < 16; i++)
+                       adapter->hw_rx_no_dma_resources +=
+                                            IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
+       }
+
        adapter->stats.crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
        for (i = 0; i < 8; i++) {
                /* for packet buffers not used, the register should read 0 */
@@ -3648,7 +3654,6 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
                        adapter->stats.pxoffrxc[i] += IXGBE_READ_REG(hw,
                                                           IXGBE_PXOFFRXCNT(i));
                        adapter->stats.qprdc[i] += IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
-                       adapter->hw_rx_no_dma_resources += adapter->stats.qprdc[i];
                } else {
                        adapter->stats.pxonrxc[i] += IXGBE_READ_REG(hw,
                                                              IXGBE_PXONRXC(i));