On 10/13/21 6:55 AM, 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.
>
> Move the code leg requesting dma channels earlier in the
> probe() flow. This fixes the qce probe failure issues when both qce
> and BMA dma are compiled as static part of the kernel.
Hi Bhupesh,
I am quite curious to know the nature of probe failure you are seeing
with the current sequence. I am not against changing the sequence but
for me when a driver is enabled, it is clocks first, interconnect next
and then dma. Also I have tested the current sequence on sm8150 with
both the modules built in as static and I have not seen the failure.
--
Warm Regards
Thara (She/Her/Hers)
>
> Cc: Thara Gopinath <[email protected]>
> Cc: Bjorn Andersson <[email protected]>
> Signed-off-by: Bhupesh Sharma <[email protected]>
> ---
> drivers/crypto/qce/core.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/crypto/qce/core.c b/drivers/crypto/qce/core.c
> index cb8c77709e1e..c6f686126fc9 100644
> --- a/drivers/crypto/qce/core.c
> +++ b/drivers/crypto/qce/core.c
> @@ -209,9 +209,19 @@ static int qce_crypto_probe(struct platform_device *pdev)
> if (ret < 0)
> return ret;
>
> + /* qce driver requires BAM dma driver to be setup first.
> + * In case the dma channel are not set yet, this check
> + * helps use to return -EPROBE_DEFER earlier.
> + */
> + ret = qce_dma_request(qce->dev, &qce->dma);
> + if (ret)
> + return ret;
> +
> qce->mem_path = of_icc_get(qce->dev, "memory");
> - if (IS_ERR(qce->mem_path))
> + if (IS_ERR(qce->mem_path)) {
> + qce_dma_release(&qce->dma);
> return PTR_ERR(qce->mem_path);
> + }
>
> qce->core = devm_clk_get_optional(qce->dev, "core");
> if (IS_ERR(qce->core)) {
> @@ -247,10 +257,6 @@ static int qce_crypto_probe(struct platform_device *pdev)
> if (ret)
> goto err_clks_iface;
>
> - ret = qce_dma_request(qce->dev, &qce->dma);
> - if (ret)
> - goto err_clks;
> -
> ret = qce_check_version(qce);
> if (ret)
> goto err_clks;
> @@ -265,12 +271,10 @@ static int qce_crypto_probe(struct platform_device *pdev)
>
> ret = qce_register_algs(qce);
> if (ret)
> - goto err_dma;
> + goto err_clks;
>
> return 0;
>
> -err_dma:
> - qce_dma_release(&qce->dma);
> err_clks:
> clk_disable_unprepare(qce->bus);
> err_clks_iface:
>
Hi Thara,
On Wed, 20 Oct 2021 at 19:40, Thara Gopinath <[email protected]> wrote:
>
> On 10/13/21 6:55 AM, 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.
> >
> > Move the code leg requesting dma channels earlier in the
> > probe() flow. This fixes the qce probe failure issues when both qce
> > and BMA dma are compiled as static part of the kernel.
>
> Hi Bhupesh,
>
> I am quite curious to know the nature of probe failure you are seeing
> with the current sequence. I am not against changing the sequence but
> for me when a driver is enabled, it is clocks first, interconnect next
> and then dma. Also I have tested the current sequence on sm8150 with
> both the modules built in as static and I have not seen the failure.
Sure. The problem I faced was the following. Let's consider the
scenario where while the qce crypto driver and the interconnect are
compiled as static parts of the kernel, the bam DMA driver is compiled
as a module, then the -EPROBE_DEFER return leg from the qce crypto
driver is very late in the probe() flow, as we first turn on the
clocks and then the interconnect.
Now the suggested linux deferred probe implementation is to return as
early from the caling driver in case the called driver (subdev) is not
yet ready. SInce the qce crypto driver requires the bam DMA to be set
up first, it makes sense to move 'qce_dma_request' early in the boot
flow. If it's not yet probed(), it probably doesn't make sense to set
up the clks and interconnects yet in the qce driver. We can do it
later when the bam DMA is setup.
I have tested the following combinations with the change I made in
this patchset:
1. qce - static, bam - module, interconnect - module ->
qce_dma_request returned -EPROBE_DEFER
2. qce - static, bam - module, interconnect - static ->
qce_dma_request returned -EPROBE_DEFER
3. qce - static, bam - static, interconnect - module ->
qce_dma_request returned -EPROBE_DEFER
4. qce - static, bam - static, interconnect - static -> no -EPROBE_DEFER
Thanks,
Bhupesh
> > Cc: Thara Gopinath <[email protected]>
> > Cc: Bjorn Andersson <[email protected]>
> > Signed-off-by: Bhupesh Sharma <[email protected]>
> > ---
> > drivers/crypto/qce/core.c | 20 ++++++++++++--------
> > 1 file changed, 12 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/crypto/qce/core.c b/drivers/crypto/qce/core.c
> > index cb8c77709e1e..c6f686126fc9 100644
> > --- a/drivers/crypto/qce/core.c
> > +++ b/drivers/crypto/qce/core.c
> > @@ -209,9 +209,19 @@ static int qce_crypto_probe(struct platform_device *pdev)
> > if (ret < 0)
> > return ret;
> >
> > + /* qce driver requires BAM dma driver to be setup first.
> > + * In case the dma channel are not set yet, this check
> > + * helps use to return -EPROBE_DEFER earlier.
> > + */
> > + ret = qce_dma_request(qce->dev, &qce->dma);
> > + if (ret)
> > + return ret;
> > +
> > qce->mem_path = of_icc_get(qce->dev, "memory");
> > - if (IS_ERR(qce->mem_path))
> > + if (IS_ERR(qce->mem_path)) {
> > + qce_dma_release(&qce->dma);
> > return PTR_ERR(qce->mem_path);
> > + }
> >
> > qce->core = devm_clk_get_optional(qce->dev, "core");
> > if (IS_ERR(qce->core)) {
> > @@ -247,10 +257,6 @@ static int qce_crypto_probe(struct platform_device *pdev)
> > if (ret)
> > goto err_clks_iface;
> >
> > - ret = qce_dma_request(qce->dev, &qce->dma);
> > - if (ret)
> > - goto err_clks;
> > -
> > ret = qce_check_version(qce);
> > if (ret)
> > goto err_clks;
> > @@ -265,12 +271,10 @@ static int qce_crypto_probe(struct platform_device *pdev)
> >
> > ret = qce_register_algs(qce);
> > if (ret)
> > - goto err_dma;
> > + goto err_clks;
> >
> > return 0;
> >
> > -err_dma:
> > - qce_dma_release(&qce->dma);
> > err_clks:
> > clk_disable_unprepare(qce->bus);
> > err_clks_iface:
> >
>
>