From patchwork Thu Jul 16 15:34:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Coyle, David" X-Patchwork-Id: 74264 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C8681A0546; Thu, 16 Jul 2020 17:58:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A10964F9A; Thu, 16 Jul 2020 17:58:50 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 0BFA22B9A for ; Thu, 16 Jul 2020 17:58:48 +0200 (CEST) IronPort-SDR: ac5V22XmSL6hl0r4towAbQnVrUwHUmftgYZXbo66X082YF407c55onctKCSQqG5jZThXkHnSnT DGCXrIzXgGLQ== X-IronPort-AV: E=McAfee;i="6000,8403,9684"; a="128986316" X-IronPort-AV: E=Sophos;i="5.75,359,1589266800"; d="scan'208";a="128986316" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2020 08:58:48 -0700 IronPort-SDR: sApf7vRG8do8wgeED09U4+0WlN36i6jYIy29wTQ/ERULCxy7P2WmzE3baWQVPhNuhWsksyQRFR dU36Y2nukflw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,359,1589266800"; d="scan'208";a="486151768" Received: from silpixa00399912.ir.intel.com (HELO silpixa00399912.ger.corp.intel.com) ([10.237.223.64]) by fmsmga006.fm.intel.com with ESMTP; 16 Jul 2020 08:58:41 -0700 From: David Coyle To: akhil.goyal@nxp.com, declan.doherty@intel.com, fiona.trahe@intel.com Cc: dev@dpdk.org, brendan.ryan@intel.com, mairtin.oloingsigh@intel.com, pablo.de.lara.guarch@intel.com, David Coyle Date: Thu, 16 Jul 2020 16:34:36 +0100 Message-Id: <20200716153436.65862-1-david.coyle@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH v1] crypto/qat: use better variable names in CRC functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The variable names crc_length and crc_offset have been changed to crc_data_len and crc_data_ofs respectively, to make it clearer as to their use i.e. the length and offset of the data over which the CRC is calculated. Fixes: 6f0ef237404b ("crypto/qat: support DOCSIS protocol") Signed-off-by: David Coyle Acked-by: Fiona Trahe --- drivers/crypto/qat/qat_sym.c | 8 ++++---- drivers/crypto/qat/qat_sym.h | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c index 6d568ab8f..fe5c85c34 100644 --- a/drivers/crypto/qat/qat_sym.c +++ b/drivers/crypto/qat/qat_sym.c @@ -108,18 +108,18 @@ qat_crc_generate(struct qat_sym_session *ctx, struct rte_crypto_op *op) { struct rte_crypto_sym_op *sym_op = op->sym; - uint32_t *crc, crc_length; + uint32_t *crc, crc_data_len; uint8_t *crc_data; if (ctx->qat_dir == ICP_QAT_HW_CIPHER_ENCRYPT && sym_op->auth.data.length != 0) { - crc_length = sym_op->auth.data.length; + crc_data_len = sym_op->auth.data.length; crc_data = rte_pktmbuf_mtod_offset(sym_op->m_src, uint8_t *, sym_op->auth.data.offset); - crc = (uint32_t *)(crc_data + crc_length); + crc = (uint32_t *)(crc_data + crc_data_len); - *crc = rte_net_crc_calc(crc_data, crc_length, + *crc = rte_net_crc_calc(crc_data, crc_data_len, RTE_NET_CRC32_ETH); } } diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h index dbca74efb..7934dd478 100644 --- a/drivers/crypto/qat/qat_sym.h +++ b/drivers/crypto/qat/qat_sym.h @@ -140,20 +140,21 @@ static inline void qat_crc_verify(struct qat_sym_session *ctx, struct rte_crypto_op *op) { struct rte_crypto_sym_op *sym_op = op->sym; - uint32_t crc_offset, crc_length, crc; + uint32_t crc_data_ofs, crc_data_len, crc; uint8_t *crc_data; if (ctx->qat_dir == ICP_QAT_HW_CIPHER_DECRYPT && sym_op->auth.data.length != 0) { - crc_offset = sym_op->auth.data.offset; - crc_length = sym_op->auth.data.length; + crc_data_ofs = sym_op->auth.data.offset; + crc_data_len = sym_op->auth.data.length; crc_data = rte_pktmbuf_mtod_offset(sym_op->m_src, uint8_t *, - crc_offset); + crc_data_ofs); - crc = rte_net_crc_calc(crc_data, crc_length, RTE_NET_CRC32_ETH); + crc = rte_net_crc_calc(crc_data, crc_data_len, + RTE_NET_CRC32_ETH); - if (crc != *(uint32_t *)(crc_data + crc_length)) + if (crc != *(uint32_t *)(crc_data + crc_data_len)) op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED; } }