examples/ipsec-secgw: fix session mempool initialisation

[dpdk.git] / drivers / net / enic / base / vnic_cq.c

diff --git a/drivers/net/enic/base/vnic_cq.c b/drivers/net/enic/base/vnic_cq.c
index 2f65f35..51d6fd3 100644 (file)
--- a/drivers/net/enic/base/vnic_cq.c
+++ b/drivers/net/enic/base/vnic_cq.c
@@ -1,49 +1,11 @@
-/*
- * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2008-2017 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
- *
- * Copyright (c) 2014, Cisco Systems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
  */
 
 #include "vnic_dev.h"
 #include "vnic_cq.h"
-
-int vnic_cq_mem_size(struct vnic_cq *cq, unsigned int desc_count,
-       unsigned int desc_size)
-{
-       int mem_size;
-
-       mem_size = vnic_dev_desc_ring_size(&cq->ring, desc_count, desc_size);
-
-       return mem_size;
-}
+#include <rte_memzone.h>
 
 void vnic_cq_free(struct vnic_cq *cq)
 {
@@ -57,7 +19,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
        unsigned int desc_count, unsigned int desc_size)
 {
        int err;
-       char res_name[NAME_MAX];
+       char res_name[RTE_MEMZONE_NAMESIZE];
        static int instance;
 
        cq->index = index;
@@ -65,11 +27,11 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
 
        cq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_CQ, index);
        if (!cq->ctrl) {
-               pr_err("Failed to hook CQ[%d] resource\n", index);
+               pr_err("Failed to hook CQ[%u] resource\n", index);
                return -EINVAL;
        }
 
-       snprintf(res_name, sizeof(res_name), "%d-cq-%d", instance++, index);
+       snprintf(res_name, sizeof(res_name), "%d-cq-%u", instance++, index);
        err = vnic_dev_alloc_desc_ring(vdev, &cq->ring, desc_count, desc_size,
                socket_id, res_name);
        if (err)
@@ -82,11 +44,11 @@ void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,
        unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,
        unsigned int cq_tail_color, unsigned int interrupt_enable,
        unsigned int cq_entry_enable, unsigned int cq_message_enable,
-       unsigned int interrupt_offset, u64 cq_message_addr)
+       unsigned int interrupt_offset, uint64_t cq_message_addr)
 {
-       u64 paddr;
+       uint64_t paddr;
 
-       paddr = (u64)cq->ring.base_addr | VNIC_PADDR_TARGET;
+       paddr = (uint64_t)cq->ring.base_addr | VNIC_PADDR_TARGET;
        writeq(paddr, &cq->ctrl->ring_base);
        iowrite32(cq->ring.desc_count, &cq->ctrl->ring_size);
        iowrite32(flow_control_enable, &cq->ctrl->flow_control_enable);