mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
eth: fbnic: Add ethtool support for fbnic
Add ethtool ops support and enable 'get_drvinfo' for fbnic. The driver provides firmware version information while the driver name and bus information is provided by ethtool_get_drvinfo(). Signed-off-by: Mohsin Bashir <mohsin.bashr@gmail.com> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5c26516f09
commit
bd2557a554
@ -8,6 +8,7 @@
|
||||
obj-$(CONFIG_FBNIC) += fbnic.o
|
||||
|
||||
fbnic-y := fbnic_devlink.o \
|
||||
fbnic_ethtool.o \
|
||||
fbnic_fw.o \
|
||||
fbnic_irq.o \
|
||||
fbnic_mac.o \
|
||||
|
@ -132,6 +132,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
|
||||
};
|
||||
|
26
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c
Normal file
26
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c
Normal file
@ -0,0 +1,26 @@
|
||||
#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 const struct ethtool_ops fbnic_ethtool_ops = {
|
||||
.get_drvinfo = fbnic_get_drvinfo,
|
||||
};
|
||||
|
||||
void fbnic_set_ethtool_ops(struct net_device *dev)
|
||||
{
|
||||
dev->ethtool_ops = &fbnic_ethtool_ops;
|
||||
}
|
@ -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);
|
||||
}
|
||||
|
@ -53,10 +53,10 @@ int fbnic_fw_xmit_ownership_msg(struct fbnic_dev *fbd, bool take_ownership);
|
||||
int fbnic_fw_init_heartbeat(struct fbnic_dev *fbd, bool poll);
|
||||
void fbnic_fw_check_heartbeat(struct fbnic_dev *fbd);
|
||||
|
||||
#define fbnic_mk_full_fw_ver_str(_rev_id, _delim, _commit, _str) \
|
||||
#define fbnic_mk_full_fw_ver_str(_rev_id, _delim, _commit, _str, _str_sz) \
|
||||
do { \
|
||||
const u32 __rev_id = _rev_id; \
|
||||
snprintf(_str, sizeof(_str), "%02lu.%02lu.%02lu-%03lu%s%s", \
|
||||
snprintf(_str, _str_sz, "%02lu.%02lu.%02lu-%03lu%s%s", \
|
||||
FIELD_GET(FBNIC_FW_CAP_RESP_VERSION_MAJOR, __rev_id), \
|
||||
FIELD_GET(FBNIC_FW_CAP_RESP_VERSION_MINOR, __rev_id), \
|
||||
FIELD_GET(FBNIC_FW_CAP_RESP_VERSION_PATCH, __rev_id), \
|
||||
@ -65,7 +65,7 @@ do { \
|
||||
} while (0)
|
||||
|
||||
#define fbnic_mk_fw_ver_str(_rev_id, _str) \
|
||||
fbnic_mk_full_fw_ver_str(_rev_id, "", "", _str)
|
||||
fbnic_mk_full_fw_ver_str(_rev_id, "", "", _str, sizeof(_str))
|
||||
|
||||
#define FW_HEARTBEAT_PERIOD (10 * HZ)
|
||||
|
||||
|
@ -521,6 +521,8 @@ struct net_device *fbnic_netdev_alloc(struct fbnic_dev *fbd)
|
||||
netdev->netdev_ops = &fbnic_netdev_ops;
|
||||
netdev->stat_ops = &fbnic_stat_ops;
|
||||
|
||||
fbnic_set_ethtool_ops(netdev);
|
||||
|
||||
fbn = netdev_priv(netdev);
|
||||
|
||||
fbn->netdev = netdev;
|
||||
|
@ -58,6 +58,7 @@ int fbnic_netdev_register(struct net_device *netdev);
|
||||
void fbnic_netdev_unregister(struct net_device *netdev);
|
||||
void fbnic_reset_queues(struct fbnic_net *fbn,
|
||||
unsigned int tx, unsigned int rx);
|
||||
void fbnic_set_ethtool_ops(struct net_device *dev);
|
||||
|
||||
void __fbnic_set_rx_mode(struct net_device *netdev);
|
||||
void fbnic_clear_rx_mode(struct net_device *netdev);
|
||||
|
Loading…
Reference in New Issue
Block a user