RTE_BUILD_BUG_ON(sizeof(struct ionic_rx_mode_set_cmd) != 64);
RTE_BUILD_BUG_ON(sizeof(struct ionic_rx_filter_add_cmd) != 64);
RTE_BUILD_BUG_ON(sizeof(struct ionic_rx_filter_add_comp) != 16);
- RTE_BUILD_BUG_ON(sizeof(struct ionic_rx_filter_del_cmd) != 64);
/* RDMA commands */
RTE_BUILD_BUG_ON(sizeof(struct ionic_rdma_reset_cmd) != 64);
/* I/O */
RTE_BUILD_BUG_ON(sizeof(struct ionic_txq_desc) != 16);
- RTE_BUILD_BUG_ON(sizeof(struct ionic_txq_sg_desc) != 128);
+ RTE_BUILD_BUG_ON(sizeof(struct ionic_txq_sg_desc_v1) != 256);
RTE_BUILD_BUG_ON(sizeof(struct ionic_txq_comp) != 16);
RTE_BUILD_BUG_ON(sizeof(struct ionic_rxq_desc) != 16);
uint32_t port_info_sz;
};
-struct ionic_queue;
-struct ionic_desc_info;
+#define Q_NEXT_TO_POST(_q, _n) (((_q)->head_idx + (_n)) & ((_q)->size_mask))
+#define Q_NEXT_TO_SRVC(_q, _n) (((_q)->tail_idx + (_n)) & ((_q)->size_mask))
-typedef void (*desc_cb)(struct ionic_queue *q,
- uint32_t q_desc_index,
- uint32_t cq_desc_index,
- void *cb_arg, void *service_cb_arg);
-
-struct ionic_desc_info {
- desc_cb cb;
- void *cb_arg;
-};
+#define IONIC_INFO_IDX(_q, _i) (_i)
+#define IONIC_INFO_PTR(_q, _i) (&(_q)->info[IONIC_INFO_IDX((_q), _i)])
struct ionic_queue {
- struct ionic_dev *idev;
- struct ionic_lif *lif;
- struct ionic_cq *bound_cq;
- uint32_t index;
- uint32_t type;
- uint32_t hw_index;
- uint32_t hw_type;
+ uint16_t num_descs;
+ uint16_t head_idx;
+ uint16_t tail_idx;
+ uint16_t size_mask;
+ uint8_t type;
+ uint8_t hw_type;
void *base;
void *sg_base;
+ struct ionic_doorbell __iomem *db;
+ void **info;
+
+ uint32_t index;
+ uint32_t hw_index;
rte_iova_t base_pa;
rte_iova_t sg_base_pa;
- struct ionic_desc_info *info;
- uint32_t tail_idx;
- uint32_t head_idx;
- uint32_t num_descs;
- uint32_t desc_size;
- uint32_t sg_desc_size;
- uint32_t qid;
- uint32_t qtype;
- struct ionic_doorbell __iomem *db;
};
-#define IONIC_INTR_INDEX_NOT_ASSIGNED (-1)
-#define IONIC_INTR_NAME_MAX_SZ (32)
+#define IONIC_INTR_NONE (-1)
struct ionic_intr_info {
- char name[IONIC_INTR_NAME_MAX_SZ];
int index;
uint32_t vector;
struct ionic_intr __iomem *ctrl;
};
struct ionic_cq {
- struct ionic_lif *lif;
- struct ionic_queue *bound_q;
- uint32_t tail_idx;
- uint32_t num_descs;
- uint32_t desc_size;
+ uint16_t tail_idx;
+ uint16_t num_descs;
+ uint16_t size_mask;
bool done_color;
void *base;
rte_iova_t base_pa;
- struct ionic_intr_info *bound_intr;
-};
-
-/** ionic_admin_ctx - Admin command context.
- * @pending_work: Flag that indicates a completion.
- * @cmd: Admin command (64B) to be copied to the queue.
- * @comp: Admin completion (16B) copied from the queue.
- */
-struct ionic_admin_ctx {
- bool pending_work;
- union ionic_adminq_cmd cmd;
- union ionic_adminq_comp comp;
};
struct ionic_lif;
void ionic_dev_cmd_port_loopback(struct ionic_dev *idev,
uint8_t loopback_mode);
+void ionic_dev_cmd_queue_identify(struct ionic_dev *idev,
+ uint16_t lif_type, uint8_t qtype, uint8_t qver);
+
void ionic_dev_cmd_lif_identify(struct ionic_dev *idev, uint8_t type,
uint8_t ver);
-void ionic_dev_cmd_lif_init(struct ionic_dev *idev, uint16_t lif_index,
- rte_iova_t addr);
-void ionic_dev_cmd_lif_reset(struct ionic_dev *idev, uint16_t lif_index);
-void ionic_dev_cmd_adminq_init(struct ionic_dev *idev, struct ionic_qcq *qcq,
- uint16_t lif_index, uint16_t intr_index);
+void ionic_dev_cmd_lif_init(struct ionic_dev *idev, rte_iova_t addr);
+void ionic_dev_cmd_lif_reset(struct ionic_dev *idev);
+
+void ionic_dev_cmd_adminq_init(struct ionic_dev *idev, struct ionic_qcq *qcq);
struct ionic_doorbell __iomem *ionic_db_map(struct ionic_lif *lif,
struct ionic_queue *q);
-int ionic_db_page_num(struct ionic_lif *lif, int pid);
-int ionic_cq_init(struct ionic_lif *lif, struct ionic_cq *cq,
- struct ionic_intr_info *intr, uint32_t num_descs,
- size_t desc_size);
+int ionic_cq_init(struct ionic_cq *cq, uint16_t num_descs);
void ionic_cq_map(struct ionic_cq *cq, void *base, rte_iova_t base_pa);
-void ionic_cq_bind(struct ionic_cq *cq, struct ionic_queue *q);
-typedef bool (*ionic_cq_cb)(struct ionic_cq *cq, uint32_t cq_desc_index,
+typedef bool (*ionic_cq_cb)(struct ionic_cq *cq, uint16_t cq_desc_index,
void *cb_arg);
uint32_t ionic_cq_service(struct ionic_cq *cq, uint32_t work_to_do,
ionic_cq_cb cb, void *cb_arg);
-int ionic_q_init(struct ionic_lif *lif, struct ionic_dev *idev,
- struct ionic_queue *q, uint32_t index, uint32_t num_descs,
- size_t desc_size, size_t sg_desc_size);
+int ionic_q_init(struct ionic_queue *q, uint32_t index, uint16_t num_descs);
void ionic_q_map(struct ionic_queue *q, void *base, rte_iova_t base_pa);
void ionic_q_sg_map(struct ionic_queue *q, void *base, rte_iova_t base_pa);
-void ionic_q_flush(struct ionic_queue *q);
-void ionic_q_post(struct ionic_queue *q, bool ring_doorbell, desc_cb cb,
- void *cb_arg);
-uint32_t ionic_q_space_avail(struct ionic_queue *q);
-bool ionic_q_has_space(struct ionic_queue *q, uint32_t want);
-void ionic_q_service(struct ionic_queue *q, uint32_t cq_desc_index,
- uint32_t stop_index, void *service_cb_arg);
-
-int ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx);
+
+static inline uint16_t
+ionic_q_space_avail(struct ionic_queue *q)
+{
+ uint16_t avail = q->tail_idx;
+
+ if (q->head_idx >= avail)
+ avail += q->num_descs - q->head_idx - 1;
+ else
+ avail -= q->head_idx + 1;
+
+ return avail;
+}
+
+static inline void
+ionic_q_flush(struct ionic_queue *q)
+{
+ uint64_t val = IONIC_DBELL_QID(q->hw_index) | q->head_idx;
+
+ rte_write64(rte_cpu_to_le_64(val), q->db);
+}
#endif /* _IONIC_DEV_H_ */