From patchwork Tue Aug 7 08:00:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Niestroj X-Patchwork-Id: 10558379 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4047114E2 for ; Tue, 7 Aug 2018 08:45:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D77829BBF for ; Tue, 7 Aug 2018 08:45:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2169929BC3; Tue, 7 Aug 2018 08:45:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BB7B29BBF for ; Tue, 7 Aug 2018 08:45:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727383AbeHGK6a (ORCPT ); Tue, 7 Aug 2018 06:58:30 -0400 Received: from smtp.megiteam.pl ([31.186.83.105]:43644 "EHLO smtp.megiteam.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727319AbeHGK6a (ORCPT ); Tue, 7 Aug 2018 06:58:30 -0400 X-Greylist: delayed 2681 seconds by postgrey-1.27 at vger.kernel.org; Tue, 07 Aug 2018 06:58:29 EDT Received: from [95.143.241.142] (helo=localhost.localdomain) by smtp.megiteam.pl with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fmwv2-0003oR-Ne; Tue, 07 Aug 2018 10:00:43 +0200 From: Marcin Niestroj To: =?utf-8?q?Horia_Geant=C4=83?= Cc: Aymen Sghaier , Herbert Xu , "David S . Miller" , linux-crypto@vger.kernel.org, Marcin Niestroj Subject: [RESEND PATCH 2/2] crypto: caam - Support deferred probing in JR dependent drivers Date: Tue, 7 Aug 2018 10:00:26 +0200 Message-Id: <20180807080026.17039-3-m.niestroj@grinn-global.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180807080026.17039-1-m.niestroj@grinn-global.com> References: <20180807080026.17039-1-m.niestroj@grinn-global.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is possible, that caam_jr_alloc() is called before JR devices are probed. Return -EPROBE_DEFER in drivers that rely on JR devices, so they are probed at later stage. Signed-off-by: Marcin Niestroj --- drivers/crypto/caam/caamalg.c | 3 +++ drivers/crypto/caam/caamalg_qi.c | 3 +++ drivers/crypto/caam/caamhash.c | 3 +++ drivers/crypto/caam/caampkc.c | 3 +++ drivers/crypto/caam/caamrng.c | 3 +++ 5 files changed, 15 insertions(+) diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index d67667970f7e..610a3f72ac5d 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -3253,6 +3253,9 @@ static int caam_init_common(struct caam_ctx *ctx, struct caam_alg_entry *caam, ctx->jrdev = caam_jr_alloc(); if (IS_ERR(ctx->jrdev)) { + if (PTR_ERR(ctx->jrdev)) + return -EPROBE_DEFER; + pr_err("Job Ring Device allocation for transform failed\n"); return PTR_ERR(ctx->jrdev); } diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c index 6e61cc93c2b0..85c69a8b5126 100644 --- a/drivers/crypto/caam/caamalg_qi.c +++ b/drivers/crypto/caam/caamalg_qi.c @@ -2547,6 +2547,9 @@ static int caam_init_common(struct caam_ctx *ctx, struct caam_alg_entry *caam, */ ctx->jrdev = caam_jr_alloc(); if (IS_ERR(ctx->jrdev)) { + if (PTR_ERR(ctx->jrdev)) + return -EPROBE_DEFER; + pr_err("Job Ring Device allocation for transform failed\n"); return PTR_ERR(ctx->jrdev); } diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 0beb28196e20..c2ccb802b7d5 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -1746,6 +1746,9 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm) */ ctx->jrdev = caam_jr_alloc(); if (IS_ERR(ctx->jrdev)) { + if (PTR_ERR(ctx->jrdev)) + return -EPROBE_DEFER; + pr_err("Job Ring Device allocation for transform failed\n"); return PTR_ERR(ctx->jrdev); } diff --git a/drivers/crypto/caam/caampkc.c b/drivers/crypto/caam/caampkc.c index 578ea63a3109..072da03207a1 100644 --- a/drivers/crypto/caam/caampkc.c +++ b/drivers/crypto/caam/caampkc.c @@ -972,6 +972,9 @@ static int caam_rsa_init_tfm(struct crypto_akcipher *tfm) ctx->dev = caam_jr_alloc(); if (IS_ERR(ctx->dev)) { + if (PTR_ERR(ctx->dev)) + return -EPROBE_DEFER; + pr_err("Job Ring Device allocation for transform failed\n"); return PTR_ERR(ctx->dev); } diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index fde07d4ff019..56616b94416b 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c @@ -340,6 +340,9 @@ static int __init caam_rng_init(void) dev = caam_jr_alloc(); if (IS_ERR(dev)) { + if (PTR_ERR(dev)) + return -EPROBE_DEFER; + pr_err("Job Ring Device allocation for transform failed\n"); return PTR_ERR(dev); }