rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / mv_cesa.c

diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index f53dd83438bcab6af17001ec540b8174eec77a6f..3cf303ee3fe3449efd185a8567252a36759d5bca 100644 (file)
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -342,13 +342,11 @@ static void mv_process_hash_current(int first_block)
                else
                        op.config |= CFG_MID_FRAG;
 
-               if (first_block) {
-                       writel(req_ctx->state[0], cpg->reg + DIGEST_INITIAL_VAL_A);
-                       writel(req_ctx->state[1], cpg->reg + DIGEST_INITIAL_VAL_B);
-                       writel(req_ctx->state[2], cpg->reg + DIGEST_INITIAL_VAL_C);
-                       writel(req_ctx->state[3], cpg->reg + DIGEST_INITIAL_VAL_D);
-                       writel(req_ctx->state[4], cpg->reg + DIGEST_INITIAL_VAL_E);
-               }
+               writel(req_ctx->state[0], cpg->reg + DIGEST_INITIAL_VAL_A);
+               writel(req_ctx->state[1], cpg->reg + DIGEST_INITIAL_VAL_B);
+               writel(req_ctx->state[2], cpg->reg + DIGEST_INITIAL_VAL_C);
+               writel(req_ctx->state[3], cpg->reg + DIGEST_INITIAL_VAL_D);
+               writel(req_ctx->state[4], cpg->reg + DIGEST_INITIAL_VAL_E);
        }
 
        memcpy(cpg->sram + SRAM_CONFIG, &op, sizeof(struct sec_accel_config));
@@ -713,7 +711,6 @@ static int mv_hash_final(struct ahash_request *req)
 {
        struct mv_req_hash_ctx *ctx = ahash_request_ctx(req);
 
-       ahash_request_set_crypt(req, NULL, req->result, 0);
        mv_update_hash_req_ctx(ctx, 1, 0);
        return mv_handle_req(&req->base);
 }