crypto: qcom-rng: fix support for ACPI-based systems
Subsystems (2)
v2 cover crypto: qcom-rng: fix support for ACPI-based systems
The qcom-rng driver supports both ACPI and device tree based systems. ACPI support was broken when the hw_random interface support was added. This small series gets that working again.
This fix was boot tested on a Qualcomm Amberwing server.
Changes since v1:
- Use qcom_prng_ee_match_data instead of qcom_prng_match_data for the true skip_init to match previous behavior (Ernesto)
- Reordered patches so fix is first (Dmitry)
Brian Masney (2):
crypto: qcom-rng: fix support for ACPI-based systems
crypto: qcom-rng: rename *_of_data to *_match_data
drivers/crypto/qcom-rng.c | 50 +++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 23 deletions(-)
Signature · 1 line
2.46.0
PATCH v2 1/2 crypto: qcom-rng: fix support for ACPI-based systems
The qcom-rng driver supports both ACPI and device tree based systems. ACPI support was broken when the hw_random interface support was added. Let's go ahead and fix this by adding a check for has_acpi_companion().
This fix was boot tested on a Qualcomm Amberwing server.
---
Note: I looked at updating the struct qcom_rng_acpi_match to have driver_data point to &qcom_prng_ee_of_data, however that won't work since struct acpi_device_id has a driver_data member of type kernel_ulong_t. struct of_device_id has the data member set to type const void *. As I get available time, I'll look to see if it's possible to migrate struct acpi_device_id.driver_data from a kernel_ulong_t to a const void * to match what's done in struct of_device_id. That will allow removing the has_acpi_companion() check in the future. I suspect that change is not going to be trivial though.
drivers/crypto/qcom-rng.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/crypto/qcom-rng.c +19 -16
@@ -176,6 +176,21 @@ static struct rng_alg qcom_rng_alg = { } }; +static struct qcom_rng_of_data qcom_prng_of_data = { + .skip_init = false, + .hwrng_support = false, +}; + +static struct qcom_rng_of_data qcom_prng_ee_of_data = { + .skip_init = true, + .hwrng_support = false, +}; + +static struct qcom_rng_of_data qcom_trng_of_data = { + .skip_init = true, + .hwrng_support = true, +}; +static int qcom_rng_probe (struct platform_device *pdev) {struct qcom_rng *rng;
@@ -196,7 +211,10 @@ static int qcom_rng_probe(struct platform_device *pdev)if (IS_ERR (rng->clk))return PTR_ERR (rng->clk); - rng->of_data = (struct qcom_rng_of_data *)of_device_get_match_data (&pdev->dev); +if (has_acpi_companion (&pdev->dev)) + rng->of_data = &qcom_prng_ee_of_data; +else + rng->of_data = (struct qcom_rng_of_data *)of_device_get_match_data (&pdev->dev); qcom_rng_dev = rng; ret =crypto_register_rng (&qcom_rng_alg);
@@ -231,21 +249,6 @@ static void qcom_rng_remove(struct platform_device *pdev) qcom_rng_dev =NULL ; } -static struct qcom_rng_of_data qcom_prng_of_data = { - .skip_init = false, - .hwrng_support = false, -}; - -static struct qcom_rng_of_data qcom_prng_ee_of_data = { - .skip_init = true, - .hwrng_support = false, -}; - -static struct qcom_rng_of_data qcom_trng_of_data = { - .skip_init = true, - .hwrng_support = true, -}; -static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = { { .id ="QCOM8160" , .driver_data =1 }, {}
Signature · 1 line
2.46.0
Quoted 11 lines · Brian Masney
The qcom-rng driver supports both ACPI and device tree based systems. ACPI support was broken when the
hw_randominterface support was added. Let's go ahead and fix this by adding a check forhas_acpi_companion().This fix was boot tested on a Qualcomm Amberwing server.
Fixes f29cd5bb64c2 ("crypto: qcom-rng - Add hw_random interface support")Reported-by Ernesto A. Fernández <[email protected]>Signed-off-by Brian Masney <[email protected]>
I found a cleaner and less intrusive way to fix this after looking through some other drivers, so let me post a v3. Sorry about the noise.
Brian
PATCH v2 2/2 crypto: qcom-rng: rename *_of_data to *_match_data
In reply to Brian MasneyThe qcom-rng driver supports both ACPI and device tree based systems. Let's rename all instances of *_of_data to *_match_data so that it's not implied that this driver only supports device tree.
--- drivers/crypto/qcom-rng.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/crypto/qcom-rng.c +13 -12
@@ -36,14 +36,14 @@ struct qcom_rng {void __iomem *base;struct clk *clk;struct hwrng hwrng; -struct qcom_rng_of_data *of_data; +struct qcom_rng_match_data *match_data; };struct qcom_rng_ctx {struct qcom_rng *rng; }; -struct qcom_rng_of_data { +struct qcom_rng_match_data {bool skip_init;bool hwrng_support; };
@@ -155,7 +155,7 @@ static int qcom_rng_init(struct crypto_tfm *tfm) ctx->rng = qcom_rng_dev; -if (!ctx->rng->of_data->skip_init) +if (!ctx->rng->match_data->skip_init)return qcom_rng_enable (ctx->rng);return 0 ;
@@ -176,17 +176,17 @@ static struct rng_alg qcom_rng_alg = { } }; -static struct qcom_rng_of_data qcom_prng_of_data = { +static struct qcom_rng_match_data qcom_prng_match_data = { .skip_init = false, .hwrng_support = false, }; -static struct qcom_rng_of_data qcom_prng_ee_of_data = { +static struct qcom_rng_match_data qcom_prng_ee_match_data = { .skip_init = true, .hwrng_support = false, }; -static struct qcom_rng_of_data qcom_trng_of_data = { +static struct qcom_rng_match_data qcom_trng_match_data = { .skip_init = true, .hwrng_support = true, };
@@ -212,9 +212,10 @@ static int qcom_rng_probe(struct platform_device *pdev)return PTR_ERR (rng->clk);if (has_acpi_companion (&pdev->dev)) - rng->of_data = &qcom_prng_ee_of_data; + rng->match_data = &qcom_prng_ee_match_data;else - rng->of_data = (struct qcom_rng_of_data *)of_device_get_match_data (&pdev->dev); + rng->match_data = + (struct qcom_rng_match_data *)of_device_get_match_data (&pdev->dev); qcom_rng_dev = rng; ret =crypto_register_rng (&qcom_rng_alg);
@@ -224,7 +225,7 @@ static int qcom_rng_probe(struct platform_device *pdev)return ret; } -if (rng->of_data->hwrng_support) { +if (rng->match_data->hwrng_support) { rng->hwrng.name ="qcom_hwrng" ; rng->hwrng.read = qcom_hwrng_read; rng->hwrng.quality =QCOM_TRNG_QUALITY ;
@@ -256,9 +257,9 @@ static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = {MODULE_DEVICE_TABLE (acpi, qcom_rng_acpi_match);static const struct of_device_id __maybe_unused qcom_rng_of_match[] = { - { .compatible ="qcom,prng" , .data = &qcom_prng_of_data }, - { .compatible ="qcom,prng-ee" , .data = &qcom_prng_ee_of_data }, - { .compatible ="qcom,trng" , .data = &qcom_trng_of_data }, + { .compatible ="qcom,prng" , .data = &qcom_prng_match_data }, + { .compatible ="qcom,prng-ee" , .data = &qcom_prng_ee_match_data }, + { .compatible ="qcom,trng" , .data = &qcom_trng_match_data }, {} };MODULE_DEVICE_TABLE (of, qcom_rng_of_match);
Signature · 1 line
2.46.0