liquidio: Configure switchdev with devlink

Enable and disable switchdev on SRIOV capable LiquidIO NIC with devlink.
Create representor netdev for each SRIOV VF function on SRIOV enable and
and do the cleanup on SRIOV disable.

Signed-off-by: Vijaya Mohan Guvva <vijaya.guvva@cavium.com>
Signed-off-by: Satanand Burla <satananda.burla@cavium.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig
index dcbce6cac63e2db7a936a7feea312b25ba3f2421..63be75eb34d2b6509870838dab66aa5fb4d098bb 100644 (file)
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@ -53,6 +53,7 @@ config        THUNDER_NIC_RGX
 config LIQUIDIO
        tristate "Cavium LiquidIO support"
        depends on 64BIT
+       depends on MAY_USE_DEVLINK
        imply PTP_1588_CLOCK
        select FW_LOADER
        select LIBCRC32C

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 80784122e6e9a95b7d240de6028e16d13d93c079..f27f0afd0ecf1a7786ad396e3348e97bae7d879d 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -35,6 +35,7 @@
 #include "cn68xx_device.h"
 #include "cn23xx_pf_device.h"
 #include "liquidio_image.h"
+#include "lio_vf_rep.h"
 
 MODULE_AUTHOR("Cavium Networks, <support@cavium.com>");
 MODULE_DESCRIPTION("Cavium LiquidIO Intelligent Server Adapter Driver");
@@ -1603,6 +1604,8 @@ static int liquidio_stop_nic_module(struct octeon_device *oct)
        oct->cmd_resp_state = OCT_DRV_OFFLINE;
        spin_unlock_bh(&oct->cmd_resp_wqlock);
 
+       lio_vf_rep_destroy(oct);
+
        for (i = 0; i < oct->ifcount; i++) {
                lio = GET_LIO(oct->props[i].netdev);
                for (j = 0; j < oct->num_oqs; j++)
@@ -1613,6 +1616,12 @@ static int liquidio_stop_nic_module(struct octeon_device *oct)
        for (i = 0; i < oct->ifcount; i++)
                liquidio_destroy_nic_device(oct, i);
 
+       if (oct->devlink) {
+               devlink_unregister(oct->devlink);
+               devlink_free(oct->devlink);
+               oct->devlink = NULL;
+       }
+
        dev_dbg(&oct->pci_dev->dev, "Network interfaces stopped\n");
        return 0;
 }
@@ -3310,10 +3319,67 @@ static int liquidio_set_vf_link_state(struct net_device *netdev, int vfidx,
        return 0;
 }
 
+static int
+liquidio_eswitch_mode_get(struct devlink *devlink, u16 *mode)
+{
+       struct lio_devlink_priv *priv;
+       struct octeon_device *oct;
+
+       priv = devlink_priv(devlink);
+       oct = priv->oct;
+
+       *mode = oct->eswitch_mode;
+
+       return 0;
+}
+
+static int
+liquidio_eswitch_mode_set(struct devlink *devlink, u16 mode)
+{
+       struct lio_devlink_priv *priv;
+       struct octeon_device *oct;
+       int ret = 0;
+
+       priv = devlink_priv(devlink);
+       oct = priv->oct;
+
+       if (!(oct->fw_info.app_cap_flags & LIQUIDIO_SWITCHDEV_CAP))
+               return -EINVAL;
+
+       if (oct->eswitch_mode == mode)
+               return 0;
+
+       switch (mode) {
+       case DEVLINK_ESWITCH_MODE_SWITCHDEV:
+               oct->eswitch_mode = mode;
+               ret = lio_vf_rep_create(oct);
+               break;
+
+       case DEVLINK_ESWITCH_MODE_LEGACY:
+               lio_vf_rep_destroy(oct);
+               oct->eswitch_mode = mode;
+               break;
+
+       default:
+               ret = -EINVAL;
+       }
+
+       return ret;
+}
+
+static const struct devlink_ops liquidio_devlink_ops = {
+       .eswitch_mode_get = liquidio_eswitch_mode_get,
+       .eswitch_mode_set = liquidio_eswitch_mode_set,
+};
+
 static int
 lio_pf_switchdev_attr_get(struct net_device *dev, struct switchdev_attr *attr)
 {
        struct lio *lio = GET_LIO(dev);
+       struct octeon_device *oct = lio->oct_dev;
+
+       if (oct->eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)
+               return -EOPNOTSUPP;
 
        switch (attr->id) {
        case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:
@@ -3462,6 +3528,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
        u32 resp_size, ctx_size, data_size;
        u32 ifidx_or_pfnum;
        struct lio_version *vdata;
+       struct devlink *devlink;
+       struct lio_devlink_priv *lio_devlink;
 
        /* This is to handle link status changes */
        octeon_register_dispatch_fn(octeon_dev, OPCODE_NIC,
@@ -3794,6 +3862,26 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                octeon_free_soft_command(octeon_dev, sc);
        }
 
+       devlink = devlink_alloc(&liquidio_devlink_ops,
+                               sizeof(struct lio_devlink_priv));
+       if (!devlink) {
+               dev_err(&octeon_dev->pci_dev->dev, "devlink alloc failed\n");
+               goto setup_nic_wait_intr;
+       }
+
+       lio_devlink = devlink_priv(devlink);
+       lio_devlink->oct = octeon_dev;
+
+       if (devlink_register(devlink, &octeon_dev->pci_dev->dev)) {
+               devlink_free(devlink);
+               dev_err(&octeon_dev->pci_dev->dev,
+                       "devlink registration failed\n");
+               goto setup_nic_wait_intr;
+       }
+
+       octeon_dev->devlink = devlink;
+       octeon_dev->eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY;
+
        return 0;
 
 setup_nic_dev_fail:
@@ -3888,6 +3976,7 @@ static int liquidio_enable_sriov(struct pci_dev *dev, int num_vfs)
        }
 
        if (!num_vfs) {
+               lio_vf_rep_destroy(oct);
                ret = lio_pci_sriov_disable(oct);
        } else if (num_vfs > oct->sriov_info.max_vfs) {
                dev_err(&oct->pci_dev->dev,
@@ -3899,6 +3988,10 @@ static int liquidio_enable_sriov(struct pci_dev *dev, int num_vfs)
                ret = octeon_enable_sriov(oct);
                dev_info(&oct->pci_dev->dev, "oct->pf_num:%d num_vfs:%d\n",
                         oct->pf_num, num_vfs);
+               ret = lio_vf_rep_create(oct);
+               if (ret)
+                       dev_info(&oct->pci_dev->dev,
+                                "vf representor create failed");
        }
 
        return ret;

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
index 67ff7a143e9ecce9fc63e56aceea352bbb32cb07..de0c80d150f36e06af8b085d19824222b6e5b555 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
@@ -515,6 +515,9 @@ lio_vf_rep_create(struct octeon_device *oct)
        struct net_device *ndev;
        int i, num_vfs;
 
+       if (oct->eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)
+               return 0;
+
        if (!oct->sriov_info.sriov_enabled)
                return 0;
 
@@ -599,6 +602,9 @@ lio_vf_rep_destroy(struct octeon_device *oct)
        struct net_device *ndev;
        int i;
 
+       if (oct->eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)
+               return;
+
        if (!oct->sriov_info.sriov_enabled)
                return;
 

diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
index 3aceb78caa8696db93c16c72b99e7345e5f51b08..441cc78faff1fa0f9b97a1c5779f25cb286c606d 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
+++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
@@ -114,6 +114,7 @@ enum octeon_tag_type {
 
 /* App specific capabilities from firmware to pf driver */
 #define LIQUIDIO_TIME_SYNC_CAP 0x1
+#define LIQUIDIO_SWITCHDEV_CAP 0x2
 
 static inline u32 incr_index(u32 index, u32 count, u32 max)
 {

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.h b/drivers/net/ethernet/cavium/liquidio/octeon_device.h
index c97e067a89743804dc643ee19f7eaace85a52aaa..63b0c758a0a68f6a481a5e6f3d77bb2eddff8ff3 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_device.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.h
@@ -23,6 +23,7 @@
 #define  _OCTEON_DEVICE_H_
 
 #include <linux/interrupt.h>
+#include <net/devlink.h>
 
 /** PCI VendorId Device Id */
 #define  OCTEON_CN68XX_PCIID          0x91177d
@@ -396,6 +397,10 @@ struct lio_vf_rep_list {
        struct net_device *ndev[CN23XX_MAX_VFS_PER_PF];
 };
 
+struct lio_devlink_priv {
+       struct octeon_device *oct;
+};
+
 /** The Octeon device.
  *  Each Octeon device has this structure to represent all its
  *  components.
@@ -575,6 +580,8 @@ struct octeon_device {
        bool ptp_enable;
 
        struct lio_vf_rep_list vf_rep_list;
+       struct devlink *devlink;
+       enum devlink_eswitch_mode eswitch_mode;
 };
 
 #define  OCT_DRV_ONLINE 1