common/cnxk: support matching VLAN existence

[dpdk.git] / drivers / common / qat / qat_qp.h

diff --git a/drivers/common/qat/qat_qp.h b/drivers/common/qat/qat_qp.h
index d353e85..deafb40 100644 (file)
--- a/drivers/common/qat/qat_qp.h
+++ b/drivers/common/qat/qat_qp.h
@@ -7,35 +7,12 @@
 #include "qat_common.h"
 #include "adf_transport_access_macros.h"
 
-struct qat_pci_device;
-
 #define QAT_CSR_HEAD_WRITE_THRESH 32U
 /* number of requests to accumulate before writing head CSR */
 
 #define QAT_QP_MIN_INFL_THRESHOLD      256
 
-/**
- * Structure with data needed for creation of queue pair.
- */
-struct qat_qp_hw_data {
-       enum qat_service_type service_type;
-       uint8_t hw_bundle_num;
-       uint8_t tx_ring_num;
-       uint8_t rx_ring_num;
-       uint16_t tx_msg_size;
-       uint16_t rx_msg_size;
-};
-
-/**
- * Structure with data needed for creation of queue pair.
- */
-struct qat_qp_config {
-       const struct qat_qp_hw_data *hw;
-       uint32_t nb_descriptors;
-       uint32_t cookie_size;
-       int socket_id;
-       const char *service_str;
-};
+struct qat_pci_device;
 
 /**
  * Structure associated with each queue.
@@ -77,8 +54,28 @@ struct qat_qp {
        uint16_t min_enq_burst_threshold;
 } __rte_cache_aligned;
 
-extern const struct qat_qp_hw_data qat_gen1_qps[][ADF_MAX_QPS_ON_ANY_SERVICE];
-extern const struct qat_qp_hw_data qat_gen3_qps[][ADF_MAX_QPS_ON_ANY_SERVICE];
+/**
+ * Structure with data needed for creation of queue pair.
+ */
+struct qat_qp_hw_data {
+       enum qat_service_type service_type;
+       uint8_t hw_bundle_num;
+       uint8_t tx_ring_num;
+       uint8_t rx_ring_num;
+       uint16_t tx_msg_size;
+       uint16_t rx_msg_size;
+};
+
+/**
+ * Structure with data needed for creation of queue pair.
+ */
+struct qat_qp_config {
+       const struct qat_qp_hw_data *hw;
+       uint32_t nb_descriptors;
+       uint32_t cookie_size;
+       int socket_id;
+       const char *service_str;
+};
 
 uint16_t
 qat_enqueue_op_burst(void *qp, void **ops, uint16_t nb_ops);
@@ -90,7 +87,7 @@ uint16_t
 qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops);
 
 int
-qat_qp_release(struct qat_qp **qp_addr);
+qat_qp_release(enum qat_device_gen qat_dev_gen, struct qat_qp **qp_addr);
 
 int
 qat_qp_setup(struct qat_pci_device *qat_dev,
@@ -99,7 +96,11 @@ qat_qp_setup(struct qat_pci_device *qat_dev,
 
 int
 qat_qps_per_service(struct qat_pci_device *qat_dev,
-                       enum qat_service_type service);
+               enum qat_service_type service);
+
+const struct qat_qp_hw_data *
+qat_qp_get_hw_data(struct qat_pci_device *qat_dev,
+               enum qat_service_type service, uint16_t qp_id);
 
 int
 qat_cq_get_fw_version(struct qat_qp *qp);
@@ -109,5 +110,49 @@ int
 qat_comp_process_response(void **op __rte_unused, uint8_t *resp __rte_unused,
                          void *op_cookie __rte_unused,
                          uint64_t *dequeue_err_count __rte_unused);
+int
+qat_read_qp_config(struct qat_pci_device *qat_dev);
+
+/**
+ * Function prototypes for GENx specific queue pair operations.
+ **/
+typedef int (*qat_qp_rings_per_service_t)
+               (struct qat_pci_device *, enum qat_service_type);
+
+typedef void (*qat_qp_build_ring_base_t)(void *, struct qat_queue *);
+
+typedef void (*qat_qp_adf_arb_enable_t)(const struct qat_queue *, void *,
+               rte_spinlock_t *);
+
+typedef void (*qat_qp_adf_arb_disable_t)(const struct qat_queue *, void *,
+               rte_spinlock_t *);
+
+typedef void (*qat_qp_adf_configure_queues_t)(struct qat_qp *);
+
+typedef void (*qat_qp_csr_write_tail_t)(struct qat_qp *qp, struct qat_queue *q);
+
+typedef void (*qat_qp_csr_write_head_t)(struct qat_qp *qp, struct qat_queue *q,
+               uint32_t new_head);
+
+typedef void (*qat_qp_csr_setup_t)(struct qat_pci_device*, void *,
+               struct qat_qp *);
+
+typedef const struct qat_qp_hw_data * (*qat_qp_get_hw_data_t)(
+               struct qat_pci_device *dev, enum qat_service_type service_type,
+               uint16_t qp_id);
+
+struct qat_qp_hw_spec_funcs {
+       qat_qp_rings_per_service_t      qat_qp_rings_per_service;
+       qat_qp_build_ring_base_t        qat_qp_build_ring_base;
+       qat_qp_adf_arb_enable_t         qat_qp_adf_arb_enable;
+       qat_qp_adf_arb_disable_t        qat_qp_adf_arb_disable;
+       qat_qp_adf_configure_queues_t   qat_qp_adf_configure_queues;
+       qat_qp_csr_write_tail_t         qat_qp_csr_write_tail;
+       qat_qp_csr_write_head_t         qat_qp_csr_write_head;
+       qat_qp_csr_setup_t              qat_qp_csr_setup;
+       qat_qp_get_hw_data_t            qat_qp_get_hw_data;
+};
+
+extern struct qat_qp_hw_spec_funcs *qat_qp_hw_spec[];
 
 #endif /* _QAT_QP_H_ */