| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20220210213306.3599-5-vburru@marvell.com>
Date: Thu, 10 Feb 2022 13:33:06 -0800
From: Veerasenareddy Burru <vburru@...vell.com>
To: <vburru@...vell.com>, <davem@...emloft.net>, <kuba@...nel.org>,
<corbet@....net>, <netdev@...r.kernel.org>,
<linux-doc@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC: Abhijit Ayarekar <aayarekar@...vell.com>,
Satananda Burla <sburla@...vell.com>
Subject: [PATCH 4/4] octeon_ep: add ethtool support for Octeon PCI Endpoint NIC.
Add support for the following ethtool commands:
ethtool -i|--driver devname
ethtool devname
ethtool -s devname [speed N] [autoneg on|off] [advertise N]
ethtool -S|--statistics devname
Signed-off-by: Veerasenareddy Burru <vburru@...vell.com>
Signed-off-by: Abhijit Ayarekar <aayarekar@...vell.com>
Signed-off-by: Satananda Burla <sburla@...vell.com>
---
.../net/ethernet/marvell/octeon_ep/Makefile | 2 +-
.../marvell/octeon_ep/octep_ethtool.c | 509 ++++++++++++++++++
.../ethernet/marvell/octeon_ep/octep_main.c | 5 +-
3 files changed, 513 insertions(+), 3 deletions(-)
create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c
diff --git a/drivers/net/ethernet/marvell/octeon_ep/Makefile b/drivers/net/ethernet/marvell/octeon_ep/Makefile
index 6e2db8e80b4a..2026c8118158 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/Makefile
+++ b/drivers/net/ethernet/marvell/octeon_ep/Makefile
@@ -6,4 +6,4 @@
obj-$(CONFIG_OCTEON_EP) += octeon_ep.o
octeon_ep-y := octep_main.o octep_cn9k_pf.o octep_tx.o octep_rx.o \
- octep_ctrl_mbox.o octep_ctrl_net.o
+ octep_ethtool.o octep_ctrl_mbox.o octep_ctrl_net.o
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c b/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c
new file mode 100644
index 000000000000..0263cfbb2dfb
--- /dev/null
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c
@@ -0,0 +1,509 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Marvell Octeon EP (EndPoint) Ethernet Driver
+ *
+ * Copyright (C) 2020 Marvell.
+ *
+ */
+
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+
+#include "octep_config.h"
+#include "octep_main.h"
+#include "octep_ctrl_net.h"
+
+static const char octep_gstrings_global_stats[][ETH_GSTRING_LEN] = {
+ "rx_packets",
+ "tx_packets",
+ "rx_bytes",
+ "tx_bytes",
+ "rx_alloc_errors",
+ "tx_busy_errors",
+ "rx_dropped",
+ "tx_dropped",
+ "tx_hw_pkts",
+ "tx_hw_octs",
+ "tx_hw_bcast",
+ "tx_hw_mcast",
+ "tx_hw_underflow",
+ "tx_hw_control",
+ "tx_less_than_64",
+ "tx_equal_64",
+ "tx_equal_65_to_127",
+ "tx_equal_128_to_255",
+ "tx_equal_256_to_511",
+ "tx_equal_512_to_1023",
+ "tx_equal_1024_to_1518",
+ "tx_greater_than_1518",
+ "rx_hw_pkts",
+ "rx_hw_bytes",
+ "rx_hw_bcast",
+ "rx_hw_mcast",
+ "rx_pause_pkts",
+ "rx_pause_bytes",
+ "rx_dropped_pkts_fifo_full",
+ "rx_dropped_bytes_fifo_full",
+ "rx_err_pkts",
+};
+
+#define OCTEP_GLOBAL_STATS_CNT (sizeof(octep_gstrings_global_stats) / ETH_GSTRING_LEN)
+
+static const char octep_gstrings_tx_q_stats[][ETH_GSTRING_LEN] = {
+ "tx_packets_posted[Q-%u]",
+ "tx_packets_completed[Q-%u]",
+ "tx_bytes[Q-%u]",
+ "tx_busy[Q-%u]",
+};
+
+#define OCTEP_TX_Q_STATS_CNT (sizeof(octep_gstrings_tx_q_stats) / ETH_GSTRING_LEN)
+
+static const char octep_gstrings_rx_q_stats[][ETH_GSTRING_LEN] = {
+ "rx_packets[Q-%u]",
+ "rx_bytes[Q-%u]",
+ "rx_alloc_errors[Q-%u]",
+};
+
+#define OCTEP_RX_Q_STATS_CNT (sizeof(octep_gstrings_rx_q_stats) / ETH_GSTRING_LEN)
+
+static void octep_get_drvinfo(struct net_device *netdev,
+ struct ethtool_drvinfo *info)
+{
+ struct octep_device *oct = netdev_priv(netdev);
+
+ strscpy(info->driver, OCTEP_DRV_NAME, sizeof(info->driver));
+ strscpy(info->version, OCTEP_DRV_VERSION_STR, sizeof(info->version));
+ strscpy(info->bus_info, pci_name(oct->pdev), sizeof(info->bus_info));
+}
+
+static void octep_get_strings(struct net_device *netdev,
+ u32 stringset, u8 *data)
+{
+ struct octep_device *oct = netdev_priv(netdev);
+ u16 num_queues = CFG_GET_PORTS_ACTIVE_IO_RINGS(oct->conf);
+ char *strings = (char *)data;
+ int i, j;
+
+ switch (stringset) {
+ case ETH_SS_STATS:
+ for (i = 0; i < OCTEP_GLOBAL_STATS_CNT; i++) {
+ snprintf(strings, ETH_GSTRING_LEN,
+ octep_gstrings_global_stats[i]);
+ strings += ETH_GSTRING_LEN;
+ }
+
+ for (i = 0; i < num_queues; i++) {
+ for (j = 0; j < OCTEP_TX_Q_STATS_CNT; j++) {
+ snprintf(strings, ETH_GSTRING_LEN,
+ octep_gstrings_tx_q_stats[j], i);
+ strings += ETH_GSTRING_LEN;
+ }
+ }
+
+ for (i = 0; i < num_queues; i++) {
+ for (j = 0; j < OCTEP_RX_Q_STATS_CNT; j++) {
+ snprintf(strings, ETH_GSTRING_LEN,
+ octep_gstrings_rx_q_stats[j], i);
+ strings += ETH_GSTRING_LEN;
+ }
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+static int octep_get_sset_count(struct net_device *netdev, int sset)
+{
+ struct octep_device *oct = netdev_priv(netdev);
+ u16 num_queues = CFG_GET_PORTS_ACTIVE_IO_RINGS(oct->conf);
+
+ switch (sset) {
+ case ETH_SS_STATS:
+ return OCTEP_GLOBAL_STATS_CNT + (num_queues *
+ (OCTEP_TX_Q_STATS_CNT + OCTEP_RX_Q_STATS_CNT));
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static void
+octep_get_ethtool_stats(struct net_device *netdev,
+ struct ethtool_stats *stats, u64 *data)
+{
+ struct octep_device *oct = netdev_priv(netdev);
+ struct octep_iface_tx_stats *iface_tx_stats;
+ struct octep_iface_rx_stats *iface_rx_stats;
+ u64 rx_packets, rx_bytes, rx_errors;
+ u64 tx_packets, tx_bytes, tx_errors;
+ u64 rx_alloc_errors, tx_busy_errors;
+ int q, i;
+
+ rx_packets = 0;
+ rx_bytes = 0;
+ rx_errors = 0;
+ tx_packets = 0;
+ tx_bytes = 0;
+ tx_errors = 0;
+ rx_alloc_errors = 0;
+ tx_busy_errors = 0;
+ tx_packets = 0;
+ tx_bytes = 0;
+ rx_packets = 0;
+ rx_bytes = 0;
+
+ octep_get_if_stats(oct);
+ iface_tx_stats = &oct->iface_tx_stats;
+ iface_rx_stats = &oct->iface_rx_stats;
+
+ for (q = 0; q < oct->num_oqs; q++) {
+ struct octep_iq *iq = oct->iq[q];
+ struct octep_oq *oq = oct->oq[q];
+
+ tx_packets += iq->stats.instr_completed;
+ tx_bytes += iq->stats.bytes_sent;
+ tx_busy_errors += iq->stats.tx_busy;
+
+ rx_packets += oq->stats.packets;
+ rx_bytes += oq->stats.bytes;
+ rx_alloc_errors += oq->stats.alloc_failures;
+ }
+ i = 0;
+ data[i++] = rx_packets;
+ data[i++] = tx_packets;
+ data[i++] = rx_bytes;
+ data[i++] = tx_bytes;
+ data[i++] = rx_alloc_errors;
+ data[i++] = tx_busy_errors;
+ data[i++] = iface_rx_stats->dropped_pkts_fifo_full +
+ iface_rx_stats->err_pkts;
+ data[i++] = iface_tx_stats->xscol +
+ iface_tx_stats->xsdef;
+ data[i++] = iface_tx_stats->pkts;
+ data[i++] = iface_tx_stats->octs;
+ data[i++] = iface_tx_stats->bcst;
+ data[i++] = iface_tx_stats->mcst;
+ data[i++] = iface_tx_stats->undflw;
+ data[i++] = iface_tx_stats->ctl;
+ data[i++] = iface_tx_stats->hist_lt64;
+ data[i++] = iface_tx_stats->hist_eq64;
+ data[i++] = iface_tx_stats->hist_65to127;
+ data[i++] = iface_tx_stats->hist_128to255;
+ data[i++] = iface_tx_stats->hist_256to511;
+ data[i++] = iface_tx_stats->hist_512to1023;
+ data[i++] = iface_tx_stats->hist_1024to1518;
+ data[i++] = iface_tx_stats->hist_gt1518;
+ data[i++] = iface_rx_stats->pkts;
+ data[i++] = iface_rx_stats->octets;
+ data[i++] = iface_rx_stats->mcast_pkts;
+ data[i++] = iface_rx_stats->bcast_pkts;
+ data[i++] = iface_rx_stats->pause_pkts;
+ data[i++] = iface_rx_stats->pause_octets;
+ data[i++] = iface_rx_stats->dropped_pkts_fifo_full;
+ data[i++] = iface_rx_stats->dropped_octets_fifo_full;
+ data[i++] = iface_rx_stats->err_pkts;
+
+ /* Per Tx Queue stats */
+ for (q = 0; q < oct->num_iqs; q++) {
+ struct octep_iq *iq = oct->iq[q];
+
+ data[i++] = iq->stats.instr_posted;
+ data[i++] = iq->stats.instr_completed;
+ data[i++] = iq->stats.bytes_sent;
+ data[i++] = iq->stats.tx_busy;
+ }
+
+ /* Per Rx Queue stats */
+ for (q = 0; q < oct->num_oqs; q++) {
+ struct octep_oq *oq = oct->oq[q];
+
+ data[i++] = oq->stats.packets;
+ data[i++] = oq->stats.bytes;
+ data[i++] = oq->stats.alloc_failures;
+ }
+}
+
+static int octep_get_link_ksettings(struct net_device *netdev,
+ struct ethtool_link_ksettings *cmd)
+{
+ struct octep_device *oct = netdev_priv(netdev);
+ struct octep_iface_link_info *link_info;
+ u32 advertised, supported;
+
+ ethtool_link_ksettings_zero_link_mode(cmd, supported);
+ ethtool_link_ksettings_zero_link_mode(cmd, advertising);
+
+ octep_get_link_info(oct);
+
+ advertised = oct->link_info.advertised_modes;
+ supported = oct->link_info.supported_modes;
+ link_info = &oct->link_info;
+
+ if (supported & BIT(OCTEP_LINK_MODE_10GBASE_T))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseT_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_10GBASE_R))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseR_FEC);
+ if (supported & BIT(OCTEP_LINK_MODE_10GBASE_CR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseCR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_10GBASE_KR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseKR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_10GBASE_LR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseLR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_10GBASE_SR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseSR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_25GBASE_CR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 25000baseCR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_25GBASE_KR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 25000baseKR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_25GBASE_SR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 25000baseSR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_40GBASE_CR4))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 40000baseCR4_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_40GBASE_KR4))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 40000baseKR4_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_40GBASE_LR4))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 40000baseLR4_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_40GBASE_SR4))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 40000baseSR4_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_50GBASE_CR2))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseCR2_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_50GBASE_KR2))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseKR2_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_50GBASE_SR2))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseSR2_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_50GBASE_CR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseCR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_50GBASE_KR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseKR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_50GBASE_LR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseLR_ER_FR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_50GBASE_SR))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseSR_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_100GBASE_CR4))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 100000baseCR4_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_100GBASE_KR4))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 100000baseKR4_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_100GBASE_LR4))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 100000baseLR4_ER4_Full);
+ if (supported & BIT(OCTEP_LINK_MODE_100GBASE_SR4))
+ ethtool_link_ksettings_add_link_mode(cmd, supported, 100000baseSR4_Full);
+
+ if (advertised & BIT(OCTEP_LINK_MODE_10GBASE_T))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseT_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_10GBASE_R))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseR_FEC);
+ if (advertised & BIT(OCTEP_LINK_MODE_10GBASE_CR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseCR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_10GBASE_KR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseKR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_10GBASE_LR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseLR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_10GBASE_SR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseSR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_25GBASE_CR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 25000baseCR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_25GBASE_KR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 25000baseKR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_25GBASE_SR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 25000baseSR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_40GBASE_CR4))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 40000baseCR4_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_40GBASE_KR4))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 40000baseKR4_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_40GBASE_LR4))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 40000baseLR4_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_40GBASE_SR4))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 40000baseSR4_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_50GBASE_CR2))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseCR2_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_50GBASE_KR2))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseKR2_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_50GBASE_SR2))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseSR2_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_50GBASE_CR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseCR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_50GBASE_KR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseKR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_50GBASE_LR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseLR_ER_FR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_50GBASE_SR))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseSR_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_100GBASE_CR4))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 100000baseCR4_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_100GBASE_KR4))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 100000baseKR4_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_100GBASE_LR4))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 100000baseLR4_ER4_Full);
+ if (advertised & BIT(OCTEP_LINK_MODE_100GBASE_SR4))
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, 100000baseSR4_Full);
+
+ if (link_info->autoneg) {
+ if (link_info->autoneg & OCTEP_LINK_MODE_AUTONEG_SUPPORTED)
+ ethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg);
+ if (link_info->autoneg & OCTEP_LINK_MODE_AUTONEG_ADVERTISED) {
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);
+ cmd->base.autoneg = AUTONEG_ENABLE;
+ } else {
+ cmd->base.autoneg = AUTONEG_DISABLE;
+ }
+ } else {
+ cmd->base.autoneg = AUTONEG_DISABLE;
+ }
+
+ if (link_info->pause) {
+ if (link_info->pause & OCTEP_LINK_MODE_PAUSE_SUPPORTED)
+ ethtool_link_ksettings_add_link_mode(cmd, supported, Pause);
+ if (link_info->pause & OCTEP_LINK_MODE_PAUSE_ADVERTISED)
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);
+ }
+
+ cmd->base.port = PORT_FIBRE;
+ ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);
+ ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);
+
+ if (netif_carrier_ok(netdev)) {
+ cmd->base.speed = link_info->speed;
+ cmd->base.duplex = DUPLEX_FULL;
+ } else {
+ cmd->base.speed = SPEED_UNKNOWN;
+ cmd->base.duplex = DUPLEX_UNKNOWN;
+ }
+ return 0;
+}
+
+static int octep_set_link_ksettings(struct net_device *netdev,
+ const struct ethtool_link_ksettings *cmd)
+{
+ struct octep_device *oct = netdev_priv(netdev);
+ struct octep_iface_link_info link_info_new;
+ struct octep_iface_link_info *link_info;
+ u64 advertised;
+ u8 autoneg = 0;
+ int err;
+
+ link_info = &oct->link_info;
+ memcpy(&link_info_new, link_info, sizeof(struct octep_iface_link_info));
+
+ /* Only Full duplex is supported;
+ * Assume full duplex when duplex is unknown.
+ */
+ if (cmd->base.duplex != DUPLEX_FULL &&
+ cmd->base.duplex != DUPLEX_UNKNOWN)
+ return -EOPNOTSUPP;
+
+ if (cmd->base.autoneg == AUTONEG_ENABLE) {
+ if (!(link_info->autoneg & OCTEP_LINK_MODE_AUTONEG_SUPPORTED))
+ return -EOPNOTSUPP;
+ autoneg = 1;
+ }
+
+ if (!bitmap_subset(cmd->link_modes.advertising,
+ cmd->link_modes.supported,
+ __ETHTOOL_LINK_MODE_MASK_NBITS))
+ return -EINVAL;
+
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 10000baseT_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_10GBASE_T);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 10000baseR_FEC))
+ advertised |= BIT(OCTEP_LINK_MODE_10GBASE_R);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 10000baseCR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_10GBASE_CR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 10000baseKR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_10GBASE_KR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 10000baseLR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_10GBASE_LR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 10000baseSR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_10GBASE_SR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 25000baseCR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_25GBASE_CR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 25000baseKR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_25GBASE_KR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 25000baseSR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_25GBASE_SR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 40000baseCR4_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_40GBASE_CR4);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 40000baseKR4_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_40GBASE_KR4);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 40000baseLR4_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_40GBASE_LR4);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 40000baseSR4_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_40GBASE_SR4);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 50000baseCR2_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_50GBASE_CR2);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 50000baseKR2_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_50GBASE_KR2);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 50000baseSR2_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_50GBASE_SR2);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 50000baseCR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_50GBASE_CR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 50000baseKR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_50GBASE_KR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 50000baseLR_ER_FR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_50GBASE_LR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 50000baseSR_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_50GBASE_SR);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 100000baseCR4_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_100GBASE_CR4);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 100000baseKR4_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_100GBASE_KR4);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 100000baseLR4_ER4_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_100GBASE_LR4);
+ if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
+ 100000baseSR4_Full))
+ advertised |= BIT(OCTEP_LINK_MODE_100GBASE_SR4);
+
+ if (advertised == link_info->advertised_modes &&
+ cmd->base.speed == link_info->speed &&
+ cmd->base.autoneg == link_info->autoneg)
+ return 0;
+
+ link_info_new.advertised_modes = advertised;
+ link_info_new.speed = cmd->base.speed;
+ link_info_new.autoneg = cmd->base.autoneg;
+
+ err = octep_set_link_info(oct, &link_info_new);
+ if (err)
+ return err;
+
+ memcpy(link_info, &link_info_new, sizeof(struct octep_iface_link_info));
+ return 0;
+}
+
+const struct ethtool_ops octep_ethtool_ops = {
+ .get_drvinfo = octep_get_drvinfo,
+ .get_link = ethtool_op_get_link,
+ .get_strings = octep_get_strings,
+ .get_sset_count = octep_get_sset_count,
+ .get_ethtool_stats = octep_get_ethtool_stats,
+ .get_link_ksettings = octep_get_link_ksettings,
+ .set_link_ksettings = octep_set_link_ksettings,
+};
+
+void octep_set_ethtool_ops(struct net_device *netdev)
+{
+ netdev->ethtool_ops = &octep_ethtool_ops;
+}
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index 700852fd4c3a..00c6ca047332 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -827,7 +827,7 @@ static int octep_set_mac(struct net_device *netdev, void *p)
return err;
memcpy(oct->mac_addr, addr->sa_data, ETH_ALEN);
- memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+ eth_hw_addr_set(netdev, addr->sa_data);
return 0;
}
@@ -1058,6 +1058,7 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
INIT_WORK(&octep_dev->ctrl_mbox_task, octep_ctrl_mbox_task);
netdev->netdev_ops = &octep_netdev_ops;
+ octep_set_ethtool_ops(netdev);
netif_carrier_off(netdev);
netdev->hw_features = NETIF_F_SG;
@@ -1067,7 +1068,7 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
netdev->mtu = OCTEP_DEFAULT_MTU;
octep_get_mac_addr(octep_dev, octep_dev->mac_addr);
- memcpy(netdev->dev_addr, octep_dev->mac_addr, netdev->addr_len);
+ eth_hw_addr_set(netdev, octep_dev->mac_addr);
if (register_netdev(netdev)) {
dev_err(&pdev->dev, "Failed to register netdev\n");
--
2.17.1
Powered by blists - more mailing lists