Commit ea389be9 authored by Corentin Labbe's avatar Corentin Labbe Committed by Herbert Xu
Browse files

crypto: rockchip - use the rk_crypto_info given as parameter 



Instead of using the crypto_info from TFM ctx, use the one given as parameter.

Reviewed-by: default avatarJohn Keeping <john@metanate.com>
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c018c7a9

drivers/crypto/rockchip/rk3288_crypto_skcipher.c

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static void rk_cipher_hw_init(struct rk_crypto_info *dev, struct skcipher_reques 
			     RK_CRYPTO_TDES_BYTESWAP_KEY |

			     RK_CRYPTO_TDES_BYTESWAP_IV;

		CRYPTO_WRITE(dev, RK_CRYPTO_TDES_CTRL, rctx->mode);

		memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, ctx->key, ctx->keylen);

		memcpy_toio(dev->reg + RK_CRYPTO_TDES_KEY1_0, ctx->key, ctx->keylen);

		conf_reg = RK_CRYPTO_DESSEL;

	} else {

		rctx->mode |= RK_CRYPTO_AES_FIFO_MODE |
@@ -266,7 +266,7 @@ static void rk_cipher_hw_init(struct rk_crypto_info *dev, struct skcipher_reques 
		else if (ctx->keylen == AES_KEYSIZE_256)

			rctx->mode |= RK_CRYPTO_AES_256BIT_key;

		CRYPTO_WRITE(dev, RK_CRYPTO_AES_CTRL, rctx->mode);

		memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_KEY_0, ctx->key, ctx->keylen);

		memcpy_toio(dev->reg + RK_CRYPTO_AES_KEY_0, ctx->key, ctx->keylen);

	}

	conf_reg |= RK_CRYPTO_BYTESWAP_BTFIFO |

		    RK_CRYPTO_BYTESWAP_BRFIFO;