Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp1688181ybi; Wed, 17 Jul 2019 20:09:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqzbzW5NjOEvkrCijh/f7xqhiAzONQSvWlbscm7J/+cWiVdZa+2/gPvlGrIbpjCQPL4XZqtE X-Received: by 2002:a17:902:2bc5:: with SMTP id l63mr48866798plb.30.1563419365180; Wed, 17 Jul 2019 20:09:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563419365; cv=none; d=google.com; s=arc-20160816; b=KM1D/nnBbv7+ShUzz+TSMtCFmFk5p9QasBJTOf4oeQBhJNaFuSyKyYJvjsXVu5p42Q gIrm8X+tPF67uK1WOWa8gFuoSV/g7VLT/fc9EQCMc1OG5NcwccUAWgwDZ6s4IuRp6RmA 2CXDPrD32R+EewkgPur8phceVPXOhveupSU5GJNQHSQgyZ/FZAMe3cIBcoBX5/Gc1XH3 xBIKbSnnNsfUI6fHqPJr3VrkrsOMLGICJfT9K1mShGog9sPi9pEEFLH/v5nJvI6+0+o6 y01bkFwWLC8fIng8CcGfQczH7SkrnhCRB4QpypR8Qm4dlb/mgyo4tnuFDb3df7dP8J3p bEvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EnQqlOpR/G5by+BmuuFOY6/LdIYeT9QDCJW4IGnx7MU=; b=XCWWpibl/e19S0N3pY35CVimDzlF36oCc8dguPfHNNvyaelLkEQsIXryiFBgGsnKeB VBrgqrPFARgDXnOwsfvPDqAUrCS6TtyOqx31gNWx9k5WPYjvaYXfp9nvEzHpk24mcKT7 y6ajkzW5hkDl7CHsI/SjJ6d/vFYEUUAMJJWsTZxEIU6PYPq75iVVV4qaVNVIvDCBDle2 4m7ZO7TwDTZAO9kuayVlogIesvwxbWYOrhAvG+2bL84Vjpu0jIWTpnaksseiZ+Ft3vIr lJXAI02FBAdtxctMCFA3FHcNIRokWTV2GU/X3nRayf4R8QZSB/9bh62EtQy4JUautnl8 EjLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="H6i/S//J"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 67si1514970pfv.74.2019.07.17.20.09.09; Wed, 17 Jul 2019 20:09:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="H6i/S//J"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390589AbfGRDIB (ORCPT + 99 others); Wed, 17 Jul 2019 23:08:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:39684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390020AbfGRDH4 (ORCPT ); Wed, 17 Jul 2019 23:07:56 -0400 Received: from localhost (115.42.148.210.bf.2iij.net [210.148.42.115]) (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 A171C2173E; Thu, 18 Jul 2019 03:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419275; bh=TQ9/G6BptbWSST519WW8I97eo7t6QlgZulsO0gAVW/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H6i/S//JPnodSBS/oZzY+7jOFaRM00+ShCdcwOrJjLDL1q1tSAQLQzWyJDgiXh8LQ OjrnlejyHHgUsd+c5V3K+t2HmalVM8CbumB4iZpZ5OFXqYr7O8+cqjZAar31oydpRt dMzL6qOfjeagss73/iDoejae9piXZd1bBp0pz7rA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , Herbert Xu Subject: [PATCH 4.19 40/47] crypto: talitos - move struct talitos_edesc into talitos.h Date: Thu, 18 Jul 2019 12:01:54 +0900 Message-Id: <20190718030052.141201640@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190718030045.780672747@linuxfoundation.org> References: <20190718030045.780672747@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 From: Christophe Leroy commit d44769e4ccb636e8238adbc151f25467a536711b upstream. Moves struct talitos_edesc into talitos.h so that it can be used from any place in talitos.c It will be required for next patch ("crypto: talitos - fix hash on SEC1") Signed-off-by: Christophe Leroy Cc: stable@vger.kernel.org Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/talitos.c | 30 ------------------------------ drivers/crypto/talitos.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -913,36 +913,6 @@ badkey: return -EINVAL; } -/* - * talitos_edesc - s/w-extended descriptor - * @src_nents: number of segments in input scatterlist - * @dst_nents: number of segments in output scatterlist - * @icv_ool: whether ICV is out-of-line - * @iv_dma: dma address of iv for checking continuity and link table - * @dma_len: length of dma mapped link_tbl space - * @dma_link_tbl: bus physical address of link_tbl/buf - * @desc: h/w descriptor - * @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) - * @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) - * - * if decrypting (with authcheck), or either one of src_nents or dst_nents - * is greater than 1, an integrity check value is concatenated to the end - * of link_tbl data - */ -struct talitos_edesc { - int src_nents; - int dst_nents; - bool icv_ool; - dma_addr_t iv_dma; - int dma_len; - dma_addr_t dma_link_tbl; - struct talitos_desc desc; - union { - struct talitos_ptr link_tbl[0]; - u8 buf[0]; - }; -}; - static void talitos_sg_unmap(struct device *dev, struct talitos_edesc *edesc, struct scatterlist *src, --- a/drivers/crypto/talitos.h +++ b/drivers/crypto/talitos.h @@ -65,6 +65,36 @@ struct talitos_desc { #define TALITOS_DESC_SIZE (sizeof(struct talitos_desc) - sizeof(__be32)) +/* + * talitos_edesc - s/w-extended descriptor + * @src_nents: number of segments in input scatterlist + * @dst_nents: number of segments in output scatterlist + * @icv_ool: whether ICV is out-of-line + * @iv_dma: dma address of iv for checking continuity and link table + * @dma_len: length of dma mapped link_tbl space + * @dma_link_tbl: bus physical address of link_tbl/buf + * @desc: h/w descriptor + * @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) + * @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) + * + * if decrypting (with authcheck), or either one of src_nents or dst_nents + * is greater than 1, an integrity check value is concatenated to the end + * of link_tbl data + */ +struct talitos_edesc { + int src_nents; + int dst_nents; + bool icv_ool; + dma_addr_t iv_dma; + int dma_len; + dma_addr_t dma_link_tbl; + struct talitos_desc desc; + union { + struct talitos_ptr link_tbl[0]; + u8 buf[0]; + }; +}; + /** * talitos_request - descriptor submission request * @desc: descriptor pointer (kernel virtual)