From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailhub1.si.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by lists.ozlabs.org (Postfix) with ESMTP id CBA851A0326 for ; Fri, 6 Mar 2015 03:46:22 +1100 (AEDT) From: Christophe Leroy To: Kim Phillips , Herbert Xu , "David S. Miller" Subject: [PATCH 09/17] crypto: talitos - Move reset/init helpers into talitos2.h Message-Id: <20150305164606.D789C1A2423@localhost.localdomain> Date: Thu, 5 Mar 2015 17:46:06 +0100 (CET) Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Move reset/init helpers init talitos2.h as they are specific to SEC2 Signed-off-by: Christophe Leroy --- drivers/crypto/talitos.c | 19 ------------------- drivers/crypto/talitos2.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index de31ab0..d15cf83 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -55,19 +55,6 @@ #include "talitos.h" -static unsigned int do_reset_channel(struct talitos_private *priv, int ch) -{ - unsigned int timeout = TALITOS_TIMEOUT; - - setbits32(priv->chan[ch].reg + TALITOS_CCCR, TALITOS_CCCR_RESET); - - while ((in_be32(priv->chan[ch].reg + TALITOS_CCCR) & TALITOS_CCCR_RESET) - && --timeout) - cpu_relax(); - - return timeout; -} - int talitos_reset_channel(struct device *dev, int ch) { struct talitos_private *priv = dev_get_drvdata(dev); @@ -118,12 +105,6 @@ static int reset_device(struct device *dev) /* * Reset and initialize the device */ -static void do_init_device(struct talitos_private *priv) -{ - setbits32(priv->reg + TALITOS_IMR, TALITOS_IMR_INIT); - setbits32(priv->reg + TALITOS_IMR_LO, TALITOS_IMR_LO_INIT); -} - int talitos_init_device(struct device *dev) { struct talitos_private *priv = dev_get_drvdata(dev); diff --git a/drivers/crypto/talitos2.h b/drivers/crypto/talitos2.h index e7a91cf..f9da9f2 100644 --- a/drivers/crypto/talitos2.h +++ b/drivers/crypto/talitos2.h @@ -202,3 +202,23 @@ extern int talitos_alg_alloc_aead(struct crypto_alg *alg); #define DESC_PTR_LNKTBL_JUMP 0x80 #define DESC_PTR_LNKTBL_RETURN 0x02 #define DESC_PTR_LNKTBL_NEXT 0x01 + +static inline unsigned int do_reset_channel(struct talitos_private *priv, + int ch) +{ + unsigned int timeout = TALITOS_TIMEOUT; + + setbits32(priv->chan[ch].reg + TALITOS_CCCR, TALITOS_CCCR_RESET); + + while ((in_be32(priv->chan[ch].reg + TALITOS_CCCR) & TALITOS_CCCR_RESET) + && --timeout) + cpu_relax(); + + return timeout; +} + +static inline void do_init_device(struct talitos_private *priv) +{ + setbits32(priv->reg + TALITOS_IMR, TALITOS_IMR_INIT); + setbits32(priv->reg + TALITOS_IMR_LO, TALITOS_IMR_LO_INIT); +} -- 2.1.0