--- zzzz-none-000/linux-4.4.60/drivers/char/hw_random/msm-rng.c 2017-04-08 07:53:53.000000000 +0000 +++ scorpion-1750e-727/linux-4.4.60/drivers/char/hw_random/msm-rng.c 2021-02-04 17:41:59.000000000 +0000 @@ -35,10 +35,19 @@ #define MAX_HW_FIFO_SIZE (MAX_HW_FIFO_DEPTH * 4) #define WORD_SZ 4 +struct prng_init_params { + unsigned char secured_init; +}; + struct msm_rng { void __iomem *base; struct clk *clk; struct hwrng hwrng; + const struct prng_init_params *init_params; +}; + +static const struct prng_init_params ipq807x_params = { + .secured_init = 1, }; #define to_msm_rng(p) container_of(p, struct msm_rng, hwrng) @@ -53,6 +62,9 @@ if (ret) return ret; + if (rng->init_params && rng->init_params->secured_init) + return 0; + if (enable) { /* Enable PRNG only if it is not already enabled */ val = readl_relaxed(rng->base + PRNG_CONFIG); @@ -131,10 +143,18 @@ msm_rng_enable(hwrng, 0); } +static const struct of_device_id msm_rng_of_match[] = { + { .compatible = "qcom,prng",}, + { .compatible = "qcom,prng-ipq807x", .data = &ipq807x_params}, + {} +}; +MODULE_DEVICE_TABLE(of, msm_rng_of_match); + static int msm_rng_probe(struct platform_device *pdev) { struct resource *res; struct msm_rng *rng; + const struct of_device_id *of_id; int ret; rng = devm_kzalloc(&pdev->dev, sizeof(*rng), GFP_KERNEL); @@ -148,6 +168,11 @@ if (IS_ERR(rng->base)) return PTR_ERR(rng->base); + of_id = of_match_node(msm_rng_of_match, pdev->dev.of_node); + if (!of_id) + return -EINVAL; + rng->init_params = of_id->data; + rng->clk = devm_clk_get(&pdev->dev, "core"); if (IS_ERR(rng->clk)) return PTR_ERR(rng->clk); @@ -166,12 +191,6 @@ return 0; } -static const struct of_device_id msm_rng_of_match[] = { - { .compatible = "qcom,prng", }, - {} -}; -MODULE_DEVICE_TABLE(of, msm_rng_of_match); - static struct platform_driver msm_rng_driver = { .probe = msm_rng_probe, .driver = {