common/qat: support GEN2 device 200xx

[dpdk.git] / drivers / net / bnxt / bnxt_ring.h

diff --git a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h
index a5d5106..9913aed 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.h
+++ b/drivers/net/bnxt/bnxt_ring.h
@@ -65,7 +65,6 @@ struct bnxt_tx_ring_info;
 struct bnxt_rx_ring_info;
 struct bnxt_cp_ring_info;
 void bnxt_free_ring(struct bnxt_ring *ring);
-int bnxt_init_ring_grps(struct bnxt *bp);
 int bnxt_alloc_ring_grps(struct bnxt *bp);
 int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
                            struct bnxt_tx_queue *txq,
@@ -78,13 +77,17 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp);
 int bnxt_alloc_async_cp_ring(struct bnxt *bp);
 void bnxt_free_async_cp_ring(struct bnxt *bp);
 int bnxt_alloc_async_ring_struct(struct bnxt *bp);
+int bnxt_alloc_rxtx_nq_ring(struct bnxt *bp);
+void bnxt_free_rxtx_nq_ring(struct bnxt *bp);
 
 static inline void bnxt_db_write(struct bnxt_db_info *db, uint32_t idx)
 {
+       rte_cio_wmb();
+
        if (db->db_64)
                rte_write64_relaxed(db->db_key64 | idx, db->doorbell);
        else
-               rte_write32(db->db_key32 | idx, db->doorbell);
+               rte_write32_relaxed(db->db_key32 | idx, db->doorbell);
 }
 
 /* Ring an NQ doorbell and disable interrupts for the ring. */
@@ -93,10 +96,10 @@ static inline void bnxt_db_nq(struct bnxt_cp_ring_info *cpr)
        if (unlikely(!cpr->cp_db.db_64))
                return;
 
-       rte_smp_wmb();
-       rte_write64(cpr->cp_db.db_key64 | DBR_TYPE_NQ |
-                   RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons),
-                   cpr->cp_db.doorbell);
+       rte_cio_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);
 }
 
 /* Ring an NQ doorbell and enable interrupts for the ring. */
@@ -105,10 +108,10 @@ static inline void bnxt_db_nq_arm(struct bnxt_cp_ring_info *cpr)
        if (unlikely(!cpr->cp_db.db_64))
                return;
 
-       rte_smp_wmb();
-       rte_write64(cpr->cp_db.db_key64 | DBR_TYPE_NQ_ARM |
-                   RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons),
-                   cpr->cp_db.doorbell);
+       rte_cio_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);
 }
 
 static inline void bnxt_db_cq(struct bnxt_cp_ring_info *cpr)
@@ -116,9 +119,9 @@ 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);
 
-       rte_smp_wmb();
+       rte_compiler_barrier();
        if (db->db_64)
-               rte_write64(db->db_key64 | idx, db->doorbell);
+               rte_write64_relaxed(db->db_key64 | idx, db->doorbell);
        else
                B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
 }