From: "zhaoxiu.zeng" <zhaoxiu.zeng@gmail.com>
To: Tadeusz Struk <tadeusz.struk@intel.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Pingchao Yang <pingchao.yang@intel.com>,
Bruce Allan <bruce.w.allan@intel.com>
Cc: linux-kernel@vger.kernel.org, qat-linux@intel.com,
linux-crypto@vger.kernel.org
Subject: [PATCH 23/31] crypto: qat: use parity functions in qat_hal.c
Date: Sun, 27 Mar 2016 15:30:47 +0800 [thread overview]
Message-ID: <56F78C27.6010307@gmail.com> (raw)
In-Reply-To: <1458788612-4367-1-git-send-email-zhaoxiu.zeng@gmail.com>
From: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
---
drivers/crypto/qat/qat_common/qat_hal.c | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
index 1e480f1..318558f 100644
--- a/drivers/crypto/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/qat/qat_common/qat_hal.c
@@ -546,17 +546,6 @@ static void qat_hal_disable_ctx(struct icp_qat_fw_loader_handle *handle,
qat_hal_wr_ae_csr(handle, ae, CTX_ENABLES, ctx);
}
-static uint64_t qat_hal_parity_64bit(uint64_t word)
-{
- word ^= word >> 1;
- word ^= word >> 2;
- word ^= word >> 4;
- word ^= word >> 8;
- word ^= word >> 16;
- word ^= word >> 32;
- return word & 1;
-}
-
static uint64_t qat_hal_set_uword_ecc(uint64_t uword)
{
uint64_t bit0_mask = 0xff800007fffULL, bit1_mask = 0x1f801ff801fULL,
@@ -566,13 +555,13 @@ static uint64_t qat_hal_set_uword_ecc(uint64_t uword)
/* clear the ecc bits */
uword &= ~(0x7fULL << 0x2C);
- uword |= qat_hal_parity_64bit(bit0_mask & uword) << 0x2C;
- uword |= qat_hal_parity_64bit(bit1_mask & uword) << 0x2D;
- uword |= qat_hal_parity_64bit(bit2_mask & uword) << 0x2E;
- uword |= qat_hal_parity_64bit(bit3_mask & uword) << 0x2F;
- uword |= qat_hal_parity_64bit(bit4_mask & uword) << 0x30;
- uword |= qat_hal_parity_64bit(bit5_mask & uword) << 0x31;
- uword |= qat_hal_parity_64bit(bit6_mask & uword) << 0x32;
+ uword |= (uint64_t)parity64(bit0_mask & uword) << 0x2C;
+ uword |= (uint64_t)parity64(bit1_mask & uword) << 0x2D;
+ uword |= (uint64_t)parity64(bit2_mask & uword) << 0x2E;
+ uword |= (uint64_t)parity64(bit3_mask & uword) << 0x2F;
+ uword |= (uint64_t)parity64(bit4_mask & uword) << 0x30;
+ uword |= (uint64_t)parity64(bit5_mask & uword) << 0x31;
+ uword |= (uint64_t)parity64(bit6_mask & uword) << 0x32;
return uword;
}
@@ -853,15 +842,14 @@ void qat_hal_wr_umem(struct icp_qat_fw_loader_handle *handle,
uaddr |= UA_ECS;
qat_hal_wr_ae_csr(handle, ae, USTORE_ADDRESS, uaddr);
for (i = 0; i < words_num; i++) {
- unsigned int uwrd_lo, uwrd_hi, tmp;
+ unsigned int uwrd_lo, uwrd_hi;
uwrd_lo = ((data[i] & 0xfff0000) << 4) | (0x3 << 18) |
((data[i] & 0xff00) << 2) |
(0x3 << 8) | (data[i] & 0xff);
uwrd_hi = (0xf << 4) | ((data[i] & 0xf0000000) >> 28);
- uwrd_hi |= (hweight32(data[i] & 0xffff) & 0x1) << 8;
- tmp = ((data[i] >> 0x10) & 0xffff);
- uwrd_hi |= (hweight32(tmp) & 0x1) << 9;
+ uwrd_hi |= parity16(data[i]) << 8;
+ uwrd_hi |= parity16(data[i] >> 16) << 9;
qat_hal_wr_ae_csr(handle, ae, USTORE_DATA_LOWER, uwrd_lo);
qat_hal_wr_ae_csr(handle, ae, USTORE_DATA_UPPER, uwrd_hi);
}
--
2.5.5
next prev parent reply other threads:[~2016-03-27 7:31 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-24 3:03 [PATCH 01/31] bitops: add parity functions Zhaoxiu Zeng
2016-03-24 8:38 ` Denys Vlasenko
2016-03-24 22:28 ` Andrew Morton
2016-03-26 22:08 ` Martin Kepplinger
2016-03-27 7:51 ` zhaoxiu.zeng
2016-03-27 3:33 ` zhaoxiu.zeng
2016-03-27 12:44 ` Sam Ravnborg
2016-03-27 13:38 ` zhaoxiu.zeng
2016-03-27 17:56 ` Sam Ravnborg
2016-03-28 2:44 ` Zeng Zhaoxiu
2016-03-28 2:15 ` Zeng Zhaoxiu
2016-03-28 6:51 ` Sam Ravnborg
2016-03-29 2:27 ` Zeng Zhaoxiu
2016-03-29 2:56 ` Joe Perches
2016-03-27 4:02 ` [PATCH 02/31] Include generic parity.h in some architectures' bitops.h zhaoxiu.zeng
2016-03-27 5:43 ` [PATCH 03/31] Add alpha-specific parity functions zhaoxiu.zeng
2016-03-28 18:33 ` Richard Henderson
2016-03-27 5:47 ` [PATCH 04/31] Add avr32-specific " zhaoxiu.zeng
2016-03-28 20:00 ` Hans-Christian Noren Egtvedt
2016-03-27 5:53 ` [PATCH 05/31] Add blackfin-specific " zhaoxiu.zeng
2016-03-27 6:00 ` [PATCH 06/31] Add ia64-specific " zhaoxiu.zeng
2016-03-27 6:06 ` [PATCH 07/31] Add mips-specific " zhaoxiu.zeng
2016-03-28 17:25 ` David Daney
2016-03-29 2:15 ` Zeng Zhaoxiu
2016-03-27 6:10 ` [PATCH 08/31] Add tile-specific " zhaoxiu.zeng
2016-03-27 6:37 ` [PATCH 09/31] Add powerpc-specific " zhaoxiu.zeng
2016-03-27 6:43 ` [PATCH 10/31] Add sparc-specific " zhaoxiu.zeng
2016-03-28 2:43 ` David Miller
2016-03-28 5:44 ` Zeng Zhaoxiu
2016-03-28 15:29 ` David Miller
2016-03-28 15:37 ` Sam Ravnborg
2016-03-28 15:46 ` David Miller
2016-03-27 6:45 ` [PATCH 11/31] Add x86-specific " zhaoxiu.zeng
2016-03-29 12:11 ` One Thousand Gnomes
2016-03-27 6:51 ` [PATCH 12/31] sunrpc: auth_gss: use parity8 zhaoxiu.zeng
2016-03-27 6:55 ` [PATCH 13/31] mips: use parity functions in cerr-sb1.c zhaoxiu.zeng
2016-03-27 7:01 ` [PATCH 14/31] lib: bch: use parity32 zhaoxiu.zeng
2016-03-27 7:06 ` [PATCH 15/31] media: use parity8 in vivid-vbi-gen.c zhaoxiu.zeng
2016-03-27 7:10 ` [PATCH 16/31] media: saa7115: use parity functions zhaoxiu.zeng
2016-03-27 7:13 ` [PATCH 17/31] input: joystick: use parity32 in grip_mp.c zhaoxiu.zeng
2016-03-27 7:15 ` [PATCH 18/31] input: joystick: use parity64 in sidewinder.c zhaoxiu.zeng
2016-03-27 7:18 ` [PATCH 19/31] input: serio: use parity16 in ams_delta_serio.c zhaoxiu.zeng
2016-03-27 7:20 ` [PATCH 20/31] scsi: use parity32 in isci/phy.c zhaoxiu.zeng
2016-03-27 7:24 ` [PATCH 21/31] mtd: use parity16 in ssfdc.c zhaoxiu.zeng
2016-04-01 23:48 ` Brian Norris
2016-03-27 7:27 ` [PATCH 22/31] mtd: use parity functions in inftlcore.c zhaoxiu.zeng
2016-03-27 7:30 ` zhaoxiu.zeng [this message]
2016-03-27 7:33 ` [PATCH 24/31] mtd: use parity16 in sm_ftl.c zhaoxiu.zeng
2016-03-27 7:36 ` [PATCH 25/31] ethernet: use parity8 in sun/niu.c zhaoxiu.zeng
2016-03-28 14:33 ` Michal Nazarewicz
2016-03-27 7:38 ` [PATCH 26/31] input: serio: use parity8 in pcips2.c zhaoxiu.zeng
2016-03-27 7:40 ` [PATCH 27/31] input: serio: use parity8 in sa1111ps2.c zhaoxiu.zeng
2016-03-27 7:42 ` [PATCH 28/31] iio: gyro: use parity32 in adxrs450.c zhaoxiu.zeng
2016-03-28 8:35 ` Jonathan Cameron
2016-03-28 8:50 ` Lars-Peter Clausen
2016-03-27 7:44 ` [PATCH 29/31] serial: use parity32 in max3100.c zhaoxiu.zeng
2016-03-27 7:48 ` [PATCH 30/31] input: mouse: use parity8 in elantech zhaoxiu.zeng
2016-03-27 7:50 ` [PATCH 31/31] ethernet: broadcom: use parity8 in tg3.c zhaoxiu.zeng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56F78C27.6010307@gmail.com \
--to=zhaoxiu.zeng@gmail.com \
--cc=bruce.w.allan@intel.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pingchao.yang@intel.com \
--cc=qat-linux@intel.com \
--cc=tadeusz.struk@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox