New upstream version 16.11.3

[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 fc2e4cc..1cd031a 100644 (file)
--- a/drivers/net/enic/base/vnic_dev.c
+++ b/drivers/net/enic/base/vnic_dev.c
@@ -266,32 +266,35 @@ void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring)
        memset(ring->descs, 0, ring->size);
 }
 
-int vnic_dev_alloc_desc_ring(__attribute__((unused)) struct vnic_dev *vdev,
+int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev,
        struct vnic_dev_ring *ring,
-       unsigned int desc_count, unsigned int desc_size, unsigned int socket_id,
+       unsigned int desc_count, unsigned int desc_size,
+       __attribute__((unused)) unsigned int socket_id,
        char *z_name)
 {
-       const struct rte_memzone *rz;
+       void *alloc_addr = NULL;
+       dma_addr_t alloc_pa = 0;
 
        vnic_dev_desc_ring_size(ring, desc_count, desc_size);
-
-       rz = rte_memzone_reserve_aligned(z_name,
-               ring->size_unaligned, socket_id,
-               0, ENIC_ALIGN);
-       if (!rz) {
+       alloc_addr = vdev->alloc_consistent(vdev->priv,
+                                           ring->size_unaligned,
+                                           &alloc_pa, (u8 *)z_name);
+       if (!alloc_addr) {
                pr_err("Failed to allocate ring (size=%d), aborting\n",
                        (int)ring->size);
                return -ENOMEM;
        }
-
-       ring->descs_unaligned = rz->addr;
-       if (!ring->descs_unaligned) {
+       ring->descs_unaligned = alloc_addr;
+       if (!alloc_pa) {
                pr_err("Failed to map allocated ring (size=%d), aborting\n",
                        (int)ring->size);
+               vdev->free_consistent(vdev->priv,
+                                     ring->size_unaligned,
+                                     alloc_addr,
+                                     alloc_pa);
                return -ENOMEM;
        }
-
-       ring->base_addr_unaligned = (dma_addr_t)rz->phys_addr;
+       ring->base_addr_unaligned = alloc_pa;
 
        ring->base_addr = VNIC_ALIGN(ring->base_addr_unaligned,
                ring->base_align);
@@ -308,8 +311,13 @@ int vnic_dev_alloc_desc_ring(__attribute__((unused)) struct vnic_dev *vdev,
 void vnic_dev_free_desc_ring(__attribute__((unused))  struct vnic_dev *vdev,
        struct vnic_dev_ring *ring)
 {
-       if (ring->descs)
+       if (ring->descs) {
+               vdev->free_consistent(vdev->priv,
+                                     ring->size_unaligned,
+                                     ring->descs_unaligned,
+                                     ring->base_addr_unaligned);
                ring->descs = NULL;
+       }
 }
 
 static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
@@ -462,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;
@@ -625,7 +645,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;
 
@@ -999,20 +1019,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),
@@ -1026,12 +1055,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);
@@ -1039,7 +1068,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) {