common/cpt: use predefined macros

Replace redundant macro ROUNDUP* with predefined macros.

Signed-off-by: Archana Muniganti <marchana@marvell.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>

diff --git a/drivers/common/cpt/cpt_common.h b/drivers/common/cpt/cpt_common.h
index eefe275..f61495e 100644 (file)
--- a/drivers/common/cpt/cpt_common.h
+++ b/drivers/common/cpt/cpt_common.h
@@ -19,18 +19,6 @@
 #define CPT_COUNT_THOLD                32
 #define CPT_TIMER_THOLD                0x3F
 
-#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
-
 #define MOD_INC(i, l)   ((i) == (l - 1) ? (i) = 0 : (i)++)
 
 struct cpt_qp_meta_info {

diff --git a/drivers/common/cpt/cpt_pmd_ops_helper.c b/drivers/common/cpt/cpt_pmd_ops_helper.c
index 09b762f..2cddddf 100644 (file)
--- a/drivers/common/cpt/cpt_pmd_ops_helper.c
+++ b/drivers/common/cpt/cpt_pmd_ops_helper.c
@@ -35,8 +35,9 @@ cpt_pmd_ops_helper_get_mlen_sg_mode(void)
 
        len += sizeof(struct cpt_request_info);
        len += CPT_OFFSET_CONTROL_BYTES + CPT_MAX_IV_LEN;
-       len += ROUNDUP8(SG_LIST_HDR_SIZE +
-                       (ROUNDUP4(CPT_MAX_SG_IN_OUT_CNT) >> 2) * SG_ENTRY_SIZE);
+       len += RTE_ALIGN_CEIL((SG_LIST_HDR_SIZE +
+                       (RTE_ALIGN_CEIL(CPT_MAX_SG_IN_OUT_CNT, 4) >> 2) *
+                       SG_ENTRY_SIZE), 8);
        len += 2 * COMPLETION_CODE_SIZE;
        len += 2 * sizeof(cpt_res_s_t);
        return len;

diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
index c4d9520..0536620 100644 (file)
--- a/drivers/common/cpt/cpt_ucode.h
+++ b/drivers/common/cpt/cpt_ucode.h
@@ -528,7 +528,7 @@ cpt_digest_gen_prep(uint32_t flags,
        if (ctx->hmac) {
                vq_cmd_w0.s.opcode.major = CPT_MAJOR_OP_HMAC | CPT_DMA_MODE;
                vq_cmd_w0.s.param1 = key_len;
-               vq_cmd_w0.s.dlen = data_len + ROUNDUP8(key_len);
+               vq_cmd_w0.s.dlen = data_len + RTE_ALIGN_CEIL(key_len, 8);
        } else {
                vq_cmd_w0.s.opcode.major = CPT_MAJOR_OP_HASH | CPT_DMA_MODE;
                vq_cmd_w0.s.param1 = 0;
@@ -564,7 +564,8 @@ cpt_digest_gen_prep(uint32_t flags,
                uint64_t k_dma = params->ctx_buf.dma_addr +
                        offsetof(struct cpt_ctx, auth_key);
                /* Key */
-               i = fill_sg_comp(gather_comp, i, k_dma, ROUNDUP8(key_len));
+               i = fill_sg_comp(gather_comp, i, k_dma,
+                                RTE_ALIGN_CEIL(key_len, 8));
        }
 
        /* input data */
@@ -762,10 +763,12 @@ cpt_enc_hmac_prep(uint32_t flags,
        enc_dlen = encr_data_len + encr_offset;
        if (unlikely(encr_data_len & 0xf)) {
                if ((cipher_type == DES3_CBC) || (cipher_type == DES3_ECB))
-                       enc_dlen = ROUNDUP8(encr_data_len) + encr_offset;
+                       enc_dlen = RTE_ALIGN_CEIL(encr_data_len, 8) +
+                                       encr_offset;
                else if (likely((cipher_type == AES_CBC) ||
                                (cipher_type == AES_ECB)))
-                       enc_dlen = ROUNDUP16(encr_data_len) + encr_offset;
+                       enc_dlen = RTE_ALIGN_CEIL(encr_data_len, 8) +
+                                       encr_offset;
        }
 
        if (unlikely(auth_dlen > enc_dlen)) {

diff --git a/drivers/common/cpt/cpt_ucode_asym.h b/drivers/common/cpt/cpt_ucode_asym.h
index 286f155..50c6f58 100644 (file)
--- a/drivers/common/cpt/cpt_ucode_asym.h
+++ b/drivers/common/cpt/cpt_ucode_asym.h
@@ -623,10 +623,10 @@ cpt_ecdsa_sign_prep(struct rte_crypto_ecdsa_op_param *ecdsa,
        /* Truncate input length to curve prime length */
        if (message_len > prime_len)
                message_len = prime_len;
-       m_align = ROUNDUP8(message_len);
+       m_align = RTE_ALIGN_CEIL(message_len, 8);
 
-       p_align = ROUNDUP8(prime_len);
-       k_align = ROUNDUP8(k_len);
+       p_align = RTE_ALIGN_CEIL(prime_len, 8);
+       k_align = RTE_ALIGN_CEIL(k_len, 8);
 
        /* Set write offset for order and private key */
        o_offset = prime_len - order_len;
@@ -723,8 +723,8 @@ cpt_ecdsa_verify_prep(struct rte_crypto_ecdsa_op_param *ecdsa,
        if (message_len > prime_len)
                message_len = prime_len;
 
-       m_align = ROUNDUP8(message_len);
-       p_align = ROUNDUP8(prime_len);
+       m_align = RTE_ALIGN_CEIL(message_len, 8);
+       p_align = RTE_ALIGN_CEIL(prime_len, 8);
 
        /* Set write offset for sign, order and public key coordinates */
        o_offset = prime_len - order_len;
@@ -841,8 +841,8 @@ cpt_ecpm_prep(struct rte_crypto_ecpm_op_param *ecpm,
        /* Input buffer */
        dptr = RTE_PTR_ADD(req, sizeof(struct cpt_request_info));
 
-       p_align = ROUNDUP8(prime_len);
-       scalar_align = ROUNDUP8(ecpm->scalar.length);
+       p_align = RTE_ALIGN_CEIL(prime_len, 8);
+       scalar_align = RTE_ALIGN_CEIL(ecpm->scalar.length, 8);
 
        /*
         * Set dlen = sum(ROUNDUP8(input point(x and y coordinates), prime,

diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c
index 2d41101..b1ff214 100644 (file)
--- a/drivers/crypto/octeontx/otx_cryptodev_ops.c
+++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c
@@ -738,7 +738,8 @@ otx_cpt_asym_dequeue_ecdsa_op(struct rte_crypto_ecdsa_op_param *ecdsa,
 
        /* Separate out sign r and s components */
        memcpy(ecdsa->r.data, req->rptr, prime_len);
-       memcpy(ecdsa->s.data, req->rptr + ROUNDUP8(prime_len), prime_len);
+       memcpy(ecdsa->s.data, req->rptr + RTE_ALIGN_CEIL(prime_len, 8),
+              prime_len);
        ecdsa->r.length = prime_len;
        ecdsa->s.length = prime_len;
 }
@@ -751,7 +752,8 @@ otx_cpt_asym_dequeue_ecpm_op(struct rte_crypto_ecpm_op_param *ecpm,
        int prime_len = ec_grp[ec->curveid].prime.length;
 
        memcpy(ecpm->r.x.data, req->rptr, prime_len);
-       memcpy(ecpm->r.y.data, req->rptr + ROUNDUP8(prime_len), prime_len);
+       memcpy(ecpm->r.y.data, req->rptr + RTE_ALIGN_CEIL(prime_len, 8),
+              prime_len);
        ecpm->r.x.length = prime_len;
        ecpm->r.y.length = prime_len;
 }

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index 8cd2fc7..f521ef3 100644 (file)
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
@@ -823,7 +823,8 @@ otx2_cpt_asym_dequeue_ecdsa_op(struct rte_crypto_ecdsa_op_param *ecdsa,
 
        /* Separate out sign r and s components */
        memcpy(ecdsa->r.data, req->rptr, prime_len);
-       memcpy(ecdsa->s.data, req->rptr + ROUNDUP8(prime_len), prime_len);
+       memcpy(ecdsa->s.data, req->rptr + RTE_ALIGN_CEIL(prime_len, 8),
+              prime_len);
        ecdsa->r.length = prime_len;
        ecdsa->s.length = prime_len;
 }
@@ -836,7 +837,8 @@ otx2_cpt_asym_dequeue_ecpm_op(struct rte_crypto_ecpm_op_param *ecpm,
        int prime_len = ec_grp[ec->curveid].prime.length;
 
        memcpy(ecpm->r.x.data, req->rptr, prime_len);
-       memcpy(ecpm->r.y.data, req->rptr + ROUNDUP8(prime_len), prime_len);
+       memcpy(ecpm->r.y.data, req->rptr + RTE_ALIGN_CEIL(prime_len, 8),
+              prime_len);
        ecpm->r.x.length = prime_len;
        ecpm->r.y.length = prime_len;
 }