| Message ID | 20240906002521.1163311-2-bmasney@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: qcom-rng: fix support for ACPI-based systems | expand |
On Thu, Sep 05, 2024 at 08:25:20PM GMT, Brian Masney wrote: > 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 the appropriate driver data to the > ACPI match table, and change the of_device_get_match_data() call to > device_get_match_data() so that it will also work on ACPI-based systems. > > This fix was boot tested on a Qualcomm Amberwing server (ACPI based) and > on a Qualcomm SA8775p Automotive Development Board (DT based). I also > verified that qcom-rng shows up in /proc/crypto on both systems. > > Fixes: f29cd5bb64c2 ("crypto: qcom-rng - Add hw_random interface support") > Reported-by: Ernesto A. Fern??ndez <ernesto.mnd.fernandez@gmail.com> > Closes: https://lore.kernel.org/linux-arm-msm/20240828184019.GA21181@eaf/ > Cc: stable@vger.kernel.org > Signed-off-by: Brian Masney <bmasney@redhat.com> > --- > drivers/crypto/qcom-rng.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c index c670d7d0c11e..6496b075a48d 100644 --- a/drivers/crypto/qcom-rng.c +++ b/drivers/crypto/qcom-rng.c @@ -196,7 +196,7 @@ 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); + rng->of_data = (struct qcom_rng_of_data *)device_get_match_data(&pdev->dev); qcom_rng_dev = rng; ret = crypto_register_rng(&qcom_rng_alg); @@ -247,7 +247,7 @@ static struct qcom_rng_of_data qcom_trng_of_data = { }; static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = { - { .id = "QCOM8160", .driver_data = 1 }, + { .id = "QCOM8160", .driver_data = (kernel_ulong_t)&qcom_prng_ee_of_data }, {} }; MODULE_DEVICE_TABLE(acpi, qcom_rng_acpi_match);
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 the appropriate driver data to the ACPI match table, and change the of_device_get_match_data() call to device_get_match_data() so that it will also work on ACPI-based systems. This fix was boot tested on a Qualcomm Amberwing server (ACPI based) and on a Qualcomm SA8775p Automotive Development Board (DT based). I also verified that qcom-rng shows up in /proc/crypto on both systems. Fixes: f29cd5bb64c2 ("crypto: qcom-rng - Add hw_random interface support") Reported-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com> Closes: https://lore.kernel.org/linux-arm-msm/20240828184019.GA21181@eaf/ Cc: stable@vger.kernel.org Signed-off-by: Brian Masney <bmasney@redhat.com> --- drivers/crypto/qcom-rng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)