Hi Pankaj
Please check the below comments.
Regards
Gaurav Jain
> -----Original Message-----
> From: Pankaj Gupta <[email protected]>
> Sent: Monday, July 10, 2023 11:03 AM
> To: Horia Geanta <[email protected]>; Gaurav Jain
> <[email protected]>
> Cc: Pankaj Gupta <[email protected]>
> Subject: [PATCH] caam: init-clk based on caam-page0-access
>
> CAAM clock initialization to be done based on, soc specific info
> stored in struct
> caam_imx_data:
> - caam-page0-access flag
> - num_clks
>
> Signed-off-by: Pankaj Gupta <[email protected]>
> ---
> drivers/crypto/caam/ctrl.c | 26 ++++++++++++++++++++++++--
> 1 file changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
> index
> ff9ddbbca377..74d0b7541d54 100644
> --- a/drivers/crypto/caam/ctrl.c
> +++ b/drivers/crypto/caam/ctrl.c
> @@ -511,6 +511,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;
> };
> @@ -523,6 +524,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), }; @@ -533,6 +535,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), }; @@ -544,6 +547,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), }; @@ -553,15 +557,23 @@
> 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), };
>
> +static const struct caam_imx_data caam_imx8ulp_data = {
> + .page0_access = false,
> + .clks = NULL,
> + .num_clks = 0,
> +};
> +
> static const struct soc_device_attribute caam_imx_soc_table[] = {
> { .soc_id = "i.MX6UL", .data = &caam_imx6ul_data },
> { .soc_id = "i.MX6*", .data = &caam_imx6_data },
> { .soc_id = "i.MX7*", .data = &caam_imx7_data },
> { .soc_id = "i.MX8M*", .data = &caam_imx7_data },
> + { .soc_id = "i.MX8ULP", .data = &caam_imx8ulp_data },
> { .soc_id = "VF*", .data = &caam_vf610_data },
> { .family = "Freescale i.MX" },
> { /* sentinel */ }
> @@ -756,6 +768,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)
> @@ -772,6 +785,15 @@ static int caam_probe(struct platform_device *pdev)
> caam_imx = (bool)imx_soc_match;
>
> if (imx_soc_match) {
> + if (imx_soc_match->data) {
> + imx_soc_data = imx_soc_match->data;
> + reg_access = imx_soc_data->page0_access;
> + /*
> + * CAAM clocks cannot be controlled from kernel.
> + */
> + if (!imx_soc_data->num_clks)
> + goto iomap_ctrl;
OPTEE enablement check is ignored because of this goto statement.
Regards
Gaurav Jain
> + }
> /*
> * Until Layerscape and i.MX OP-TEE get in sync,
> * only i.MX OP-TEE use cases disallow access to @@ -781,7
> +803,7 @@ static int caam_probe(struct platform_device *pdev)
> ctrlpriv->optee_en = !!np;
> of_node_put(np);
>
> - reg_access = !ctrlpriv->optee_en;
> + reg_access = reg_access && !ctrlpriv->optee_en;
>
> if (!imx_soc_match->data) {
> dev_err(dev, "No clock data provided for i.MX SoC"); @@ -793,7
> +815,7 @@ static int caam_probe(struct platform_device *pdev)
> 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