From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 10 Oct 2016 03:19:47 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.9-rc1~53^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c3afafa47898e34eb49828ec4ac92bcdc81c8f0c;p=nvme.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in vmx ghash fix.
---

c3afafa47898e34eb49828ec4ac92bcdc81c8f0c
diff --cc drivers/crypto/caam/caamalg.c
index eb97562414d2,b3044219772c..156aad167cd6
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@@ -601,12 -568,21 +604,20 @@@ skip_enc
  	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |
  			     KEY_VLF);
  
+ 	if (alg->caam.geniv) {
+ 		append_seq_load(desc, ivsize, LDST_CLASS_1_CCB |
+ 				LDST_SRCDST_BYTE_CONTEXT |
+ 				(ctx1_iv_off << LDST_OFFSET_SHIFT));
+ 		append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_CLASS2INFIFO |
+ 			    (ctx1_iv_off << MOVE_OFFSET_SHIFT) | ivsize);
+ 	}
+ 
  	/* Load Counter into CONTEXT1 reg */
  	if (is_rfc3686)
 -		append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM |
 -				    LDST_CLASS_1_CCB |
 -				    LDST_SRCDST_BYTE_CONTEXT |
 -				    ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<
 -				     LDST_OFFSET_SHIFT));
 +		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |
 +				     LDST_SRCDST_BYTE_CONTEXT |
 +				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<
 +				      LDST_OFFSET_SHIFT));
  
  	/* Choose operation */
  	if (ctr_mode)