Merge branch 'upstream-16.11-stable' into 16.11.x

[deb_dpdk.git] / drivers / net / enic / base / vnic_dev.c

diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c
index 4db21a4..6e33c84 100644 (file)
--- a/drivers/net/enic/base/vnic_dev.c
+++ b/drivers/net/enic/base/vnic_dev.c
@@ -470,6 +470,18 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
        }
 }
 
+int vnic_dev_capable_adv_filters(struct vnic_dev *vdev)
+{
+       u64 a0 = (u32)CMD_ADD_ADV_FILTER, a1 = 0;
+       int wait = 1000;
+       int err;
+
+       err = vnic_dev_cmd(vdev, CMD_CAPABILITY, &a0, &a1, wait);
+       if (err)
+               return 0;
+       return (a1 >= (u32)FILTER_DPDK_1);
+}
+
 static int vnic_dev_capable(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd)
 {
        u64 a0 = (u32)cmd, a1 = 0;
@@ -526,17 +538,9 @@ int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats)
 {
        u64 a0, a1;
        int wait = 1000;
-       static u32 instance;
-       char name[NAME_MAX];
 
-       if (!vdev->stats) {
-               snprintf((char *)name, sizeof(name),
-                       "vnic_stats-%d", instance++);
-               vdev->stats = vdev->alloc_consistent(vdev->priv,
-                       sizeof(struct vnic_stats), &vdev->stats_pa, (u8 *)name);
-               if (!vdev->stats)
-                       return -ENOMEM;
-       }
+       if (!vdev->stats)
+               return -ENOMEM;
 
        *stats = vdev->stats;
        a0 = vdev->stats_pa;
@@ -633,7 +637,7 @@ int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done)
 
 int vnic_dev_get_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)
 {
-       u64 a0, a1 = 0;
+       u64 a0 = 0, a1 = 0;
        int wait = 1000;
        int err, i;
 
@@ -928,6 +932,18 @@ u32 vnic_dev_get_intr_coal_timer_max(struct vnic_dev *vdev)
        return vdev->intr_coal_timer_info.max_usec;
 }
 
+int vnic_dev_alloc_stats_mem(struct vnic_dev *vdev)
+{
+       char name[NAME_MAX];
+       static u32 instance;
+
+       snprintf((char *)name, sizeof(name), "vnic_stats-%u", instance++);
+       vdev->stats = vdev->alloc_consistent(vdev->priv,
+                                            sizeof(struct vnic_stats),
+                                            &vdev->stats_pa, (u8 *)name);
+       return vdev->stats == NULL ? -ENOMEM : 0;
+}
+
 void vnic_dev_unregister(struct vnic_dev *vdev)
 {
        if (vdev) {
@@ -1007,20 +1023,29 @@ int vnic_dev_set_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)
  * @data: filter data
  */
 int vnic_dev_classifier(struct vnic_dev *vdev, u8 cmd, u16 *entry,
-       struct filter *data)
+       struct filter_v2 *data)
 {
-       u64 a0, a1;
+       u64 a0 = 0, a1 = 0;
        int wait = 1000;
        dma_addr_t tlv_pa;
        int ret = -EINVAL;
        struct filter_tlv *tlv, *tlv_va;
        struct filter_action *action;
        u64 tlv_size;
+       u32 filter_size;
        static unsigned int unique_id;
        char z_name[RTE_MEMZONE_NAMESIZE];
+       enum vnic_devcmd_cmd dev_cmd;
+
 
        if (cmd == CLSF_ADD) {
-               tlv_size = sizeof(struct filter) +
+               if (data->type == FILTER_DPDK_1)
+                       dev_cmd = CMD_ADD_ADV_FILTER;
+               else
+                       dev_cmd = CMD_ADD_FILTER;
+
+               filter_size = vnic_filter_size(data);
+               tlv_size = filter_size +
                    sizeof(struct filter_action) +
                    2*sizeof(struct filter_tlv);
                snprintf((char *)z_name, sizeof(z_name),
@@ -1034,12 +1059,12 @@ int vnic_dev_classifier(struct vnic_dev *vdev, u8 cmd, u16 *entry,
                a1 = tlv_size;
                memset(tlv, 0, tlv_size);
                tlv->type = CLSF_TLV_FILTER;
-               tlv->length = sizeof(struct filter);
-               *(struct filter *)&tlv->val = *data;
+               tlv->length = filter_size;
+               memcpy(&tlv->val, (void *)data, filter_size);
 
                tlv = (struct filter_tlv *)((char *)tlv +
                                         sizeof(struct filter_tlv) +
-                                        sizeof(struct filter));
+                                        filter_size);
 
                tlv->type = CLSF_TLV_ACTION;
                tlv->length = sizeof(struct filter_action);
@@ -1047,7 +1072,7 @@ int vnic_dev_classifier(struct vnic_dev *vdev, u8 cmd, u16 *entry,
                action->type = FILTER_ACTION_RQ_STEERING;
                action->u.rq_idx = *entry;
 
-               ret = vnic_dev_cmd(vdev, CMD_ADD_FILTER, &a0, &a1, wait);
+               ret = vnic_dev_cmd(vdev, dev_cmd, &a0, &a1, wait);
                *entry = (u16)a0;
                vdev->free_consistent(vdev->priv, tlv_size, tlv_va, tlv_pa);
        } else if (cmd == CLSF_DEL) {