octeon_ep: add support for ndo ops

Add support for ndo ops to set MAC address, change MTU, get stats.
Add control path support to set MAC address, change MTU, get stats,
set speed, get and set link mode.

Signed-off-by: Veerasenareddy Burru <vburru@marvell.com>
Signed-off-by: Abhijit Ayarekar <aayarekar@marvell.com>
Signed-off-by: Satananda Burla <sburla@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h
index 30f497f0bc261b47a39f82aa88031d674f63dbe4..2dc5753cfec6b263ef8dcda66f55df8d7cfdedc9 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h
@@ -120,7 +120,7 @@ struct octep_ctrl_mbox {
        /* size of bar memory */
        u32 barmem_sz;
        /* pointer to BAR memory */
-       void __iomem *barmem;
+       u8 __iomem *barmem;
        /* user context for callback, can be null */
        void *user_ctx;
        /* callback handler for processing request, called from octep_ctrl_mbox_recv */

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
index c3aca7b2775bd75137c22f2bf355e56d55ccc94e..7c00c896ab98f89bdcf68a74fba4ae47e37141ca 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
@@ -87,6 +87,66 @@ int octep_get_mac_addr(struct octep_device *oct, u8 *addr)
        return err;
 }
 
+int octep_set_mac_addr(struct octep_device *oct, u8 *addr)
+{
+       struct octep_ctrl_net_h2f_req req = {};
+       struct octep_ctrl_mbox_msg msg = {};
+
+       req.hdr.cmd = OCTEP_CTRL_NET_H2F_CMD_MAC;
+       req.mac.cmd = OCTEP_CTRL_NET_CMD_SET;
+       memcpy(&req.mac.addr, addr, ETH_ALEN);
+
+       msg.hdr.flags = OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ;
+       msg.hdr.sizew = OCTEP_CTRL_NET_H2F_MAC_REQ_SZW;
+       msg.msg = &req;
+
+       return octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg);
+}
+
+int octep_set_mtu(struct octep_device *oct, int mtu)
+{
+       struct octep_ctrl_net_h2f_req req = {};
+       struct octep_ctrl_mbox_msg msg = {};
+
+       req.hdr.cmd = OCTEP_CTRL_NET_H2F_CMD_MTU;
+       req.mtu.cmd = OCTEP_CTRL_NET_CMD_SET;
+       req.mtu.val = mtu;
+
+       msg.hdr.flags = OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ;
+       msg.hdr.sizew = OCTEP_CTRL_NET_H2F_MTU_REQ_SZW;
+       msg.msg = &req;
+
+       return octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg);
+}
+
+int octep_get_if_stats(struct octep_device *oct)
+{
+       void __iomem *iface_rx_stats;
+       void __iomem *iface_tx_stats;
+       struct octep_ctrl_net_h2f_req req = {};
+       struct octep_ctrl_mbox_msg msg = {};
+       int err;
+
+       req.hdr.cmd = OCTEP_CTRL_NET_H2F_CMD_GET_IF_STATS;
+       req.mac.cmd = OCTEP_CTRL_NET_CMD_GET;
+       req.get_stats.offset = oct->ctrl_mbox_ifstats_offset;
+
+       msg.hdr.flags = OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ;
+       msg.hdr.sizew = OCTEP_CTRL_NET_H2F_GET_STATS_REQ_SZW;
+       msg.msg = &req;
+       err = octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg);
+       if (err)
+               return err;
+
+       iface_rx_stats = oct->ctrl_mbox.barmem + oct->ctrl_mbox_ifstats_offset;
+       iface_tx_stats = oct->ctrl_mbox.barmem + oct->ctrl_mbox_ifstats_offset +
+                        sizeof(struct octep_iface_rx_stats);
+       memcpy_fromio(&oct->iface_rx_stats, iface_rx_stats, sizeof(struct octep_iface_rx_stats));
+       memcpy_fromio(&oct->iface_tx_stats, iface_tx_stats, sizeof(struct octep_iface_tx_stats));
+
+       return err;
+}
+
 int octep_get_link_info(struct octep_device *oct)
 {
        struct octep_ctrl_net_h2f_req req = {};

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index 8b3dc50d08fd6dcf1c367e30a11da6ad66809659..dac1e94647942ebc84229e6809ec53e33ad3b974 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -152,6 +152,43 @@ static netdev_tx_t octep_start_xmit(struct sk_buff *skb,
        return NETDEV_TX_OK;
 }
 
+/**
+ * octep_get_stats64() - Get Octeon network device statistics.
+ *
+ * @netdev: kernel network device.
+ * @stats: pointer to stats structure to be filled in.
+ */
+static void octep_get_stats64(struct net_device *netdev,
+                             struct rtnl_link_stats64 *stats)
+{
+       u64 tx_packets, tx_bytes, rx_packets, rx_bytes;
+       struct octep_device *oct = netdev_priv(netdev);
+       int q;
+
+       octep_get_if_stats(oct);
+       tx_packets = 0;
+       tx_bytes = 0;
+       rx_packets = 0;
+       rx_bytes = 0;
+       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;
+               rx_packets += oq->stats.packets;
+               rx_bytes += oq->stats.bytes;
+       }
+       stats->tx_packets = tx_packets;
+       stats->tx_bytes = tx_bytes;
+       stats->rx_packets = rx_packets;
+       stats->rx_bytes = rx_bytes;
+       stats->multicast = oct->iface_rx_stats.mcast_pkts;
+       stats->rx_errors = oct->iface_rx_stats.err_pkts;
+       stats->collisions = oct->iface_tx_stats.xscol;
+       stats->tx_fifo_errors = oct->iface_tx_stats.undflw;
+}
+
 /**
  * octep_tx_timeout_task - work queue task to Handle Tx queue timeout.
  *
@@ -190,11 +227,52 @@ static void octep_tx_timeout(struct net_device *netdev, unsigned int txqueue)
        queue_work(octep_wq, &oct->tx_timeout_task);
 }
 
+static int octep_set_mac(struct net_device *netdev, void *p)
+{
+       struct octep_device *oct = netdev_priv(netdev);
+       struct sockaddr *addr = (struct sockaddr *)p;
+       int err;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       err = octep_set_mac_addr(oct, addr->sa_data);
+       if (err)
+               return err;
+
+       memcpy(oct->mac_addr, addr->sa_data, ETH_ALEN);
+       eth_hw_addr_set(netdev, addr->sa_data);
+
+       return 0;
+}
+
+static int octep_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       struct octep_device *oct = netdev_priv(netdev);
+       struct octep_iface_link_info *link_info;
+       int err = 0;
+
+       link_info = &oct->link_info;
+       if (link_info->mtu == new_mtu)
+               return 0;
+
+       err = octep_set_mtu(oct, new_mtu);
+       if (!err) {
+               oct->link_info.mtu = new_mtu;
+               netdev->mtu = new_mtu;
+       }
+
+       return err;
+}
+
 static const struct net_device_ops octep_netdev_ops = {
        .ndo_open                = octep_open,
        .ndo_stop                = octep_stop,
        .ndo_start_xmit          = octep_start_xmit,
+       .ndo_get_stats64         = octep_get_stats64,
        .ndo_tx_timeout          = octep_tx_timeout,
+       .ndo_set_mac_address     = octep_set_mac,
+       .ndo_change_mtu          = octep_change_mtu,
 };
 
 /**