Skip to content

Commit 3e87031

Browse files
masneybherbertx
authored andcommitted
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 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: f29cd5b ("crypto: qcom-rng - Add hw_random interface support") Reported-by: Ernesto A. Fernández <[email protected]> Closes: https://lore.kernel.org/linux-arm-msm/20240828184019.GA21181@eaf/ Cc: [email protected] Signed-off-by: Brian Masney <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 48b8843 commit 3e87031

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/crypto/qcom-rng.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static int qcom_rng_probe(struct platform_device *pdev)
196196
if (IS_ERR(rng->clk))
197197
return PTR_ERR(rng->clk);
198198

199-
rng->of_data = (struct qcom_rng_of_data *)of_device_get_match_data(&pdev->dev);
199+
rng->of_data = (struct qcom_rng_of_data *)device_get_match_data(&pdev->dev);
200200

201201
qcom_rng_dev = rng;
202202
ret = crypto_register_rng(&qcom_rng_alg);
@@ -247,7 +247,7 @@ static struct qcom_rng_of_data qcom_trng_of_data = {
247247
};
248248

249249
static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = {
250-
{ .id = "QCOM8160", .driver_data = 1 },
250+
{ .id = "QCOM8160", .driver_data = (kernel_ulong_t)&qcom_prng_ee_of_data },
251251
{}
252252
};
253253
MODULE_DEVICE_TABLE(acpi, qcom_rng_acpi_match);

0 commit comments

Comments
 (0)