#include <rte_memory.h>
-#define RING_ADV(ring, idx, n) (((idx) + (n)) & (ring)->ring_mask)
-#define RING_NEXT(ring, idx) RING_ADV(ring, idx, 1)
+#define RING_ADV(idx, n) ((idx) + (n))
+#define RING_NEXT(idx) RING_ADV(idx, 1)
+#define RING_IDX(ring, idx) ((idx) & (ring)->ring_mask)
#define DB_IDX_MASK 0xffffff
#define DB_IDX_VALID (0x1 << 26)
#define DEFAULT_RX_RING_SIZE 256
#define DEFAULT_TX_RING_SIZE 256
-#define AGG_RING_SIZE_FACTOR 2
+#define AGG_RING_SIZE_FACTOR 4
#define AGG_RING_MULTIPLIER 2
/* These assume 4k pages */
static inline void bnxt_db_write(struct bnxt_db_info *db, uint32_t idx)
{
- rte_io_wmb();
+ uint32_t db_idx = DB_RING_IDX(db, idx);
+ void *doorbell = db->doorbell;
- if (db->db_64)
- rte_write64_relaxed(db->db_key64 | idx, db->doorbell);
- else
- rte_write32_relaxed(db->db_key32 | idx, db->doorbell);
+ if (db->db_64) {
+ uint64_t key_idx = db->db_key64 | db_idx;
+
+ rte_write64(key_idx, doorbell);
+ } else {
+ uint32_t key_idx = db->db_key32 | db_idx;
+
+ rte_write32(key_idx, doorbell);
+ }
}
/* Ring an NQ doorbell and disable interrupts for the ring. */
static inline void bnxt_db_nq(struct bnxt_cp_ring_info *cpr)
{
+ uint32_t db_idx = DB_RING_IDX(&cpr->cp_db, cpr->cp_raw_cons);
+ uint64_t key_idx = cpr->cp_db.db_key64 | DBR_TYPE_NQ | db_idx;
+ void *doorbell = cpr->cp_db.doorbell;
+
+
if (unlikely(!cpr->cp_db.db_64))
return;
- rte_io_wmb();
- rte_write64_relaxed(cpr->cp_db.db_key64 | DBR_TYPE_NQ |
- RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons),
- cpr->cp_db.doorbell);
+ rte_write64(key_idx, doorbell);
}
/* Ring an NQ doorbell and enable interrupts for the ring. */
static inline void bnxt_db_nq_arm(struct bnxt_cp_ring_info *cpr)
{
+ uint32_t db_idx = DB_RING_IDX(&cpr->cp_db, cpr->cp_raw_cons);
+ uint64_t key_idx = cpr->cp_db.db_key64 | DBR_TYPE_NQ_ARM | db_idx;
+ void *doorbell = cpr->cp_db.doorbell;
+
if (unlikely(!cpr->cp_db.db_64))
return;
- rte_io_wmb();
- rte_write64_relaxed(cpr->cp_db.db_key64 | DBR_TYPE_NQ_ARM |
- RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons),
- cpr->cp_db.doorbell);
+ rte_write64(key_idx, doorbell);
}
static inline void bnxt_db_cq(struct bnxt_cp_ring_info *cpr)
{
struct bnxt_db_info *db = &cpr->cp_db;
- uint32_t idx = RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons);
+ uint32_t idx = DB_RING_IDX(&cpr->cp_db, cpr->cp_raw_cons);
+
+ if (db->db_64) {
+ uint64_t key_idx = db->db_key64 | idx;
+ void *doorbell = db->doorbell;
+
+ rte_compiler_barrier();
+ rte_write64_relaxed(key_idx, doorbell);
+ } else {
+ uint32_t cp_raw_cons = cpr->cp_raw_cons;
- rte_compiler_barrier();
- if (db->db_64)
- rte_write64_relaxed(db->db_key64 | idx, db->doorbell);
- else
- B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
+ rte_compiler_barrier();
+ B_CP_DIS_DB(cpr, cp_raw_cons);
+ }
}
#endif