| Message ID | 20220111124104.2379295-1-festevam@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | crypto: caam - enable prediction resistance conditionally | expand |
Hi Horia, On Fri, Jan 28, 2022 at 4:44 AM Horia Geantă <horia.geanta@nxp.com> wrote: > What parts exactly? > Anything besides i.MX6 SX, S/DL? I see it on i.MX6SX, but in this report, it is mentioned i.MX6D: https://www.spinics.net/lists/linux-crypto/msg52319.html Lucas always saw it on i.MX6D: https://linuxlists.cc/l/4/linux-crypto/t/3843436/caam_rng_trouble > We've been in contact with Fabio and we're working on a solution. > Now I realize the list hasn't been Cc-ed - sorry for the confusion > and for not providing an explicit Nack. Varun on Cc said he would work on a proper solution as he was able to reproduce it. Any progress, Varun? Thanks
On Fri, Jan 28, 2022 at 09:44:09AM +0200, Horia Geantă wrote: > > Herbert, could you please revert this patch? OK I will revert this. Thanks,
Hi Varun,
On Tue, Mar 22, 2022 at 10:56 AM Varun Sethi <V.Sethi@nxp.com> wrote:
> [Varun] Yes, we have made progress on the fix. Currently we are testing the fix and should be able to post the patch upstream pretty soon.
Any progress on the fix?
Thanks
Hi Varun, On Sat, Apr 16, 2022 at 9:24 AM Fabio Estevam <festevam@gmail.com> wrote: > Is the kernel patch that you plan to send along the lines of the > following U-Boot patch? > https://patchwork.ozlabs.org/project/uboot/patch/20220415111049.2565744-1-gaurav.jain@nxp.com/ Following the U-Boot fix, the kernel patch would look like this: --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -648,6 +648,8 @@ static int caam_probe(struct platform_device *pdev) return ret; } + if (of_machine_is_compatible("fsl,imx6sx")) + ent_delay = 12000; /* Get configuration properties from device tree */ /* First, get register page */ @@ -871,6 +873,8 @@ static int caam_probe(struct platform_device *pdev) */ ret = instantiate_rng(dev, inst_handles, gen_sk); + if (of_machine_is_compatible("fsl,imx6sx")) + break; if (ret == -EAGAIN) /* * if here, the loop will rerun, What do you think?
diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index 77d048dfe5d0..3514fe5de2a5 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c @@ -63,12 +63,19 @@ static void caam_rng_done(struct device *jrdev, u32 *desc, u32 err, complete(jctx->done); } -static u32 *caam_init_desc(u32 *desc, dma_addr_t dst_dma) +static u32 *caam_init_desc(struct device *jrdev, u32 *desc, dma_addr_t dst_dma) { + struct caam_drv_private *priv = dev_get_drvdata(jrdev->parent); + init_job_desc(desc, 0); /* + 1 cmd_sz */ /* Generate random bytes: + 1 cmd_sz */ - append_operation(desc, OP_ALG_ALGSEL_RNG | OP_TYPE_CLASS1_ALG | - OP_ALG_PR_ON); + + if (priv->mc_en) + append_operation(desc, OP_ALG_ALGSEL_RNG | OP_TYPE_CLASS1_ALG | + OP_ALG_PR_ON); + else + append_operation(desc, OP_ALG_ALGSEL_RNG | OP_TYPE_CLASS1_ALG); + /* Store bytes: + 1 cmd_sz + caam_ptr_sz */ append_fifo_store(desc, dst_dma, CAAM_RNG_MAX_FIFO_STORE_SIZE, FIFOST_TYPE_RNGSTORE); @@ -101,7 +108,7 @@ static int caam_rng_read_one(struct device *jrdev, init_completion(done); err = caam_jr_enqueue(jrdev, - caam_init_desc(desc, dst_dma), + caam_init_desc(jrdev, desc, dst_dma), caam_rng_done, &jctx); if (err == -EINPROGRESS) { wait_for_completion(done);