From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 3187FC4363C for ; Mon, 10 May 2021 13:29:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C80B613CD for ; Mon, 10 May 2021 13:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243079AbhEJNaH (ORCPT ); Mon, 10 May 2021 09:30:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242507AbhEJNYt (ORCPT ); Mon, 10 May 2021 09:24:49 -0400 Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF105C06138E for ; Mon, 10 May 2021 06:22:07 -0700 (PDT) Received: by mail-qt1-x82d.google.com with SMTP id f8so7678030qth.6 for ; Mon, 10 May 2021 06:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=GpFk/RkXBcsoO0wjPghj5V+HTZlbdeYCbg4hpqoR7F4=; b=Pil67YhbGH4k848YkpNUI7ff0wbhTu1avhC0npp39qUZd2aH6/Hvak9xaun3//Q1zI rppyLJC0n4yY6mid/0pUg/Ev7siK6oJEz/9AVk0n2YULFE292TUXNS30Jb0m7Rj012nu EvU404mZI+HFp2LeysmtuzV/IpDEKMgRdd5r0i7/hufWJQ7p+TK0CYiqcqFL3rYAZSrE V8h+B21x8mR+LKElImsMTmTa4vV3G1y7HzbpIBnt1QLnGNZEf6pLkq2pqlqZ/R9GHmwI QAqom9R8gbz1hMkIk6z8zIBfBW6oDhVVSNNlSHhIF0YdGUYi49sH+7ExsYxJUQJ7rUQS 9CWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=GpFk/RkXBcsoO0wjPghj5V+HTZlbdeYCbg4hpqoR7F4=; b=Q6jzmE/9txGC+8w3OUljj5YzFfCUYjxV79vmgg6Kw7guRMrOPeFx0OsjLgluOWlQMK pf/HE/jGPHMmhbBey5ZGkwasV1GjV0ffh7v0hEIW+yB1aG8lOQ56dSvjPTEdsfl0heP+ trZXmj+ILbchM1/YrO1DYf4whpqAoXSfl4FHa9QtTeglc3hCEighPN01MfMIjqWpqg6i Dr0J0v0psxNvppQDXw1I2fyzBaIl4qpfO5HR4dyCVfUNk3SAqGiZuRQpL6rIdfjXw8HH 9e7fvwtalPlE1pdTaSgW2EizDR8tUgndVyfRjcpvclgO9UEbkIs+laA/72HEAWMmvl/k XA+A== X-Gm-Message-State: AOAM532DT8Dc+4GQOQ/gyXx28GWOKGLVuLgIuR5KTWYd/Ogd0VPSWXMv XcD3Zo8sdhcY+Q3UtfynMoMLcg== X-Google-Smtp-Source: ABdhPJzfMtCtpMrBDgKuhauvsJ3pKVof7af9u5XGO1kS0J1bHHqd/zgau+HJQUh5MDDV6kHs27Ag4w== X-Received: by 2002:a05:622a:2c9:: with SMTP id a9mr7875046qtx.38.1620652926969; Mon, 10 May 2021 06:22:06 -0700 (PDT) Received: from [192.168.1.93] (pool-71-163-245-5.washdc.fios.verizon.net. [71.163.245.5]) by smtp.gmail.com with ESMTPSA id m16sm11298430qkm.100.2021.05.10.06.22.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 May 2021 06:22:06 -0700 (PDT) Subject: Re: [PATCH v2 15/17] crypto: qce: Defer probing if BAM dma is not yet initialized To: Bhupesh Sharma , linux-arm-msm@vger.kernel.org Cc: Bjorn Andersson , Rob Herring , Andy Gross , Herbert Xu , "David S . Miller" , Stephen Boyd , Michael Turquette , Vinod Koul , dmaengine@vger.kernel.org, linux-clk@vger.kernel.org, linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, bhupesh.linux@gmail.com References: <20210505213731.538612-1-bhupesh.sharma@linaro.org> <20210505213731.538612-16-bhupesh.sharma@linaro.org> From: Thara Gopinath Message-ID: <7d8bc623-ef12-c7ae-0d12-16b0b1c48ffe@linaro.org> Date: Mon, 10 May 2021 09:22:05 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210505213731.538612-16-bhupesh.sharma@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/5/21 5:37 PM, Bhupesh Sharma wrote: > Since the Qualcomm qce crypto driver needs the BAM dma driver to be > setup first (to allow crypto operations), it makes sense to defer > the qce crypto driver probing in case the BAM dma driver is not yet > probed. > > This fixes the qce probe failure issues when both qce and BMA dma > are compiled as static part of the kernel. > > Cc: Thara Gopinath > Cc: Bjorn Andersson > Cc: Rob Herring > Cc: Andy Gross > Cc: Herbert Xu > Cc: David S. Miller > Cc: Stephen Boyd > Cc: Michael Turquette > Cc: Vinod Koul > Cc: dmaengine@vger.kernel.org > Cc: linux-clk@vger.kernel.org > Cc: linux-crypto@vger.kernel.org > Cc: devicetree@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: bhupesh.linux@gmail.com > Signed-off-by: Bhupesh Sharma > --- > drivers/crypto/qce/core.c | 4 ++++ > drivers/dma/qcom/bam_dma.c | 7 +++++++ > 2 files changed, 11 insertions(+) > > diff --git a/drivers/crypto/qce/core.c b/drivers/crypto/qce/core.c > index 9a7d7ef94687..3e742e9911fa 100644 > --- a/drivers/crypto/qce/core.c > +++ b/drivers/crypto/qce/core.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > > #include "core.h" > #include "cipher.h" > @@ -201,6 +202,9 @@ static int qce_crypto_probe(struct platform_device *pdev) > of_match_device(qce_crypto_of_match, &pdev->dev); > int ret; > > + /* qce driver requires BAM dma driver to be setup first */ > + if (!bam_is_probed()) > + return -EPROBE_DEFER; Hi Bhupesh, You don't need this here. qce_dma_request returns -EPROBE_DEFER if the dma controller is not probed yet. -- Warm Regards Thara > > qce = devm_kzalloc(dev, sizeof(*qce), GFP_KERNEL); > if (!qce) > diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c > index 2bc3b7c7ee5a..c854fcc82dbf 100644 > --- a/drivers/dma/qcom/bam_dma.c > +++ b/drivers/dma/qcom/bam_dma.c > @@ -935,6 +935,12 @@ static void bam_channel_init(struct bam_device *bdev, struct bam_chan *bchan, > INIT_LIST_HEAD(&bchan->desc_list); > } > > +bool bam_is_probed(void) > +{ > + return bam_probed; > +} > +EXPORT_SYMBOL_GPL(bam_is_probed); > + > static const struct of_device_id bam_of_match[] = { > { .compatible = "qcom,bam-v1.3.0", .data = &bam_v1_3_reg_info }, > { .compatible = "qcom,bam-v1.4.0", .data = &bam_v1_4_reg_info }, > @@ -1084,6 +1090,7 @@ static int bam_dma_probe(struct platform_device *pdev) > if (ret) > goto err_unregister_dma; > > + bam_probed = true; > if (!bdev->bamclk) { > pm_runtime_disable(&pdev->dev); > return 0; >