| Message ID | 20180709061925.20276-7-vkoul@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Herbert Xu |
| Headers | show |
On 7/9/2018 12:19 AM, Vinod Koul wrote: > From: Timur Tabi <timur@codeaurora.org> > > Add support for probing on ACPI systems, with ACPI HID QCOM8160. > > On ACPI systems, clocks are always enabled, the PRNG should > already be enabled, and the register region is read-only. > The driver only verifies that the hardware is already > enabled never tries to disable or configure it. > > Signed-off-by: Timur Tabi <timur@codeaurora.org> > [port to crypto API] > Signed-off-by: Vinod Koul <vkoul@kernel.org> Tested-by: Jeffrey Hugo <jhugo@codeaurora.org> > --- > drivers/crypto/qcom-rng.c | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > > diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c > index f1bd86acaf9d..8118d4cd93b2 100644 > --- a/drivers/crypto/qcom-rng.c > +++ b/drivers/crypto/qcom-rng.c > @@ -4,6 +4,7 @@ > // Based on msm-rng.c and downstream driver > > #include <crypto/internal/rng.h> > +#include <linux/acpi.h> > #include <linux/clk.h> > #include <linux/crypto.h> > #include <linux/module.h> > @@ -168,13 +169,17 @@ static int qcom_rng_probe(struct platform_device *pdev) > if (IS_ERR(rng->base)) > return PTR_ERR(rng->base); > > - rng->clk = devm_clk_get(&pdev->dev, "core"); > - if (IS_ERR(rng->clk)) > - return PTR_ERR(rng->clk); > > - rng->skip_init = (unsigned long)of_device_get_match_data(&pdev->dev); > + /* ACPI systems have clk already on, so skip clk_get */ > + if (!has_acpi_companion(&pdev->dev)) { > + rng->clk = devm_clk_get(&pdev->dev, "core"); > + if (IS_ERR(rng->clk)) > + return PTR_ERR(rng->clk); > + } > > + rng->skip_init = (unsigned long)device_get_match_data(&pdev->dev); > qcom_rng_dev = rng; > + > ret = crypto_register_rng(&qcom_rng_alg); > if (ret) { > dev_err(&pdev->dev, "Register crypto rng failed: %d\n", ret); > @@ -193,6 +198,14 @@ static int qcom_rng_remove(struct platform_device *pdev) > return 0; > } > > +#if IS_ENABLED(CONFIG_ACPI) > +static const struct acpi_device_id qcom_rng_acpi_match[] = { > + { .id = "QCOM8160", .driver_data = 1 }, > + {} > +}; > +MODULE_DEVICE_TABLE(acpi, qcom_rng_acpi_match); > +#endif > + > static const struct of_device_id qcom_rng_of_match[] = { > { .compatible = "qcom,prng", .data = (void *)0}, > { .compatible = "qcom,prng-ee", .data = (void *)1}, > @@ -206,6 +219,7 @@ static struct platform_driver qcom_rng_driver = { > .driver = { > .name = KBUILD_MODNAME, > .of_match_table = of_match_ptr(qcom_rng_of_match), > + .acpi_match_table = ACPI_PTR(qcom_rng_acpi_match), > } > }; > module_platform_driver(qcom_rng_driver); >
On 7/10/18 12:27 PM, Jeffrey Hugo wrote: >> >> Add support for probing on ACPI systems, with ACPI HID QCOM8160. >> >> On ACPI systems, clocks are always enabled, the PRNG should >> already be enabled, and the register region is read-only. >> The driver only verifies that the hardware is already >> enabled never tries to disable or configure it. >> >> Signed-off-by: Timur Tabi <timur@codeaurora.org> >> [port to crypto API] >> Signed-off-by: Vinod Koul <vkoul@kernel.org> > > Tested-by: Jeffrey Hugo <jhugo@codeaurora.org> Thanks, Jeff. I appreciate it.
On 10-07-18, 11:27, Jeffrey Hugo wrote: > On 7/9/2018 12:19 AM, Vinod Koul wrote: > > From: Timur Tabi <timur@codeaurora.org> > > > > Add support for probing on ACPI systems, with ACPI HID QCOM8160. > > > > On ACPI systems, clocks are always enabled, the PRNG should > > already be enabled, and the register region is read-only. > > The driver only verifies that the hardware is already > > enabled never tries to disable or configure it. > > > > Signed-off-by: Timur Tabi <timur@codeaurora.org> > > [port to crypto API] > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > > Tested-by: Jeffrey Hugo <jhugo@codeaurora.org> Thanks Jeffrey.
diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c index f1bd86acaf9d..8118d4cd93b2 100644 --- a/drivers/crypto/qcom-rng.c +++ b/drivers/crypto/qcom-rng.c @@ -4,6 +4,7 @@ // Based on msm-rng.c and downstream driver #include <crypto/internal/rng.h> +#include <linux/acpi.h> #include <linux/clk.h> #include <linux/crypto.h> #include <linux/module.h> @@ -168,13 +169,17 @@ static int qcom_rng_probe(struct platform_device *pdev) if (IS_ERR(rng->base)) return PTR_ERR(rng->base); - rng->clk = devm_clk_get(&pdev->dev, "core"); - if (IS_ERR(rng->clk)) - return PTR_ERR(rng->clk); - rng->skip_init = (unsigned long)of_device_get_match_data(&pdev->dev); + /* ACPI systems have clk already on, so skip clk_get */ + if (!has_acpi_companion(&pdev->dev)) { + rng->clk = devm_clk_get(&pdev->dev, "core"); + if (IS_ERR(rng->clk)) + return PTR_ERR(rng->clk); + } + rng->skip_init = (unsigned long)device_get_match_data(&pdev->dev); qcom_rng_dev = rng; + ret = crypto_register_rng(&qcom_rng_alg); if (ret) { dev_err(&pdev->dev, "Register crypto rng failed: %d\n", ret); @@ -193,6 +198,14 @@ static int qcom_rng_remove(struct platform_device *pdev) return 0; } +#if IS_ENABLED(CONFIG_ACPI) +static const struct acpi_device_id qcom_rng_acpi_match[] = { + { .id = "QCOM8160", .driver_data = 1 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, qcom_rng_acpi_match); +#endif + static const struct of_device_id qcom_rng_of_match[] = { { .compatible = "qcom,prng", .data = (void *)0}, { .compatible = "qcom,prng-ee", .data = (void *)1}, @@ -206,6 +219,7 @@ static struct platform_driver qcom_rng_driver = { .driver = { .name = KBUILD_MODNAME, .of_match_table = of_match_ptr(qcom_rng_of_match), + .acpi_match_table = ACPI_PTR(qcom_rng_acpi_match), } }; module_platform_driver(qcom_rng_driver);