X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fcrypto%2Fscheduler%2Fscheduler_pmd_private.h;h=4d33b9ab44d28dfa9300115d26372ced12db6a7d;hb=03e73e8572f112bd3714cd90c491a6570330189c;hp=dd7ca5a4e4ee872a2403772bf8bedf970e056917;hpb=5566a3e35866ce9e5eacf886c27b460ebfcd6ee9;p=dpdk.git

diff --git a/drivers/crypto/scheduler/scheduler_pmd_private.h b/drivers/crypto/scheduler/scheduler_pmd_private.h
index dd7ca5a4e4..4d33b9ab44 100644
--- a/drivers/crypto/scheduler/scheduler_pmd_private.h
+++ b/drivers/crypto/scheduler/scheduler_pmd_private.h
@@ -10,29 +10,15 @@
 #define CRYPTODEV_NAME_SCHEDULER_PMD	crypto_scheduler
 /**< Scheduler Crypto PMD device name */
 
-#define PER_SLAVE_BUFF_SIZE			(256)
-
-#define CS_LOG_ERR(fmt, args...)					\
-	RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",		\
-		RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),			\
-		__func__, __LINE__, ## args)
-
-#ifdef RTE_LIBRTE_CRYPTO_SCHEDULER_DEBUG
-#define CS_LOG_INFO(fmt, args...)					\
-	RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",	\
-		RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),			\
-		__func__, __LINE__, ## args)
-
-#define CS_LOG_DBG(fmt, args...)					\
-	RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",	\
-		RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),			\
-		__func__, __LINE__, ## args)
-#else
-#define CS_LOG_INFO(fmt, args...)
-#define CS_LOG_DBG(fmt, args...)
-#endif
-
-struct scheduler_slave {
+#define PER_WORKER_BUFF_SIZE			(256)
+
+extern int scheduler_logtype_driver;
+
+#define CR_SCHED_LOG(level, fmt, args...) \
+	rte_log(RTE_LOG_ ## level, scheduler_logtype_driver,		\
+			"%s() line %u: "fmt "\n", __func__, __LINE__, ##args)
+
+struct scheduler_worker {
 	uint8_t dev_id;
 	uint16_t qp_id;
 	uint32_t nb_inflight_cops;
@@ -49,8 +35,8 @@ struct scheduler_ctx {
 
 	uint32_t max_nb_queue_pairs;
 
-	struct scheduler_slave slaves[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];
-	uint32_t nb_slaves;
+	struct scheduler_worker workers[RTE_CRYPTODEV_SCHEDULER_MAX_NB_WORKERS];
+	uint32_t nb_workers;
 
 	enum rte_cryptodev_scheduler_mode mode;
 
@@ -60,11 +46,11 @@ struct scheduler_ctx {
 
 	char name[RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN];
 	char description[RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN];
-	uint16_t wc_pool[RTE_CRYPTODEV_SCHEDULER_MAX_NB_WORKER_CORES];
+	uint16_t wc_pool[RTE_MAX_LCORE];
 	uint16_t nb_wc;
 
-	char *init_slave_names[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];
-	int nb_init_slaves;
+	char *init_worker_names[RTE_CRYPTODEV_SCHEDULER_MAX_NB_WORKERS];
+	int nb_init_workers;
 } __rte_cache_aligned;
 
 struct scheduler_qp_ctx {
@@ -73,11 +59,10 @@ struct scheduler_qp_ctx {
 	uint32_t max_nb_objs;
 
 	struct rte_ring *order_ring;
-	uint32_t seqn;
 } __rte_cache_aligned;
 
 
-extern uint8_t cryptodev_driver_id;
+extern uint8_t cryptodev_scheduler_driver_id;
 
 static __rte_always_inline uint16_t
 get_max_enqueue_order_count(struct rte_ring *order_ring, uint16_t nb_ops)
@@ -94,36 +79,28 @@ scheduler_order_insert(struct rte_ring *order_ring,
 	rte_ring_sp_enqueue_burst(order_ring, (void **)ops, nb_ops, NULL);
 }
 
-#define SCHEDULER_GET_RING_OBJ(order_ring, pos, op) do {            \
-	struct rte_crypto_op **ring = (void *)&order_ring[1];     \
-	op = ring[(order_ring->cons.head + pos) & order_ring->mask]; \
-} while (0)
-
 static __rte_always_inline uint16_t
 scheduler_order_drain(struct rte_ring *order_ring,
 		struct rte_crypto_op **ops, uint16_t nb_ops)
 {
 	struct rte_crypto_op *op;
-	uint32_t nb_objs = rte_ring_count(order_ring);
-	uint32_t nb_ops_to_deq = 0;
-	uint32_t nb_ops_deqd = 0;
+	uint32_t nb_objs, nb_ops_to_deq;
 
-	if (nb_objs > nb_ops)
-		nb_objs = nb_ops;
+	nb_objs = rte_ring_dequeue_burst_start(order_ring, (void **)ops,
+		nb_ops, NULL);
+	if (nb_objs == 0)
+		return 0;
 
-	while (nb_ops_to_deq < nb_objs) {
-		SCHEDULER_GET_RING_OBJ(order_ring, nb_ops_to_deq, op);
+	for (nb_ops_to_deq = 0; nb_ops_to_deq != nb_objs; nb_ops_to_deq++) {
+		op = ops[nb_ops_to_deq];
 		if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
 			break;
-		nb_ops_to_deq++;
 	}
 
-	if (nb_ops_to_deq)
-		nb_ops_deqd = rte_ring_sc_dequeue_bulk(order_ring,
-				(void **)ops, nb_ops_to_deq, NULL);
-
-	return nb_ops_deqd;
+	rte_ring_dequeue_finish(order_ring, nb_ops_to_deq);
+	return nb_ops_to_deq;
 }
+
 /** device specific operations function pointer structure */
 extern struct rte_cryptodev_ops *rte_crypto_scheduler_pmd_ops;