X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fcommon%2Fcpt%2Fcpt_common.h;h=7fea0ca879c3f44542889068cb18a48bb62e31fb;hb=403f21feb87fc9e0e2f61c1e4576cc1b9300ed4b;hp=8461cd604a941924b2a37c4811a4d2115dba602f;hpb=89f1a8d6a057295037dd06e9601371887dc55379;p=dpdk.git

diff --git a/drivers/common/cpt/cpt_common.h b/drivers/common/cpt/cpt_common.h
index 8461cd604a..7fea0ca879 100644
--- a/drivers/common/cpt/cpt_common.h
+++ b/drivers/common/cpt/cpt_common.h
@@ -5,15 +5,11 @@
 #ifndef _CPT_COMMON_H_
 #define _CPT_COMMON_H_
 
-/*
- * This file defines common macros and structs
- */
+#include <rte_mempool.h>
 
 /*
- * Macros to determine CPT model. Driver makefile will define CPT_MODEL
- * accordingly
+ * This file defines common macros and structs
  */
-#define CRYPTO_OCTEONTX		0x1
 
 #define TIME_IN_RESET_COUNT	5
 
@@ -23,36 +19,12 @@
 #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
-
-#ifndef ROUNDUP8
-#define ROUNDUP8(val)	(((val) + 7) & 0xfffffff8)
-#endif
-
-#ifndef ROUNDUP16
-#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 rid {
-	/** Request id of a crypto operation */
-	uintptr_t rid;
+struct cpt_qp_meta_info {
+	struct rte_mempool *pool;
+	int sg_mlen;
+	int lb_mlen;
 };
 
 /*
@@ -60,14 +32,14 @@ struct rid {
  *
  */
 struct pending_queue {
+	/** Pending requests count */
+	uint64_t pending_count;
+	/** Array of pending requests */
+	uintptr_t *req_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,12 +52,13 @@ struct cpt_request_info {
 		uint64_t ei0;
 		uint64_t ei1;
 		uint64_t ei2;
-		uint64_t ei3;
 	} ist;
+	uint8_t *rptr;
+	const struct otx2_cpt_qp *qp;
 
 	/** Control path fields */
 	uint64_t time_out;
 	uint8_t extra_time;
-};
+} __rte_aligned(8);
 
 #endif /* _CPT_COMMON_H_ */