git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/enic: consolidate and remove some defines
[dpdk.git]
/
drivers
/
net
/
enic
/
base
/
vnic_rq.c
diff --git
a/drivers/net/enic/base/vnic_rq.c
b/drivers/net/enic/base/vnic_rq.c
index
3956d4f
..
1af96a9
100644
(file)
--- a/
drivers/net/enic/base/vnic_rq.c
+++ b/
drivers/net/enic/base/vnic_rq.c
@@
-47,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)
{
unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset)
{
- u
64
paddr;
+ u
int64_t
paddr;
unsigned int count = rq->ring.desc_count;
unsigned int count = rq->ring.desc_count;
- paddr = (u
64
)rq->ring.base_addr | VNIC_PADDR_TARGET;
+ paddr = (u
int64_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);
writeq(paddr, &rq->ctrl->ring_base);
iowrite32(count, &rq->ctrl->ring_size);
iowrite32(cq_index, &rq->ctrl->cq_index);
@@
-70,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)
{
unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset)
{
- u
32
fetch_index = 0;
+ u
int32_t
fetch_index = 0;
/* Use current fetch_index as the ring starting point */
fetch_index = ioread32(&rq->ctrl->fetch_index);
/* Use current fetch_index as the ring starting point */
fetch_index = ioread32(&rq->ctrl->fetch_index);
@@
-110,7
+110,7
@@
int vnic_rq_disable(struct vnic_rq *rq)
for (wait = 0; wait < 1000; wait++) {
if (!(ioread32(&rq->ctrl->running)))
return 0;
for (wait = 0; wait < 1000; wait++) {
if (!(ioread32(&rq->ctrl->running)))
return 0;
- u
delay
(10);
+ u
sleep
(10);
}
pr_err("Failed to disable RQ[%d]\n", rq->index);
}
pr_err("Failed to disable RQ[%d]\n", rq->index);
@@
-122,7
+122,7
@@
void vnic_rq_clean(struct vnic_rq *rq,
void (*buf_clean)(struct rte_mbuf **buf))
{
struct rte_mbuf **buf;
void (*buf_clean)(struct rte_mbuf **buf))
{
struct rte_mbuf **buf;
- u
32
fetch_index, i;
+ u
int32_t
fetch_index, i;
unsigned int count = rq->ring.desc_count;
buf = &rq->mbuf_ring[0];
unsigned int count = rq->ring.desc_count;
buf = &rq->mbuf_ring[0];