Commit 7c10691e authored by Justin Chen's avatar Justin Chen Committed by David S. Miller
Browse files

net: bcmasp: Add support for ethtool driver stats 



Add support for ethernet driver specific stats.

Signed-off-by: default avatarJustin Chen <justin.chen@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64931534

drivers/net/ethernet/broadcom/asp2/bcmasp.c

+3 −1
Original line number Diff line number Diff line
@@ -895,9 +895,11 @@ int bcmasp_set_en_mda_filter(struct bcmasp_intf *intf, unsigned char *addr, 


		/* Attempt to combine filters */

		ret = bcmasp_combine_set_filter(intf, addr, mask, i);

		if (!ret)

		if (!ret) {

			intf->mib.filters_combine_cnt++;

			return 0;

		}

	}



	/* Create new filter if possible */

	for (i = res_count; i < NUM_MDA_FILTERS; i++) {

drivers/net/ethernet/broadcom/asp2/bcmasp.h

+21 −0
Original line number Diff line number Diff line
@@ -244,6 +244,26 @@ struct bcmasp_intf_stats64 { 
	struct u64_stats_sync		syncp;

};



struct bcmasp_mib_counters {

	u32	edpkt_ts;

	u32	edpkt_rx_pkt_cnt;

	u32	edpkt_hdr_ext_cnt;

	u32	edpkt_hdr_out_cnt;

	u32	umac_frm_cnt;

	u32	fb_frm_cnt;

	u32	fb_rx_fifo_depth;

	u32	fb_out_frm_cnt;

	u32	fb_filt_out_frm_cnt;

	u32	alloc_rx_skb_failed;

	u32	tx_dma_failed;

	u32	mc_filters_full_cnt;

	u32	uc_filters_full_cnt;

	u32	filters_combine_cnt;

	u32	promisc_filters_cnt;

	u32	tx_realloc_offload_failed;

	u32	tx_timeout_cnt;

};



struct bcmasp_intf_ops {

	unsigned long (*rx_desc_read)(struct bcmasp_intf *intf);

	void (*rx_buffer_write)(struct bcmasp_intf *intf, dma_addr_t addr);
@@ -309,6 +329,7 @@ struct bcmasp_intf { 


	/* Statistics */

	struct bcmasp_intf_stats64	stats64;

	struct bcmasp_mib_counters	mib;



	u32				wolopts;

	u8				sopass[SOPASS_MAX];

drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c

+160 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define pr_fmt(fmt)				"bcmasp_ethtool: " fmt



#include <asm-generic/unaligned.h>

#include <linux/ethtool.h>

#include <linux/netdevice.h>

#include <linux/platform_device.h>
@@ -8,6 +9,162 @@ 
#include "bcmasp.h"

#include "bcmasp_intf_defs.h"



enum bcmasp_stat_type {

	BCMASP_STAT_RX_EDPKT,

	BCMASP_STAT_RX_CTRL,

	BCMASP_STAT_RX_CTRL_PER_INTF,

	BCMASP_STAT_SOFT,

};



struct bcmasp_stats {

	char stat_string[ETH_GSTRING_LEN];

	enum bcmasp_stat_type type;

	u32 reg_offset;

};



#define STAT_BCMASP_SOFT_MIB(str) { \

	.stat_string = str, \

	.type = BCMASP_STAT_SOFT, \

}



#define STAT_BCMASP_OFFSET(str, _type, offset) { \

	.stat_string = str, \

	.type = _type, \

	.reg_offset = offset, \

}



#define STAT_BCMASP_RX_EDPKT(str, offset) \

	STAT_BCMASP_OFFSET(str, BCMASP_STAT_RX_EDPKT, offset)

#define STAT_BCMASP_RX_CTRL(str, offset) \

	STAT_BCMASP_OFFSET(str, BCMASP_STAT_RX_CTRL, offset)

#define STAT_BCMASP_RX_CTRL_PER_INTF(str, offset) \

	STAT_BCMASP_OFFSET(str, BCMASP_STAT_RX_CTRL_PER_INTF, offset)



/* Must match the order of struct bcmasp_mib_counters */

static const struct bcmasp_stats bcmasp_gstrings_stats[] = {

	/* EDPKT counters */

	STAT_BCMASP_RX_EDPKT("RX Time Stamp", ASP_EDPKT_RX_TS_COUNTER),

	STAT_BCMASP_RX_EDPKT("RX PKT Count", ASP_EDPKT_RX_PKT_CNT),

	STAT_BCMASP_RX_EDPKT("RX PKT Buffered", ASP_EDPKT_HDR_EXTR_CNT),

	STAT_BCMASP_RX_EDPKT("RX PKT Pushed to DRAM", ASP_EDPKT_HDR_OUT_CNT),

	/* ASP RX control */

	STAT_BCMASP_RX_CTRL_PER_INTF("Frames From Unimac",

				     ASP_RX_CTRL_UMAC_0_FRAME_COUNT),

	STAT_BCMASP_RX_CTRL_PER_INTF("Frames From Port",

				     ASP_RX_CTRL_FB_0_FRAME_COUNT),

	STAT_BCMASP_RX_CTRL_PER_INTF("RX Buffer FIFO Depth",

				     ASP_RX_CTRL_FB_RX_FIFO_DEPTH),

	STAT_BCMASP_RX_CTRL("Frames Out(Buffer)",

			    ASP_RX_CTRL_FB_OUT_FRAME_COUNT),

	STAT_BCMASP_RX_CTRL("Frames Out(Filters)",

			    ASP_RX_CTRL_FB_FILT_OUT_FRAME_COUNT),

	/* Software maintained statistics */

	STAT_BCMASP_SOFT_MIB("RX SKB Alloc Failed"),

	STAT_BCMASP_SOFT_MIB("TX DMA Failed"),

	STAT_BCMASP_SOFT_MIB("Multicast Filters Full"),

	STAT_BCMASP_SOFT_MIB("Unicast Filters Full"),

	STAT_BCMASP_SOFT_MIB("MDA Filters Combined"),

	STAT_BCMASP_SOFT_MIB("Promisc Filter Set"),

	STAT_BCMASP_SOFT_MIB("TX Realloc For Offload Failed"),

	STAT_BCMASP_SOFT_MIB("Tx Timeout Count"),

};



#define BCMASP_STATS_LEN	ARRAY_SIZE(bcmasp_gstrings_stats)



static u16 bcmasp_stat_fixup_offset(struct bcmasp_intf *intf,

				    const struct bcmasp_stats *s)

{

	struct bcmasp_priv *priv = intf->parent;



	if (!strcmp("Frames Out(Buffer)", s->stat_string))

		return priv->hw_info->rx_ctrl_fb_out_frame_count;



	if (!strcmp("Frames Out(Filters)", s->stat_string))

		return priv->hw_info->rx_ctrl_fb_filt_out_frame_count;



	if (!strcmp("RX Buffer FIFO Depth", s->stat_string))

		return priv->hw_info->rx_ctrl_fb_rx_fifo_depth;



	return s->reg_offset;

}



static int bcmasp_get_sset_count(struct net_device *dev, int string_set)

{

	switch (string_set) {

	case ETH_SS_STATS:

		return BCMASP_STATS_LEN;

	default:

		return -EOPNOTSUPP;

	}

}



static void bcmasp_get_strings(struct net_device *dev, u32 stringset,

			       u8 *data)

{

	unsigned int i;



	switch (stringset) {

	case ETH_SS_STATS:

		for (i = 0; i < BCMASP_STATS_LEN; i++) {

			memcpy(data + i * ETH_GSTRING_LEN,

			       bcmasp_gstrings_stats[i].stat_string,

			       ETH_GSTRING_LEN);

		}

		break;

	default:

		return;

	}

}



static void bcmasp_update_mib_counters(struct bcmasp_intf *intf)

{

	unsigned int i;



	for (i = 0; i < BCMASP_STATS_LEN; i++) {

		const struct bcmasp_stats *s;

		u32 offset, val;

		char *p;



		s = &bcmasp_gstrings_stats[i];

		offset = bcmasp_stat_fixup_offset(intf, s);

		switch (s->type) {

		case BCMASP_STAT_SOFT:

			continue;

		case BCMASP_STAT_RX_EDPKT:

			val = rx_edpkt_core_rl(intf->parent, offset);

			break;

		case BCMASP_STAT_RX_CTRL:

			val = rx_ctrl_core_rl(intf->parent, offset);

			break;

		case BCMASP_STAT_RX_CTRL_PER_INTF:

			offset += sizeof(u32) * intf->port;

			val = rx_ctrl_core_rl(intf->parent, offset);

			break;

		default:

			continue;

		}

		p = (char *)(&intf->mib) + (i * sizeof(u32));

		put_unaligned(val, (u32 *)p);

	}

}



static void bcmasp_get_ethtool_stats(struct net_device *dev,

				     struct ethtool_stats *stats,

				     u64 *data)

{

	struct bcmasp_intf *intf = netdev_priv(dev);

	unsigned int i;

	char *p;



	if (netif_running(dev))

		bcmasp_update_mib_counters(intf);



	for (i = 0; i < BCMASP_STATS_LEN; i++) {

		p = (char *)(&intf->mib) + (i * sizeof(u32));

		data[i] = *(u32 *)p;

	}

}



static void bcmasp_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info)

{
@@ -340,4 +497,7 @@ const struct ethtool_ops bcmasp_ethtool_ops = { 
	.get_eth_mac_stats	= bcmasp_get_eth_mac_stats,

	.get_rmon_stats		= bcmasp_get_rmon_stats,

	.get_eth_ctrl_stats	= bcmasp_get_eth_ctrl_stats,

	.get_strings		= bcmasp_get_strings,

	.get_ethtool_stats	= bcmasp_get_ethtool_stats,

	.get_sset_count		= bcmasp_get_sset_count,

};

drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c

+15 −3
Original line number Diff line number Diff line
@@ -104,22 +104,27 @@ static void bcmasp_set_rx_mode(struct net_device *dev) 


		netdev_for_each_mc_addr(ha, dev) {

			ret = bcmasp_set_en_mda_filter(intf, ha->addr, mask);

			if (ret)

			if (ret) {

				intf->mib.mc_filters_full_cnt++;

				goto set_promisc;

			}

		}

	}



	netdev_for_each_uc_addr(ha, dev) {

		ret = bcmasp_set_en_mda_filter(intf, ha->addr, mask);

		if (ret)

		if (ret) {

			intf->mib.uc_filters_full_cnt++;

			goto set_promisc;

		}

	}



	spin_unlock_bh(&intf->parent->mda_lock);

	return;



set_promisc:

	bcmasp_set_promisc(intf, 1);

	intf->mib.promisc_filters_cnt++;



	/* disable all filters used by this port */

	bcmasp_disable_all_filters(intf);
@@ -155,6 +160,7 @@ static struct sk_buff *bcmasp_csum_offload(struct net_device *dev, 
					   struct sk_buff *skb,

					   bool *csum_hw)

{

	struct bcmasp_intf *intf = netdev_priv(dev);

	u32 header = 0, header2 = 0, epkt = 0;

	struct bcmasp_pkt_offload *offload;

	unsigned int header_cnt = 0;
@@ -165,8 +171,10 @@ static struct sk_buff *bcmasp_csum_offload(struct net_device *dev, 
		return skb;



	ret = skb_cow_head(skb, sizeof(*offload));

	if (ret < 0)

	if (ret < 0) {

		intf->mib.tx_realloc_offload_failed++;

		goto help;

	}



	switch (skb->protocol) {

	case htons(ETH_P_IP):
@@ -305,6 +313,7 @@ static netdev_tx_t bcmasp_xmit(struct sk_buff *skb, struct net_device *dev) 
		}



		if (dma_mapping_error(kdev, mapping)) {

			intf->mib.tx_dma_failed++;

			spb_index = intf->tx_spb_index;

			for (j = 0; j < i; j++) {

				bcmasp_clean_txcb(intf, spb_index);
@@ -541,6 +550,8 @@ static int bcmasp_rx_poll(struct napi_struct *napi, int budget) 
			u64_stats_update_begin(&stats->syncp);

			u64_stats_inc(&stats->rx_dropped);

			u64_stats_update_end(&stats->syncp);

			intf->mib.alloc_rx_skb_failed++;



			goto next;

		}
@@ -1116,6 +1127,7 @@ static void bcmasp_tx_timeout(struct net_device *dev, unsigned int txqueue) 
	struct bcmasp_intf *intf = netdev_priv(dev);



	netif_dbg(intf, tx_err, dev, "transmit timeout!\n");

	intf->mib.tx_timeout_cnt++;

}



static int bcmasp_get_phys_port_name(struct net_device *dev,