X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fcommon%2Fcpt%2Fcpt_common.h;h=56bfea4953c2eba7cf9de8a2fafdc85125710011;hb=e9703a54e41141ebcfd57db1d67d09ce61e58d29;hp=1823939204523d42f5bd6200e453ee51ee0e8441;hpb=ac4d88afc7253042eaa05d3ffe927f0d2b7b30c9;p=dpdk.git

diff --git a/drivers/common/cpt/cpt_common.h b/drivers/common/cpt/cpt_common.h
index 1823939204..56bfea4953 100644
--- a/drivers/common/cpt/cpt_common.h
+++ b/drivers/common/cpt/cpt_common.h
@@ -5,15 +5,13 @@
 #ifndef _CPT_COMMON_H_
 #define _CPT_COMMON_H_
 
+#include <rte_mempool.h>
+
 /*
  * This file defines common macros and structs
  */
 
-/*
- * Macros to determine CPT model. Driver makefile will define CPT_MODEL
- * accordingly
- */
-#define CRYPTO_OCTEONTX		0x1
+#define TIME_IN_RESET_COUNT	5
 
 /* Default command timeout in seconds */
 #define DEFAULT_COMMAND_TIMEOUT	4
@@ -21,9 +19,6 @@
 #define CPT_COUNT_THOLD		32
 #define CPT_TIMER_THOLD		0x3F
 
-#define AE_TYPE 1
-#define SE_TYPE 2
-
 #ifndef ROUNDUP4
 #define ROUNDUP4(val)	(((val) + 3) & 0xfffffffc)
 #endif
@@ -36,16 +31,12 @@
 #define ROUNDUP16(val)	(((val) + 15) & 0xfffffff0)
 #endif
 
-#ifndef __hot
-#define __hot __attribute__((hot))
-#endif
-
 #define MOD_INC(i, l)   ((i) == (l - 1) ? (i) = 0 : (i)++)
 
-struct cptvf_meta_info {
-	void *cptvf_meta_pool;
-	int cptvf_op_mlen;
-	int cptvf_op_sb_mlen;
+struct cpt_qp_meta_info {
+	struct rte_mempool *pool;
+	int sg_mlen;
+	int lb_mlen;
 };
 
 struct rid {
@@ -58,14 +49,14 @@ struct rid {
  *
  */
 struct pending_queue {
+	/** Pending requests count */
+	uint64_t pending_count;
+	/** Array of pending requests */
+	struct rid *rid_queue;
 	/** Tail of queue to be used for enqueue */
 	uint16_t enq_tail;
 	/** Head of queue to be used for dequeue */
 	uint16_t deq_head;
-	/** Array of pending requests */
-	struct rid *rid_queue;
-	/** Pending requests count */
-	uint64_t pending_count;
 };
 
 struct cpt_request_info {
@@ -80,10 +71,11 @@ struct cpt_request_info {
 		uint64_t ei2;
 		uint64_t ei3;
 	} ist;
+	uint8_t *rptr;
 
 	/** Control path fields */
 	uint64_t time_out;
 	uint8_t extra_time;
-};
+} __rte_cache_aligned;
 
 #endif /* _CPT_COMMON_H_ */