| Message ID | 20240416053303.421259-2-pankaj.gupta@nxp.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | caam: init-clk based on caam-page0-access | expand |
On 4/16/2024 8:35 AM, Pankaj Gupta wrote: > CAAM clock initializat is done based on the basis of soc specific ^ initialization > @@ -889,17 +895,25 @@ static int caam_probe(struct platform_device *pdev) > > reg_access = !ctrlpriv->optee_en; > > - if (!imx_soc_match->data) { > + if (imx_soc_match->data) { This is obviously incorrect. > dev_err(dev, "No clock data provided for i.MX SoC"); > return -EINVAL; > } Regards, Horia
> -----Original Message----- > From: Horia Geanta <horia.geanta@nxp.com> > Sent: Thursday, April 18, 2024 8:20 PM > To: Pankaj Gupta <pankaj.gupta@nxp.com>; Gaurav Jain > <gaurav.jain@nxp.com>; Varun Sethi <V.Sethi@nxp.com>; > herbert@gondor.apana.org.au; davem@davemloft.net; Iuliana Prodan > <iuliana.prodan@nxp.com>; linux-crypto@vger.kernel.org; linux- > kernel@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com> > Subject: Re: [PATCH v3 1/2] caam: init-clk based on caam-page0-access > > On 4/16/2024 8:35 AM, Pankaj Gupta wrote: > > CAAM clock initializat is done based on the basis of soc specific > ^ initialization > > > @@ -889,17 +895,25 @@ static int caam_probe(struct platform_device > *pdev) > > > > reg_access = !ctrlpriv->optee_en; > > > > - if (!imx_soc_match->data) { > > + if (imx_soc_match->data) { > This is obviously incorrect. [Accepted] > > > dev_err(dev, "No clock data provided for i.MX SoC"); > > return -EINVAL; > > } > > Regards, > Horia
If there are no further comments, request Herbert to merge the patch-set. Regards Pankaj > -----Original Message----- > From: Pankaj Gupta > Sent: Tuesday, April 16, 2024 11:05 AM > To: Gaurav Jain <gaurav.jain@nxp.com>; Horia Geanta > <horia.geanta@nxp.com>; Varun Sethi <V.Sethi@nxp.com>; > herbert@gondor.apana.org.au; davem@davemloft.net; Iuliana Prodan > <iuliana.prodan@nxp.com>; linux-crypto@vger.kernel.org; linux- > kernel@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com> > Cc: Pankaj Gupta <pankaj.gupta@nxp.com> > Subject: [PATCH v3 1/2] caam: init-clk based on caam-page0-access > > CAAM clock initializat is done based on the basis of soc specific info stored in > struct caam_imx_data: > - caam-page0-access flag > - num_clks > > CAAM driver needs to be aware of access rights to CAAM control page i.e., > page0, to do things differently. > > Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com> > --- > drivers/crypto/caam/ctrl.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index > bdf367f3f679..247d42aa32df 100644 > --- a/drivers/crypto/caam/ctrl.c > +++ b/drivers/crypto/caam/ctrl.c > @@ -512,6 +512,7 @@ static const struct of_device_id caam_match[] = > { MODULE_DEVICE_TABLE(of, caam_match); > > struct caam_imx_data { > + bool page0_access; > const struct clk_bulk_data *clks; > int num_clks; > }; > @@ -524,6 +525,7 @@ static const struct clk_bulk_data caam_imx6_clks[] = > { }; > > static const struct caam_imx_data caam_imx6_data = { > + .page0_access = true, > .clks = caam_imx6_clks, > .num_clks = ARRAY_SIZE(caam_imx6_clks), }; @@ -534,6 +536,7 @@ > static const struct clk_bulk_data caam_imx7_clks[] = { }; > > static const struct caam_imx_data caam_imx7_data = { > + .page0_access = true, > .clks = caam_imx7_clks, > .num_clks = ARRAY_SIZE(caam_imx7_clks), }; @@ -545,6 +548,7 @@ > static const struct clk_bulk_data caam_imx6ul_clks[] = { }; > > static const struct caam_imx_data caam_imx6ul_data = { > + .page0_access = true, > .clks = caam_imx6ul_clks, > .num_clks = ARRAY_SIZE(caam_imx6ul_clks), }; @@ -554,6 +558,7 > @@ static const struct clk_bulk_data caam_vf610_clks[] = { }; > > static const struct caam_imx_data caam_vf610_data = { > + .page0_access = true, > .clks = caam_vf610_clks, > .num_clks = ARRAY_SIZE(caam_vf610_clks), }; @@ -860,6 +865,7 > @@ static int caam_probe(struct platform_device *pdev) > int pg_size; > int BLOCK_OFFSET = 0; > bool reg_access = true; > + const struct caam_imx_data *imx_soc_data; > > ctrlpriv = devm_kzalloc(&pdev->dev, sizeof(*ctrlpriv), GFP_KERNEL); > if (!ctrlpriv) > @@ -889,17 +895,25 @@ static int caam_probe(struct platform_device > *pdev) > > reg_access = !ctrlpriv->optee_en; > > - if (!imx_soc_match->data) { > + if (imx_soc_match->data) { > dev_err(dev, "No clock data provided for i.MX SoC"); > return -EINVAL; > } > > + imx_soc_data = imx_soc_match->data; > + reg_access = reg_access && imx_soc_data->page0_access; > + /* > + * CAAM clocks cannot be controlled from kernel. > + */ > + if (!imx_soc_data->num_clks) > + goto iomap_ctrl; > + > ret = init_clocks(dev, imx_soc_match->data); > if (ret) > return ret; > } > > - > +iomap_ctrl: > /* Get configuration properties from device tree */ > /* First, get register page */ > ctrl = devm_of_iomap(dev, nprop, 0, NULL); > -- > 2.34.1
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index bdf367f3f679..247d42aa32df 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -512,6 +512,7 @@ static const struct of_device_id caam_match[] = { MODULE_DEVICE_TABLE(of, caam_match); struct caam_imx_data { + bool page0_access; const struct clk_bulk_data *clks; int num_clks; }; @@ -524,6 +525,7 @@ static const struct clk_bulk_data caam_imx6_clks[] = { }; static const struct caam_imx_data caam_imx6_data = { + .page0_access = true, .clks = caam_imx6_clks, .num_clks = ARRAY_SIZE(caam_imx6_clks), }; @@ -534,6 +536,7 @@ static const struct clk_bulk_data caam_imx7_clks[] = { }; static const struct caam_imx_data caam_imx7_data = { + .page0_access = true, .clks = caam_imx7_clks, .num_clks = ARRAY_SIZE(caam_imx7_clks), }; @@ -545,6 +548,7 @@ static const struct clk_bulk_data caam_imx6ul_clks[] = { }; static const struct caam_imx_data caam_imx6ul_data = { + .page0_access = true, .clks = caam_imx6ul_clks, .num_clks = ARRAY_SIZE(caam_imx6ul_clks), }; @@ -554,6 +558,7 @@ static const struct clk_bulk_data caam_vf610_clks[] = { }; static const struct caam_imx_data caam_vf610_data = { + .page0_access = true, .clks = caam_vf610_clks, .num_clks = ARRAY_SIZE(caam_vf610_clks), }; @@ -860,6 +865,7 @@ static int caam_probe(struct platform_device *pdev) int pg_size; int BLOCK_OFFSET = 0; bool reg_access = true; + const struct caam_imx_data *imx_soc_data; ctrlpriv = devm_kzalloc(&pdev->dev, sizeof(*ctrlpriv), GFP_KERNEL); if (!ctrlpriv) @@ -889,17 +895,25 @@ static int caam_probe(struct platform_device *pdev) reg_access = !ctrlpriv->optee_en; - if (!imx_soc_match->data) { + if (imx_soc_match->data) { dev_err(dev, "No clock data provided for i.MX SoC"); return -EINVAL; } + imx_soc_data = imx_soc_match->data; + reg_access = reg_access && imx_soc_data->page0_access; + /* + * CAAM clocks cannot be controlled from kernel. + */ + if (!imx_soc_data->num_clks) + goto iomap_ctrl; + ret = init_clocks(dev, imx_soc_match->data); if (ret) return ret; } - +iomap_ctrl: /* Get configuration properties from device tree */ /* First, get register page */ ctrl = devm_of_iomap(dev, nprop, 0, NULL);
CAAM clock initializat is done based on the basis of soc specific info stored in struct caam_imx_data: - caam-page0-access flag - num_clks CAAM driver needs to be aware of access rights to CAAM control page i.e., page0, to do things differently. Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com> --- drivers/crypto/caam/ctrl.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)