From patchwork Thu Mar 5 16:46:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 5947841 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A6C3CBF440 for ; Thu, 5 Mar 2015 16:50:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C94AA2038E for ; Thu, 5 Mar 2015 16:50:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E118C2038F for ; Thu, 5 Mar 2015 16:50:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758061AbbCEQuQ (ORCPT ); Thu, 5 Mar 2015 11:50:16 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:48243 "EHLO mailhub1.si.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757867AbbCEQqZ (ORCPT ); Thu, 5 Mar 2015 11:46:25 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 85EE91C833F; Thu, 5 Mar 2015 17:46:22 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from mailhub1.si.c-s.fr ([192.168.12.234]) by localhost (mailhub1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eb4Ojj5JL5Cd; Thu, 5 Mar 2015 17:46:22 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 6B4981C833B; Thu, 5 Mar 2015 17:46:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 743D1C73CC; Thu, 5 Mar 2015 17:46:21 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id mF26k7vMqjMa; Thu, 5 Mar 2015 17:46:21 +0100 (CET) Received: from PO10863.localdomain (unknown [172.25.231.75]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 35E20C73CF; Thu, 5 Mar 2015 17:46:15 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 33E4A1A2428; Thu, 5 Mar 2015 17:46:07 +0100 (CET) From: Christophe Leroy To: Kim Phillips , Herbert Xu , "David S. Miller" CC: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-crypto@vger.kernel.org Subject: [PATCH 14/17] crypto: talitos - Add a helper function to clear j_extent field Message-Id: <20150305164607.33E4A1A2428@localhost.localdomain> Date: Thu, 5 Mar 2015 17:46:07 +0100 (CET) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP j_extent field is specific to SEC2 so we add a helper function to clear it so that SEC1 can redefine that function as nop Signed-off-by: Christophe Leroy --- drivers/crypto/talitos.c | 2 +- drivers/crypto/talitos2.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index fc30196..37d7746 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -628,7 +628,7 @@ static int common_nonsnoop(struct talitos_edesc *edesc, /* cipher iv */ to_talitos_ptr(&desc->ptr[1], edesc->iv_dma); desc->ptr[1].len = cpu_to_be16(ivsize); - desc->ptr[1].j_extent = 0; + to_talitos_ptr_extent_clear(&desc->ptr[1]); /* cipher key */ map_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen, diff --git a/drivers/crypto/talitos2.h b/drivers/crypto/talitos2.h index 7177088..6f98b12 100644 --- a/drivers/crypto/talitos2.h +++ b/drivers/crypto/talitos2.h @@ -90,6 +90,11 @@ static inline void to_talitos_ptr(struct talitos_ptr *ptr, dma_addr_t dma_addr) ptr->eptr = upper_32_bits(dma_addr); } +static inline void to_talitos_ptr_extent_clear(struct talitos_ptr *ptr) +{ + ptr->j_extent = 0; +} + /* * map virtual single (contiguous) pointer to h/w descriptor pointer */