nfp: allow retreiving management FW logs on representors

Users should be able to dump the management FW logs on any
of the driver's netdevs.  Make the code only depend on the
nfp_app and share it between vNICs and representors.

Storing the dump flag is simply dropped for now, since we
only support the argument being set to 0.

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.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h
index b1fa77bd708b9c95747ee21f019879603dcc70b0..d51d8237b9844b7e3414263e452189c874b5a0a0 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h
@@ -573,7 +573,6 @@ struct nfp_net_dp {
  * @tx_bar:             Pointer to mapped TX queues
  * @rx_bar:             Pointer to mapped FL/RX queues
  * @debugfs_dir:       Device directory in debugfs
- * @ethtool_dump_flag: Ethtool dump flag
  * @vnic_list:         Entry on device vNIC list
  * @pdev:              Backpointer to PCI device
  * @app:               APP handle if available
@@ -640,7 +639,6 @@ struct nfp_net {
        u8 __iomem *rx_bar;
 
        struct dentry *debugfs_dir;
-       u32 ethtool_dump_flag;
 
        struct list_head vnic_list;
 

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index 3c34c8b27dcf3ad78d1ea01ad45c607f05b48491..289fa318a6513ac8c9b45b51df1b07df0019d41d 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -727,18 +727,18 @@ static int nfp_net_get_coalesce(struct net_device *netdev,
 /* Other debug dumps
  */
 static int
-nfp_dump_nsp_diag(struct nfp_net *nn, struct ethtool_dump *dump, void *buffer)
+nfp_dump_nsp_diag(struct nfp_app *app, struct ethtool_dump *dump, void *buffer)
 {
        struct nfp_resource *res;
        int ret;
 
-       if (!nn->app)
+       if (!app)
                return -EOPNOTSUPP;
 
        dump->version = 1;
        dump->flag = NFP_DUMP_NSP_DIAG;
 
-       res = nfp_resource_acquire(nn->app->cpp, NFP_RESOURCE_NSP_DIAG);
+       res = nfp_resource_acquire(app->cpp, NFP_RESOURCE_NSP_DIAG);
        if (IS_ERR(res))
                return PTR_ERR(res);
 
@@ -748,7 +748,7 @@ nfp_dump_nsp_diag(struct nfp_net *nn, struct ethtool_dump *dump, void *buffer)
                        goto exit_release;
                }
 
-               ret = nfp_cpp_read(nn->app->cpp, nfp_resource_cpp_id(res),
+               ret = nfp_cpp_read(app->cpp, nfp_resource_cpp_id(res),
                                   nfp_resource_address(res),
                                   buffer, dump->len);
                if (ret != dump->len)
@@ -765,32 +765,30 @@ exit_release:
        return ret;
 }
 
-static int nfp_net_set_dump(struct net_device *netdev, struct ethtool_dump *val)
+static int nfp_app_set_dump(struct net_device *netdev, struct ethtool_dump *val)
 {
-       struct nfp_net *nn = netdev_priv(netdev);
+       struct nfp_app *app = nfp_app_from_netdev(netdev);
 
-       if (!nn->app)
+       if (!app)
                return -EOPNOTSUPP;
 
        if (val->flag != NFP_DUMP_NSP_DIAG)
                return -EINVAL;
 
-       nn->ethtool_dump_flag = val->flag;
-
        return 0;
 }
 
 static int
-nfp_net_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump)
+nfp_app_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump)
 {
-       return nfp_dump_nsp_diag(netdev_priv(netdev), dump, NULL);
+       return nfp_dump_nsp_diag(nfp_app_from_netdev(netdev), dump, NULL);
 }
 
 static int
-nfp_net_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
+nfp_app_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
                      void *buffer)
 {
-       return nfp_dump_nsp_diag(netdev_priv(netdev), dump, buffer);
+       return nfp_dump_nsp_diag(nfp_app_from_netdev(netdev), dump, buffer);
 }
 
 static int nfp_net_set_coalesce(struct net_device *netdev,
@@ -947,9 +945,9 @@ static const struct ethtool_ops nfp_net_ethtool_ops = {
        .set_rxfh               = nfp_net_set_rxfh,
        .get_regs_len           = nfp_net_get_regs_len,
        .get_regs               = nfp_net_get_regs,
-       .set_dump               = nfp_net_set_dump,
-       .get_dump_flag          = nfp_net_get_dump_flag,
-       .get_dump_data          = nfp_net_get_dump_data,
+       .set_dump               = nfp_app_set_dump,
+       .get_dump_flag          = nfp_app_get_dump_flag,
+       .get_dump_data          = nfp_app_get_dump_data,
        .get_coalesce           = nfp_net_get_coalesce,
        .set_coalesce           = nfp_net_set_coalesce,
        .get_channels           = nfp_net_get_channels,
@@ -961,6 +959,9 @@ static const struct ethtool_ops nfp_net_ethtool_ops = {
 const struct ethtool_ops nfp_port_ethtool_ops = {
        .get_drvinfo            = nfp_app_get_drvinfo,
        .get_link               = ethtool_op_get_link,
+       .set_dump               = nfp_app_set_dump,
+       .get_dump_flag          = nfp_app_get_dump_flag,
+       .get_dump_data          = nfp_app_get_dump_data,
 };
 
 void nfp_net_set_ethtool_ops(struct net_device *netdev)