nfp: store pointer to MAC statistics in nfp_port

Store pointer to device memory containing MAC statistics
in nfp_port.  This simplifies representor code and will
be used to dump those statistics in ethtool as well.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
index 50f7cc057cc954588f742ee44a14f116acd5659c..28e932eab8124c24a80e956d06157e20914454b0 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
@@ -78,12 +78,10 @@ void nfp_repr_inc_rx_stats(struct net_device *netdev, unsigned int len)
 }
 
 static void
-nfp_repr_phy_port_get_stats64(const struct nfp_app *app, u8 phy_port,
+nfp_repr_phy_port_get_stats64(struct nfp_port *port,
                              struct rtnl_link_stats64 *stats)
 {
-       u8 __iomem *mem;
-
-       mem = app->pf->mac_stats_mem + phy_port * NFP_MAC_STATS_SIZE;
+       u8 __iomem *mem = port->eth_stats;
 
        /* TX and RX stats are flipped as we are returning the stats as seen
         * at the switch port corresponding to the phys port.
@@ -141,7 +139,6 @@ static void
 nfp_repr_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats)
 {
        struct nfp_repr *repr = netdev_priv(netdev);
-       struct nfp_eth_table_port *eth_port;
        struct nfp_app *app = repr->app;
 
        if (WARN_ON(!repr->port))
@@ -149,10 +146,9 @@ nfp_repr_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats)
 
        switch (repr->port->type) {
        case NFP_PORT_PHYS_PORT:
-               eth_port = __nfp_port_get_eth_port(repr->port);
-               if (!eth_port)
+               if (!__nfp_port_get_eth_port(repr->port))
                        break;
-               nfp_repr_phy_port_get_stats64(app, eth_port->index, stats);
+               nfp_repr_phy_port_get_stats64(repr->port, stats);
                break;
        case NFP_PORT_PF_PORT:
                nfp_repr_pf_get_stats64(app, repr->port->pf_id, stats);

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.c b/drivers/net/ethernet/netronome/nfp/nfp_port.c
index 0cf65e57addbc87c651edd9021552f9c93bd72ab..34a6e035fe9a207a8ee6a2ebc18a54391e37d826 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.c
@@ -225,6 +225,9 @@ int nfp_port_init_phy_port(struct nfp_pf *pf, struct nfp_app *app,
 
        port->eth_port = &pf->eth_tbl->ports[id];
        port->eth_id = pf->eth_tbl->ports[id].index;
+       if (pf->mac_stats_mem)
+               port->eth_stats =
+                       pf->mac_stats_mem + port->eth_id * NFP_MAC_STATS_SIZE;
 
        return 0;
 }

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h
index 784d82c2f32c9124947e5a655ca84433e26992f5..cf71ac065e85f51713f0b36d55cbf3744108dae6 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h
@@ -76,6 +76,7 @@ enum nfp_port_flags {
  * @dl_port:   devlink port structure
  * @eth_id:    for %NFP_PORT_PHYS_PORT port ID in NFP enumeration scheme
  * @eth_port:  for %NFP_PORT_PHYS_PORT translated ETH Table port entry
+ * @eth_stats: for %NFP_PORT_PHYS_PORT MAC stats if available
  * @pf_id:     for %NFP_PORT_PF_PORT, %NFP_PORT_VF_PORT ID of the PCI PF (0-3)
  * @vf_id:     for %NFP_PORT_VF_PORT ID of the PCI VF within @pf_id
  * @port_list: entry on pf's list of ports
@@ -95,6 +96,7 @@ struct nfp_port {
                struct {
                        unsigned int eth_id;
                        struct nfp_eth_table_port *eth_port;
+                       u8 __iomem *eth_stats;
                };
                /* NFP_PORT_PF_PORT, NFP_PORT_VF_PORT */
                struct {