Commit 78080120 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fbnic-ethtool' 

Mohsin Bashir says:

====================
eth: Add basic ethtool support for fbnic

This patch series adds basic ethtool support for fbnic. Specifically,
the two patches focus on the following two features respectively:

1: Enable 'ethtool -i <dev>' to provide driver, firmware and bus information.
2: Provide mac group stats.

Changes since v2:
- Fix v1 reference link
- Fix nit

---
v2: https://lore.kernel.org/netdev/20240827205904.1944066-2-mohsin.bashr@gmail.com

v1: https://lore.kernel.org/netdev/20240822184944.3882360-1-mohsin.bashr@gmail.com


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5c26516f 4eb7f20b

drivers/net/ethernet/meta/fbnic/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ 
obj-$(CONFIG_FBNIC) += fbnic.o



fbnic-y := fbnic_devlink.o \

	   fbnic_ethtool.o \

	   fbnic_fw.o \

	   fbnic_hw_stats.o \

	   fbnic_irq.o \

	   fbnic_mac.o \

	   fbnic_netdev.o \

drivers/net/ethernet/meta/fbnic/fbnic.h

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include "fbnic_csr.h"

#include "fbnic_fw.h"

#include "fbnic_hw_stats.h"

#include "fbnic_mac.h"

#include "fbnic_rpc.h"
@@ -47,6 +48,9 @@ struct fbnic_dev { 


	/* Number of TCQs/RCQs available on hardware */

	u16 max_num_queues;



	/* Local copy of hardware statistics */

	struct fbnic_hw_stats hw_stats;

};



/* Reserve entry 0 in the MSI-X "others" array until we have filled all
@@ -132,6 +136,9 @@ void fbnic_free_irq(struct fbnic_dev *dev, int nr, void *data); 
void fbnic_free_irqs(struct fbnic_dev *fbd);

int fbnic_alloc_irqs(struct fbnic_dev *fbd);



void fbnic_get_fw_ver_commit_str(struct fbnic_dev *fbd, char *fw_version,

				 const size_t str_sz);



enum fbnic_boards {

	fbnic_board_asic

};

drivers/net/ethernet/meta/fbnic/fbnic_csr.h

+37 −0
Original line number Diff line number Diff line
@@ -660,6 +660,43 @@ enum { 
#define FBNIC_SIG_PCS_INTR_MASK		0x11816		/* 0x46058 */

#define FBNIC_CSR_END_SIG		0x1184e /* CSR section delimiter */



#define FBNIC_CSR_START_MAC_STAT	0x11a00

#define FBNIC_MAC_STAT_RX_BYTE_COUNT_L	0x11a08		/* 0x46820 */

#define FBNIC_MAC_STAT_RX_BYTE_COUNT_H	0x11a09		/* 0x46824 */

#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_L \

					0x11a0a		/* 0x46828 */

#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_H \

					0x11a0b		/* 0x4682c */

#define FBNIC_MAC_STAT_RX_TOOLONG_L	0x11a0e		/* 0x46838 */

#define FBNIC_MAC_STAT_RX_TOOLONG_H	0x11a0f		/* 0x4683c */

#define FBNIC_MAC_STAT_RX_RECEIVED_OK_L	\

					0x11a12		/* 0x46848 */

#define FBNIC_MAC_STAT_RX_RECEIVED_OK_H	\

					0x11a13		/* 0x4684c */

#define FBNIC_MAC_STAT_RX_PACKET_BAD_FCS_L \

					0x11a14		/* 0x46850 */

#define FBNIC_MAC_STAT_RX_PACKET_BAD_FCS_H \

					0x11a15		/* 0x46854 */

#define FBNIC_MAC_STAT_RX_IFINERRORS_L	0x11a18		/* 0x46860 */

#define FBNIC_MAC_STAT_RX_IFINERRORS_H	0x11a19		/* 0x46864 */

#define FBNIC_MAC_STAT_RX_MULTICAST_L	0x11a1c		/* 0x46870 */

#define FBNIC_MAC_STAT_RX_MULTICAST_H	0x11a1d		/* 0x46874 */

#define FBNIC_MAC_STAT_RX_BROADCAST_L	0x11a1e		/* 0x46878 */

#define FBNIC_MAC_STAT_RX_BROADCAST_H	0x11a1f		/* 0x4687c */

#define FBNIC_MAC_STAT_TX_BYTE_COUNT_L	0x11a3e		/* 0x468f8 */

#define FBNIC_MAC_STAT_TX_BYTE_COUNT_H	0x11a3f		/* 0x468fc */

#define FBNIC_MAC_STAT_TX_TRANSMITTED_OK_L \

					0x11a42		/* 0x46908 */

#define FBNIC_MAC_STAT_TX_TRANSMITTED_OK_H \

					0x11a43		/* 0x4690c */

#define FBNIC_MAC_STAT_TX_IFOUTERRORS_L \

					0x11a46		/* 0x46918 */

#define FBNIC_MAC_STAT_TX_IFOUTERRORS_H \

					0x11a47		/* 0x4691c */

#define FBNIC_MAC_STAT_TX_MULTICAST_L	0x11a4a		/* 0x46928 */

#define FBNIC_MAC_STAT_TX_MULTICAST_H	0x11a4b		/* 0x4692c */

#define FBNIC_MAC_STAT_TX_BROADCAST_L	0x11a4c		/* 0x46930 */

#define FBNIC_MAC_STAT_TX_BROADCAST_H	0x11a4d		/* 0x46934 */

/* PUL User Registers */

#define FBNIC_CSR_START_PUL_USER	0x31000	/* CSR section delimiter */

#define FBNIC_PUL_OB_TLP_HDR_AW_CFG	0x3103d		/* 0xc40f4 */

drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c

0 → 100644
+75 −0
Original line number Diff line number Diff line 
#include <linux/ethtool.h>

#include <linux/netdevice.h>

#include <linux/pci.h>



#include "fbnic.h"

#include "fbnic_netdev.h"

#include "fbnic_tlv.h"



static void

fbnic_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)

{

	struct fbnic_net *fbn = netdev_priv(netdev);

	struct fbnic_dev *fbd = fbn->fbd;



	fbnic_get_fw_ver_commit_str(fbd, drvinfo->fw_version,

				    sizeof(drvinfo->fw_version));

}



static void fbnic_set_counter(u64 *stat, struct fbnic_stat_counter *counter)

{

	if (counter->reported)

		*stat = counter->value;

}



static void

fbnic_get_eth_mac_stats(struct net_device *netdev,

			struct ethtool_eth_mac_stats *eth_mac_stats)

{

	struct fbnic_net *fbn = netdev_priv(netdev);

	struct fbnic_mac_stats *mac_stats;

	struct fbnic_dev *fbd = fbn->fbd;

	const struct fbnic_mac *mac;



	mac_stats = &fbd->hw_stats.mac;

	mac = fbd->mac;



	mac->get_eth_mac_stats(fbd, false, &mac_stats->eth_mac);



	fbnic_set_counter(&eth_mac_stats->FramesTransmittedOK,

			  &mac_stats->eth_mac.FramesTransmittedOK);

	fbnic_set_counter(&eth_mac_stats->FramesReceivedOK,

			  &mac_stats->eth_mac.FramesReceivedOK);

	fbnic_set_counter(&eth_mac_stats->FrameCheckSequenceErrors,

			  &mac_stats->eth_mac.FrameCheckSequenceErrors);

	fbnic_set_counter(&eth_mac_stats->AlignmentErrors,

			  &mac_stats->eth_mac.AlignmentErrors);

	fbnic_set_counter(&eth_mac_stats->OctetsTransmittedOK,

			  &mac_stats->eth_mac.OctetsTransmittedOK);

	fbnic_set_counter(&eth_mac_stats->FramesLostDueToIntMACXmitError,

			  &mac_stats->eth_mac.FramesLostDueToIntMACXmitError);

	fbnic_set_counter(&eth_mac_stats->OctetsReceivedOK,

			  &mac_stats->eth_mac.OctetsReceivedOK);

	fbnic_set_counter(&eth_mac_stats->FramesLostDueToIntMACRcvError,

			  &mac_stats->eth_mac.FramesLostDueToIntMACRcvError);

	fbnic_set_counter(&eth_mac_stats->MulticastFramesXmittedOK,

			  &mac_stats->eth_mac.MulticastFramesXmittedOK);

	fbnic_set_counter(&eth_mac_stats->BroadcastFramesXmittedOK,

			  &mac_stats->eth_mac.BroadcastFramesXmittedOK);

	fbnic_set_counter(&eth_mac_stats->MulticastFramesReceivedOK,

			  &mac_stats->eth_mac.MulticastFramesReceivedOK);

	fbnic_set_counter(&eth_mac_stats->BroadcastFramesReceivedOK,

			  &mac_stats->eth_mac.BroadcastFramesReceivedOK);

	fbnic_set_counter(&eth_mac_stats->FrameTooLongErrors,

			  &mac_stats->eth_mac.FrameTooLongErrors);

}



static const struct ethtool_ops fbnic_ethtool_ops = {

	.get_drvinfo		= fbnic_get_drvinfo,

	.get_eth_mac_stats	= fbnic_get_eth_mac_stats,

};



void fbnic_set_ethtool_ops(struct net_device *dev)

{

	dev->ethtool_ops = &fbnic_ethtool_ops;

}

drivers/net/ethernet/meta/fbnic/fbnic_fw.c

+13 −0
Original line number Diff line number Diff line
@@ -789,3 +789,16 @@ void fbnic_mbx_flush_tx(struct fbnic_dev *fbd) 
		count += (tx_mbx->head - head) % FBNIC_IPC_MBX_DESC_LEN;

	} while (count < FBNIC_IPC_MBX_DESC_LEN && --attempts);

}



void fbnic_get_fw_ver_commit_str(struct fbnic_dev *fbd, char *fw_version,

				 const size_t str_sz)

{

	struct fbnic_fw_ver *mgmt = &fbd->fw_cap.running.mgmt;

	const char *delim = "";



	if (mgmt->commit[0])

		delim = "_";



	fbnic_mk_full_fw_ver_str(mgmt->version, delim, mgmt->commit,

				 fw_version, str_sz);

}