From patchwork Tue Oct 27 13:47:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312037 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 37198C6379F for ; Tue, 27 Oct 2020 17:26:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D128B21D24 for ; Tue, 27 Oct 2020 17:26:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819610; bh=f/HgVOAJzeq+5iPW5B2NBIb2TqBz5P25xd0J88Tlb78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e2tQS2yzucb6gXZOjW1fp7kOfEHLD2ylz8c0BCjo0Q+Ikgn6P8FfcUMGw6NwM46tJ 6RMWGhD2bCpPPLsCBtPBjIMakOrdQfdH0VSHOdmgAkTBdHtk52kqvMCOteQ7TriZ6J fM1+7NV9YRluv/ZePPJS2x0SBg0IvA7FaSBp6VeQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S369876AbgJ0R0t (ORCPT ); Tue, 27 Oct 2020 13:26:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:54128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1780075AbgJ0Oxp (ORCPT ); Tue, 27 Oct 2020 10:53:45 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 B712F20679; Tue, 27 Oct 2020 14:53:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810425; bh=f/HgVOAJzeq+5iPW5B2NBIb2TqBz5P25xd0J88Tlb78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BjZ0MA9Bw6WbmsfKp/82/tEUSq1Qo/nZ0Jym1SX7DzGiAMd/jwFWWBhRH1fdOa/GT hXgeC0VmohZ6YqoAB52igisMFCqck9jpDmiIKFCFSTyrQZK+eP8ShYqTvvQmZL6rZi TwWzDyra/QvggbR27ycXQJwS0hCoObbQ8OpVgpXk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Corentin Labbe , Herbert Xu , Sasha Levin Subject: [PATCH 5.8 134/633] crypto: sun8i-ce - handle endianness of t_common_ctl Date: Tue, 27 Oct 2020 14:47:57 +0100 Message-Id: <20201027135528.975923563@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Corentin Labbe [ Upstream commit 87f34260f5e09a4578132ad1c05aef2d707dd4bf ] t_common_ctl is LE32 so we need to convert its value before using it. This value is only used on H6 (ignored on other SoCs) and not handling the endianness cause failure on xRNG/hashes operations on H6 when running BE. Fixes: 06f751b61329 ("crypto: allwinner - Add sun8i-ce Crypto Engine") Signed-off-by: Corentin Labbe Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c index b957061424a1f..8f3d6d31da52f 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c @@ -120,7 +120,10 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow, const char *name) /* Be sure all data is written before enabling the task */ wmb(); - v = 1 | (ce->chanlist[flow].tl->t_common_ctl & 0x7F) << 8; + /* Only H6 needs to write a part of t_common_ctl along with "1", but since it is ignored + * on older SoCs, we have no reason to complicate things. + */ + v = 1 | ((le32_to_cpu(ce->chanlist[flow].tl->t_common_ctl) & 0x7F) << 8); writel(v, ce->base + CE_TLR); mutex_unlock(&ce->mlock);