7 files changed, 25 insertions, 3 deletions

diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 75125a26bd2a..dae1e8099969 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1545,6 +1545,8 @@ static int ahash_init(struct ahash_request *req)
 
 	state->current_buf = 0;
 	state->buf_dma = 0;
+	state->buflen_0 = 0;
+	state->buflen_1 = 0;
 
 	return 0;
 }
diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
index 26a544b505f1..5095337205b8 100644
--- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c
@@ -56,7 +56,7 @@
 
 /* Buffer, its dma address and lock */
 struct buf_data {
-	u8 buf[RN_BUF_SIZE];
+	u8 buf[RN_BUF_SIZE] ____cacheline_aligned;
 	dma_addr_t addr;
 	struct completion filled;
 	u32 hw_desc[DESC_JOB_O_LEN];
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index c178ed8c3908..da2d6777bd09 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -22,7 +22,7 @@
 #include <asm/cpu_device_id.h>
 #include <asm/byteorder.h>
 #include <asm/processor.h>
-#include <asm/i387.h>
+#include <asm/fpu/api.h>
 
 /*
  * Number of data blocks actually fetched for each xcrypt insn.
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
index 95f7d27ce491..4e154c9b9206 100644
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
@@ -23,7 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/scatterlist.h>
 #include <asm/cpu_device_id.h>
-#include <asm/i387.h>
+#include <asm/fpu/api.h>
 
 struct padlock_sha_desc {
 	struct shash_desc fallback;
diff --git a/drivers/crypto/vmx/aes.c b/drivers/crypto/vmx/aes.c
index 023e5f014783..e79e567e43aa 100644
--- a/drivers/crypto/vmx/aes.c
+++ b/drivers/crypto/vmx/aes.c
@@ -81,11 +81,13 @@ static int p8_aes_setkey(struct crypto_tfm *tfm, const u8 *key,
 	int ret;
 	struct p8_aes_ctx *ctx = crypto_tfm_ctx(tfm);
 
+	preempt_disable();
 	pagefault_disable();
 	enable_kernel_altivec();
 	ret = aes_p8_set_encrypt_key(key, keylen * 8, &ctx->enc_key);
 	ret += aes_p8_set_decrypt_key(key, keylen * 8, &ctx->dec_key);
 	pagefault_enable();
+	preempt_enable();
 
 	ret += crypto_cipher_setkey(ctx->fallback, key, keylen);
 	return ret;
@@ -98,10 +100,12 @@ static void p8_aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 	if (in_interrupt()) {
 		crypto_cipher_encrypt_one(ctx->fallback, dst, src);
 	} else {
+		preempt_disable();
 		pagefault_disable();
 		enable_kernel_altivec();
 		aes_p8_encrypt(src, dst, &ctx->enc_key);
 		pagefault_enable();
+		preempt_enable();
 	}
 }
 
@@ -112,10 +116,12 @@ static void p8_aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 	if (in_interrupt()) {
 		crypto_cipher_decrypt_one(ctx->fallback, dst, src);
 	} else {
+		preempt_disable();
 		pagefault_disable();
 		enable_kernel_altivec();
 		aes_p8_decrypt(src, dst, &ctx->dec_key);
 		pagefault_enable();
+		preempt_enable();
 	}
 }
 
diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c
index 7120ab24d8c6..7299995c78ec 100644
--- a/drivers/crypto/vmx/aes_cbc.c
+++ b/drivers/crypto/vmx/aes_cbc.c
@@ -82,11 +82,13 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,
 	int ret;
 	struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
 
+	preempt_disable();
 	pagefault_disable();
 	enable_kernel_altivec();
 	ret = aes_p8_set_encrypt_key(key, keylen * 8, &ctx->enc_key);
 	ret += aes_p8_set_decrypt_key(key, keylen * 8, &ctx->dec_key);
 	pagefault_enable();
+	preempt_enable();
 
 	ret += crypto_blkcipher_setkey(ctx->fallback, key, keylen);
 	return ret;
@@ -110,6 +112,7 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,
 		ret = crypto_blkcipher_encrypt(&fallback_desc, dst, src,
 					       nbytes);
 	} else {
+		preempt_disable();
 		pagefault_disable();
 		enable_kernel_altivec();
 
@@ -125,6 +128,7 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,
 		}
 
 		pagefault_enable();
+		preempt_enable();
 	}
 
 	return ret;
@@ -148,6 +152,7 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,
 		ret = crypto_blkcipher_decrypt(&fallback_desc, dst, src,
 					       nbytes);
 	} else {
+		preempt_disable();
 		pagefault_disable();
 		enable_kernel_altivec();
 
@@ -163,6 +168,7 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,
 		}
 
 		pagefault_enable();
+		preempt_enable();
 	}
 
 	return ret;
diff --git a/drivers/crypto/vmx/ghash.c b/drivers/crypto/vmx/ghash.c
index 4c3a8f7e5059..b5e29002b666 100644
--- a/drivers/crypto/vmx/ghash.c
+++ b/drivers/crypto/vmx/ghash.c
@@ -116,11 +116,13 @@ static int p8_ghash_setkey(struct crypto_shash *tfm, const u8 *key,
 	if (keylen != GHASH_KEY_LEN)
 		return -EINVAL;
 
+	preempt_disable();
 	pagefault_disable();
 	enable_kernel_altivec();
 	enable_kernel_fp();
 	gcm_init_p8(ctx->htable, (const u64 *) key);
 	pagefault_enable();
+	preempt_enable();
 	return crypto_shash_setkey(ctx->fallback, key, keylen);
 }
 
@@ -144,23 +146,27 @@ static int p8_ghash_update(struct shash_desc *desc,
 			}
 			memcpy(dctx->buffer + dctx->bytes, src,
 			       GHASH_DIGEST_SIZE - dctx->bytes);
+			preempt_disable();
 			pagefault_disable();
 			enable_kernel_altivec();
 			enable_kernel_fp();
 			gcm_ghash_p8(dctx->shash, ctx->htable,
 				     dctx->buffer, GHASH_DIGEST_SIZE);
 			pagefault_enable();
+			preempt_enable();
 			src += GHASH_DIGEST_SIZE - dctx->bytes;
 			srclen -= GHASH_DIGEST_SIZE - dctx->bytes;
 			dctx->bytes = 0;
 		}
 		len = srclen & ~(GHASH_DIGEST_SIZE - 1);
 		if (len) {
+			preempt_disable();
 			pagefault_disable();
 			enable_kernel_altivec();
 			enable_kernel_fp();
 			gcm_ghash_p8(dctx->shash, ctx->htable, src, len);
 			pagefault_enable();
+			preempt_enable();
 			src += len;
 			srclen -= len;
 		}
@@ -184,12 +190,14 @@ static int p8_ghash_final(struct shash_desc *desc, u8 *out)
 		if (dctx->bytes) {
 			for (i = dctx->bytes; i < GHASH_DIGEST_SIZE; i++)
 				dctx->buffer[i] = 0;
+			preempt_disable();
 			pagefault_disable();
 			enable_kernel_altivec();
 			enable_kernel_fp();
 			gcm_ghash_p8(dctx->shash, ctx->htable,
 				     dctx->buffer, GHASH_DIGEST_SIZE);
 			pagefault_enable();
+			preempt_enable();
 			dctx->bytes = 0;
 		}
 		memcpy(out, dctx->shash, GHASH_DIGEST_SIZE);