On 5/5/21 5:37 PM, Bhupesh Sharma wrote:
> On some Qualcomm parts the qce crypto driver needs the interconnect between
> the crypto block and main memory to be initialized first before the crypto
> registers can be accessed. So it makes sense to defer the qce crypto driver
> probing in case the interconnect driver is not yet probed.
>
> This fixes the qce probe failure issues when both qce and
> interconnect drivers are compiled as static part of the kernel.
>
> Cc: Thara Gopinath <[email protected]>
> Cc: Bjorn Andersson <[email protected]>
> Cc: Rob Herring <[email protected]>
> Cc: Andy Gross <[email protected]>
> Cc: Herbert Xu <[email protected]>
> Cc: David S. Miller <[email protected]>
> Cc: Stephen Boyd <[email protected]>
> Cc: Michael Turquette <[email protected]>
> Cc: Vinod Koul <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Bhupesh Sharma <[email protected]>
> ---
> drivers/crypto/qce/core.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/crypto/qce/core.c b/drivers/crypto/qce/core.c
> index 3e742e9911fa..9915b184f780 100644
> --- a/drivers/crypto/qce/core.c
> +++ b/drivers/crypto/qce/core.c
> @@ -222,6 +222,20 @@ static int qce_crypto_probe(struct platform_device *pdev)
> return ret;
>
> qce->mem_path = of_icc_get(qce->dev, "memory");
> +
> + /* Check for NULL return path, which indicates
> + * interconnect API is disabled or the "interconnects"
> + * DT property is missing.
> + */
> + if (!qce->mem_path)
> + /* On some qcom parts, the qce crypto block needs interconnect
> + * paths to be configured before the registers can be accessed.
> + * Check here for the same.
> + */
> + if (!strcmp(of_id->compatible, "qcom,ipq6018-qce") ||
> + !strcmp(of_id->compatible, "qcom,sdm845-qce"))
> + return -EPROBE_DEFER;
> +
Hi Bhupesh,
You don't need this here. of_icc_get returns -EPROBE_DEFER if the
interconnect provider is not initialized yet.
--
Warm Regards
Thara
> if (IS_ERR(qce->mem_path))
> return PTR_ERR(qce->mem_path);
>
>