update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / enic / base / vnic_rq.c

diff --git a/ceph/src/spdk/dpdk/drivers/net/enic/base/vnic_rq.c b/ceph/src/spdk/dpdk/drivers/net/enic/base/vnic_rq.c
index 72fcef556d571ee5642ea56d1ec52ead9ff8b456..1af96a94139bf201eccb13c1f989cb96a329299d 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/enic/base/vnic_rq.c
+++ b/ceph/src/spdk/dpdk/drivers/net/enic/base/vnic_rq.c
@@ -3,6 +3,7 @@
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  */
 
+#include <rte_memzone.h>
 #include "vnic_dev.h"
 #include "vnic_rq.h"
 
@@ -21,7 +22,7 @@ int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
        unsigned int desc_count, unsigned int desc_size)
 {
        int rc;
-       char res_name[NAME_MAX];
+       char res_name[RTE_MEMZONE_NAMESIZE];
        static int instance;
 
        rq->index = index;
@@ -46,10 +47,10 @@ void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
        unsigned int error_interrupt_enable,
        unsigned int error_interrupt_offset)
 {
-       u64 paddr;
+       uint64_t paddr;
        unsigned int count = rq->ring.desc_count;
 
-       paddr = (u64)rq->ring.base_addr | VNIC_PADDR_TARGET;
+       paddr = (uint64_t)rq->ring.base_addr | VNIC_PADDR_TARGET;
        writeq(paddr, &rq->ctrl->ring_base);
        iowrite32(count, &rq->ctrl->ring_size);
        iowrite32(cq_index, &rq->ctrl->cq_index);
@@ -69,7 +70,7 @@ void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
        unsigned int error_interrupt_enable,
        unsigned int error_interrupt_offset)
 {
-       u32 fetch_index = 0;
+       uint32_t fetch_index = 0;
 
        /* Use current fetch_index as the ring starting point */
        fetch_index = ioread32(&rq->ctrl->fetch_index);
@@ -109,7 +110,7 @@ int vnic_rq_disable(struct vnic_rq *rq)
        for (wait = 0; wait < 1000; wait++) {
                if (!(ioread32(&rq->ctrl->running)))
                        return 0;
-               udelay(10);
+               usleep(10);
        }
 
        pr_err("Failed to disable RQ[%d]\n", rq->index);
@@ -121,7 +122,7 @@ void vnic_rq_clean(struct vnic_rq *rq,
        void (*buf_clean)(struct rte_mbuf **buf))
 {
        struct rte_mbuf **buf;
-       u32 fetch_index, i;
+       uint32_t fetch_index, i;
        unsigned int count = rq->ring.desc_count;
 
        buf = &rq->mbuf_ring[0];