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
examples/ipsec-secgw: fix session mempool initialisation
[dpdk.git]
/
drivers
/
net
/
enic
/
base
/
cq_desc.h
diff --git
a/drivers/net/enic/base/cq_desc.h
b/drivers/net/enic/base/cq_desc.h
index
ae8847c
..
7151353
100644
(file)
--- a/
drivers/net/enic/base/cq_desc.h
+++ b/
drivers/net/enic/base/cq_desc.h
@@
-5,6
+5,7
@@
#ifndef _CQ_DESC_H_
#define _CQ_DESC_H_
#ifndef _CQ_DESC_H_
#define _CQ_DESC_H_
+#include <rte_byteorder.h>
/*
* Completion queue descriptor types
/*
* Completion queue descriptor types
@@
-24,14
+25,14
@@
enum cq_desc_types {
/* Completion queue descriptor: 16B
*
* All completion queues have this basic layout. The
/* Completion queue descriptor: 16B
*
* All completion queues have this basic layout. The
- * type_specfic area is unique for each completion
+ * type_spec
i
fic area is unique for each completion
* queue type.
*/
struct cq_desc {
* queue type.
*/
struct cq_desc {
-
__le16
completed_index;
-
__le16
q_number;
- u
8 type_spec
fic[11];
- u
8
type_color;
+
uint16_t
completed_index;
+
uint16_t
q_number;
+ u
int8_t type_speci
fic[11];
+ u
int8_t
type_color;
};
#define CQ_DESC_TYPE_BITS 4
};
#define CQ_DESC_TYPE_BITS 4
@@
-44,7
+45,7
@@
struct cq_desc {
#define CQ_DESC_COMP_NDX_BITS 12
#define CQ_DESC_COMP_NDX_MASK ((1 << CQ_DESC_COMP_NDX_BITS) - 1)
#define CQ_DESC_COMP_NDX_BITS 12
#define CQ_DESC_COMP_NDX_MASK ((1 << CQ_DESC_COMP_NDX_BITS) - 1)
-static inline void cq_color_enc(struct cq_desc *desc, const u
8
color)
+static inline void cq_color_enc(struct cq_desc *desc, const u
int8_t
color)
{
if (color)
desc->type_color |= (1 << CQ_DESC_COLOR_SHIFT);
{
if (color)
desc->type_color |= (1 << CQ_DESC_COLOR_SHIFT);
@@
-53,21
+54,22
@@
static inline void cq_color_enc(struct cq_desc *desc, const u8 color)
}
static inline void cq_desc_enc(struct cq_desc *desc,
}
static inline void cq_desc_enc(struct cq_desc *desc,
- const u
8 type, const u8 color, const u16
q_number,
- const u
16
completed_index)
+ const u
int8_t type, const uint8_t color, const uint16_t
q_number,
+ const u
int16_t
completed_index)
{
desc->type_color = (type & CQ_DESC_TYPE_MASK) |
((color & CQ_DESC_COLOR_MASK) << CQ_DESC_COLOR_SHIFT);
{
desc->type_color = (type & CQ_DESC_TYPE_MASK) |
((color & CQ_DESC_COLOR_MASK) << CQ_DESC_COLOR_SHIFT);
- desc->q_number =
cpu_to_le
16(q_number & CQ_DESC_Q_NUM_MASK);
- desc->completed_index =
cpu_to_le
16(completed_index &
+ desc->q_number =
rte_cpu_to_le_
16(q_number & CQ_DESC_Q_NUM_MASK);
+ desc->completed_index =
rte_cpu_to_le_
16(completed_index &
CQ_DESC_COMP_NDX_MASK);
}
static inline void cq_desc_dec(const struct cq_desc *desc_arg,
CQ_DESC_COMP_NDX_MASK);
}
static inline void cq_desc_dec(const struct cq_desc *desc_arg,
- u8 *type, u8 *color, u16 *q_number, u16 *completed_index)
+ uint8_t *type, uint8_t *color, uint16_t *q_number,
+ uint16_t *completed_index)
{
const struct cq_desc *desc = desc_arg;
{
const struct cq_desc *desc = desc_arg;
- const u
8
type_color = desc->type_color;
+ const u
int8_t
type_color = desc->type_color;
*color = (type_color >> CQ_DESC_COLOR_SHIFT) & CQ_DESC_COLOR_MASK;
*color = (type_color >> CQ_DESC_COLOR_SHIFT) & CQ_DESC_COLOR_MASK;
@@
-79,15
+81,15
@@
static inline void cq_desc_dec(const struct cq_desc *desc_arg,
* result in reading stale values.
*/
* result in reading stale values.
*/
- rmb();
+ r
te_r
mb();
*type = type_color & CQ_DESC_TYPE_MASK;
*type = type_color & CQ_DESC_TYPE_MASK;
- *q_number =
le16_to_cpu
(desc->q_number) & CQ_DESC_Q_NUM_MASK;
- *completed_index =
le16_to_cpu
(desc->completed_index) &
+ *q_number =
rte_le_to_cpu_16
(desc->q_number) & CQ_DESC_Q_NUM_MASK;
+ *completed_index =
rte_le_to_cpu_16
(desc->completed_index) &
CQ_DESC_COMP_NDX_MASK;
}
CQ_DESC_COMP_NDX_MASK;
}
-static inline void cq_color_dec(const struct cq_desc *desc_arg, u
8
*color)
+static inline void cq_color_dec(const struct cq_desc *desc_arg, u
int8_t
*color)
{
volatile const struct cq_desc *desc = desc_arg;
{
volatile const struct cq_desc *desc = desc_arg;