update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / bnxt / bnxt_ring.h

diff --git a/ceph/src/spdk/dpdk/drivers/net/bnxt/bnxt_ring.h b/ceph/src/spdk/dpdk/drivers/net/bnxt/bnxt_ring.h
index 1446d784f6e9107787b1a8fe7d38752c6efc2d96..48a39d78845a30a836d46c36a68553ffeafc67f9 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/bnxt/bnxt_ring.h
+++ b/ceph/src/spdk/dpdk/drivers/net/bnxt/bnxt_ring.h
@@ -10,7 +10,8 @@
 
 #include <rte_memory.h>
 
-#define RING_NEXT(ring, idx)           (((idx) + 1) & (ring)->ring_mask)
+#define RING_ADV(ring, idx, n)         (((idx) + (n)) & (ring)->ring_mask)
+#define RING_NEXT(ring, idx)           RING_ADV(ring, idx, 1)
 
 #define DB_IDX_MASK                                            0xffffff
 #define DB_IDX_VALID                                           (0x1 << 26)
@@ -26,7 +27,6 @@
 #define DEFAULT_RX_RING_SIZE   256
 #define DEFAULT_TX_RING_SIZE   256
 
-#define BNXT_TPA_MAX           64
 #define AGG_RING_SIZE_FACTOR   2
 #define AGG_RING_MULTIPLIER    2
 
@@ -48,6 +48,7 @@ struct bnxt_ring {
        void                    **vmem;
 
        uint16_t                fw_ring_id; /* Ring id filled by Chimp FW */
+       uint16_t                fw_rx_ring_id;
        const void              *mem_zone;
 };
 
@@ -64,13 +65,63 @@ 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,
                            struct bnxt_rx_queue *rxq,
                            struct bnxt_cp_ring_info *cp_ring_info,
+                           struct bnxt_cp_ring_info *nq_ring_info,
                            const char *suffix);
 int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index);
 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)
+{
+       if (db->db_64)
+               rte_write64_relaxed(db->db_key64 | idx, db->doorbell);
+       else
+               rte_write32(db->db_key32 | idx, db->doorbell);
+}
+
+/* Ring an NQ doorbell and disable interrupts for the ring. */
+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);
+}
+
+/* Ring an NQ doorbell and enable interrupts for the ring. */
+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);
+}
+
+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();
+       if (db->db_64)
+               rte_write64(db->db_key64 | idx, db->doorbell);
+       else
+               B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
+}
 
 #endif