Merge branch 'bnxt_en-update' (43e7a0e5) · Commits · 戴 / test

Michael Chan says: ==================== bnxt_en update. This patchset removes the PCIe histogram and other debug register data from ethtool -S. The removed data are not counters and they have very large and constantly fluctuating values that are not suitable for the ethtool -S decimal counter display. The rest of the patches implement counter rollover for all hardware counters that are not 64-bit counters. Different generations of hardware have different counter widths. The driver will now query the counter widths of all counters from firmware and implement rollover support on all non-64-bit counters. The last patch adds the PCIe histogram and other PCIe register data back using the ethtool -d interface. v2: Fix bnxt_re RDMA driver compile issue. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/infiniband/hw/bnxt_re/hw_counters.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,
		stats->value[BNXT_RE_RECOVERABLE_ERRORS] =
		le64_to_cpu(bnxt_re_stats->tx_bcast_pkts);
		stats->value[BNXT_RE_RX_DROPS] =
		le64_to_cpu(bnxt_re_stats->rx_drop_pkts);
		le64_to_cpu(bnxt_re_stats->rx_error_pkts);
		stats->value[BNXT_RE_RX_DISCARDS] =
		le64_to_cpu(bnxt_re_stats->rx_discard_pkts);
		stats->value[BNXT_RE_RX_PKTS] =

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+360 −134

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+78 −18

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -544,7 +544,7 @@ static int bnxt_dcbnl_ieee_setets(struct net_device dev, struct ieee_ets ets)
		static int bnxt_dcbnl_ieee_getpfc(struct net_device dev, struct ieee_pfc pfc)
		{
		struct bnxt *bp = netdev_priv(dev);
		__le64 stats = (__le64 )bp->hw_rx_port_stats;
		__le64 *stats = bp->port_stats.hw_stats;
		struct ieee_pfc *my_pfc = bp->ieee_pfc;
		long rx_off, tx_off;
		int i, rc;

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+76 −62

File changed.

Preview size limit exceeded, changes collapsed.

Admin message