New upstream version 17.11-rc3

[deb_dpdk.git] / drivers / net / bnxt / bnxt_cpr.h

diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h
index a6e8785..ce2b0cb 100644 (file)
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -41,6 +41,9 @@
        (!!(((struct cmpl_base *)(cmp))->info3_v & CMPL_BASE_V) ==      \
         !((raw_cons) & ((ring)->ring_size)))
 
+#define CMPL_VALID(cmp, v)                                             \
+       (!!(((struct cmpl_base *)(cmp))->info3_v & CMPL_BASE_V) == !(v))
+
 #define CMP_TYPE(cmp)                                          \
        (((struct cmpl_base *)cmp)->type & CMPL_BASE_TYPE_MASK)
 
@@ -48,6 +51,7 @@
 #define NEXT_RAW_CMP(idx)      ADV_RAW_CMP(idx, 1)
 #define RING_CMP(ring, idx)    ((idx) & (ring)->ring_mask)
 #define NEXT_CMP(idx)          RING_CMP(ADV_RAW_CMP(idx, 1))
+#define FLIP_VALID(cons, mask, val)    ((cons) >= (mask) ? !(val) : (val))
 
 #define DB_CP_REARM_FLAGS      (DB_KEY_CP | DB_IDX_VALID)
 #define DB_CP_FLAGS            (DB_KEY_CP | DB_IDX_VALID | DB_IRQ_DIS)
@@ -82,15 +86,15 @@ struct bnxt_cp_ring_info {
 
        struct cmpl_base        *cp_desc_ring;
 
-       phys_addr_t             cp_desc_mapping;
+       rte_iova_t              cp_desc_mapping;
 
        struct ctx_hw_stats     *hw_stats;
-       phys_addr_t             hw_stats_map;
+       rte_iova_t              hw_stats_map;
        uint32_t                hw_stats_ctx_id;
 
        struct bnxt_ring        *cp_ring_struct;
        uint16_t                cp_cons;
-       bool                    v;
+       bool                    valid;
 };
 
 #define RX_CMP_L2_ERRORS                                               \