From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C84B1C32750 for ; Fri, 2 Aug 2019 09:41:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 981DD20B7C for ; Fri, 2 Aug 2019 09:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738867; bh=pMSYZ5ASEIOc6jdYKToCqL1btEnCcUAMY1gUP1vhC4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EDqF56l/RJqqhm19SPnPKxDnpJlcSzlUotNROrw1Zt0v9s7A0i632skqfKvQFscA0 raqg6QC1JIaOzWpyH8cU55QR0rl2bTtkmnGLcwWKKzYp92KWRZwoyMfHVFTbeNgir8 dVEg0kDnjtRpEau6IC2RnmS1NEzalCXqEAh0q2wU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391777AbfHBJlG (ORCPT ); Fri, 2 Aug 2019 05:41:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:42338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391762AbfHBJlC (ORCPT ); Fri, 2 Aug 2019 05:41:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EE3BA20679; Fri, 2 Aug 2019 09:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738861; bh=pMSYZ5ASEIOc6jdYKToCqL1btEnCcUAMY1gUP1vhC4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SXQGsp45F2Lk6mCD4JpAfwykZLyGlzewodg4UqxCGwxfrW+uB/UcMa4GYzYsnHioV 1H7c00GulR9dfcYZBJMGdiLw970sAdVxF78CmmFBYe1gTXzbeH3VcihzYXv19sxUn+ G96AFQUHlm6XXEmFZ7LilfQChzU6f84W18h/jFmE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , Herbert Xu , Sasha Levin Subject: [PATCH 4.9 024/223] crypto: talitos - Align SEC1 accesses to 32 bits boundaries. Date: Fri, 2 Aug 2019 11:34:09 +0200 Message-Id: <20190802092240.594604317@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092238.692035242@linuxfoundation.org> References: <20190802092238.692035242@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit c9cca7034b34a2d82e9a03b757de2485c294851c ] The MPC885 reference manual states: SEC Lite-initiated 8xx writes can occur only on 32-bit-word boundaries, but reads can occur on any byte boundary. Writing back a header read from a non-32-bit-word boundary will yield unpredictable results. In order to ensure that, cra_alignmask is set to 3 for SEC1. Signed-off-by: Christophe Leroy Fixes: 9c4a79653b35 ("crypto: talitos - Freescale integrated security engine (SEC) driver") Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/talitos.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index e7864aa494a1..ea8595d2c3d8 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -3119,7 +3119,10 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, alg->cra_priority = t_alg->algt.priority; else alg->cra_priority = TALITOS_CRA_PRIORITY; - alg->cra_alignmask = 0; + if (has_ftr_sec1(priv)) + alg->cra_alignmask = 3; + else + alg->cra_alignmask = 0; alg->cra_ctxsize = sizeof(struct talitos_ctx); alg->cra_flags |= CRYPTO_ALG_KERN_DRIVER_ONLY; -- 2.20.1