diff options
| author | Herbert Xu | 2014-10-02 08:37:20 +0200 |
|---|---|---|
| committer | Herbert Xu | 2014-10-02 08:37:20 +0200 |
| commit | 9561dccb45a34f77001389824915e4dad8ede757 (patch) | |
| tree | a16454e64e00c3ea4e42719ecb3b1035da9c463b /drivers/crypto/qat/qat_dh895xcc | |
| parent | crypto: aesni - remove unused defines in "by8" variant (diff) | |
| parent | crypto: aesni - disable "by8" AVX CTR optimization (diff) | |
| download | kernel-qcow2-linux-9561dccb45a34f77001389824915e4dad8ede757.tar.gz kernel-qcow2-linux-9561dccb45a34f77001389824915e4dad8ede757.tar.xz kernel-qcow2-linux-9561dccb45a34f77001389824915e4dad8ede757.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merging the crypto tree for 3.17 to pull in the "by8" AVX CTR revert.
Diffstat (limited to 'drivers/crypto/qat/qat_dh895xcc')
| -rw-r--r-- | drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h index b707f292b377..65dd1ff93d3b 100644 --- a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h +++ b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h @@ -66,7 +66,7 @@ #define ADF_DH895XCC_ETR_MAX_BANKS 32 #define ADF_DH895XCC_SMIAPF0_MASK_OFFSET (0x3A000 + 0x28) #define ADF_DH895XCC_SMIAPF1_MASK_OFFSET (0x3A000 + 0x30) -#define ADF_DH895XCC_SMIA0_MASK 0xFFFF +#define ADF_DH895XCC_SMIA0_MASK 0xFFFFFFFF #define ADF_DH895XCC_SMIA1_MASK 0x1 /* Error detection and correction */ #define ADF_DH895XCC_AE_CTX_ENABLES(i) (i * 0x1000 + 0x20818) |