FAILED: patch "[PATCH] crypto: atmel-sha204a - drop hwrng quality reduction for" failed to apply to 5.10-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x ea5e57cc97185329dcc5ebdcaae7e1500bf0ad0b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071514-kindling-fried-4b7e@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ea5e57cc97185329dcc5ebdcaae7e1500bf0ad0b Mon Sep 17 00:00:00 2001
From: Thorsten Blum <[email protected]>
Date: Tue, 28 Apr 2026 12:14:32 +0200
Subject: [PATCH] crypto: atmel-sha204a - drop hwrng quality reduction for
ATSHA204A
Commit 8006aff15516 ("crypto: atmel-sha204a - Set hwrng quality to lowest possible") reduced the hwrng quality to 1 based on a review by Bill Cox [1]. However, despite its title, the review only tested the ATSHA204, not the ATSHA204A.
In the same thread, Atmel engineer Landon Cox wrote "this behavior has been eliminated entirely"[2] in the ATSHA204A and "this problem does not affect the ATECC108 or the ATECC108A (or the ATSHA204A)"[3].
According to the official ATSHA204A datasheet [4], the device contains a high-quality hardware RNG that combines its output with an internal seed value stored in EEPROM or SRAM to generate random numbers. The device also implements all security functions using SHA-256, and the driver uses the chip's Random command in seed-update mode.
Keep 'quality = 1' for ATSHA204, but drop the explicit hwrng quality reduction for ATSHA204A and fall back to the hwrng core default.
[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html
[2] https://www.metzdowd.com/pipermail/cryptography/2014-December/023852.html
[3] https://www.metzdowd.com/pipermail/cryptography/2014-December/023886.html
[4] https://ww1.microchip.com/downloads/en/DeviceDoc/ATSHA204A-Data-Sheet-40002025A.pdf
drivers/crypto/atmel-sha204a.c +12 -7
@@ -19,6 +19,12 @@#include <linux/workqueue.h> #include "atmel-i2c.h" +/* +* According to review by Bill Cox [1], the ATSHA204 has very low entropy. +* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html +*/ +static const unsigned short atsha204_quality =1 ; +static void atmel_sha204a_rng_done (struct atmel_i2c_work_data *work_data,void *areq,int status) {
@@ -158,6 +164,7 @@ static const struct attribute_group atmel_sha204a_groups = {static int atmel_sha204a_probe (struct i2c_client *client) {struct atmel_i2c_client_priv *i2c_priv; +const unsigned short *quality;int ret; ret =atmel_i2c_probe (client);
@@ -171,11 +178,9 @@ static int atmel_sha204a_probe(struct i2c_client *client) i2c_priv->hwrng.name =dev_name (&client->dev); i2c_priv->hwrng.read = atmel_sha204a_rng_read; -/* -* According to review by Bill Cox [1], this HWRNG has very low entropy. -* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html -*/ - i2c_priv->hwrng.quality =1 ; + quality =i2c_get_match_data (client); +if (quality) + i2c_priv->hwrng.quality = *quality; ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng);if (ret)
@@ -203,14 +208,14 @@ static void atmel_sha204a_remove(struct i2c_client *client) }static const struct of_device_id atmel_sha204a_dt_ids[]__maybe_unused = { - { .compatible ="atmel,atsha204" , }, + { .compatible ="atmel,atsha204" , .data = &atsha204_quality }, { .compatible ="atmel,atsha204a" , }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, atmel_sha204a_dt_ids);static const struct i2c_device_id atmel_sha204a_id[] = { - {"atsha204" }, + {"atsha204" , (kernel_ulong_t)&atsha204_quality }, {"atsha204a" }, {/* sentinel */ } };
Sasha Levin
maintainerPATCH 1/3 crypto: atmel-sha204a - Mark OF related data as maybe unused
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 75f3d950054389e2556277e42170e37dd97cd872 ]
The driver can be compile tested with !CONFIG_OF making certain data unused:
drivers/crypto/atmel-sha204a.c:129:34: error: ‘atmel_sha204a_dt_ids’ defined but not used [-Werror=unused-const-variable=]
Stable-dep-of: ea5e57cc9718 ("crypto: atmel-sha204a - drop hwrng quality reduction for ATSHA204A")
--- drivers/crypto/atmel-sha204a.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/crypto/atmel-sha204a.c +4 -2
@@ -137,14 +137,16 @@ static int atmel_sha204a_remove(struct i2c_client *client)return 0 ; } -static const struct of_device_id atmel_sha204a_dt_ids[] = { +static const struct of_device_id atmel_sha204a_dt_ids[]__maybe_unused = { + { .compatible ="atmel,atsha204" , }, { .compatible ="atmel,atsha204a" , }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, atmel_sha204a_dt_ids);static const struct i2c_device_id atmel_sha204a_id[] = { - {"atsha204a" ,0 }, + {"atsha204" }, + {"atsha204a" }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, atmel_sha204a_id);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 crypto: atmel - Drop explicit initialization of struct i2c_device_id::driver_data to 0
From: Uwe Kleine-König <[email protected]>
[ Upstream commit d86ad3911a5d4549297ed810ee450e5772fd665f ]
These drivers don't use the driver_data member of struct i2c_device_id, so don't explicitly initialize this member.
This prepares putting driver_data in an anonymous union which requires either no initialization or named designators. But it's also a nice cleanup on its own.
Stable-dep-of: ea5e57cc9718 ("crypto: atmel-sha204a - drop hwrng quality reduction for ATSHA204A")
--- drivers/crypto/atmel-ecc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/atmel-ecc.c +1 -1
@@ -387,7 +387,7 @@ MODULE_DEVICE_TABLE(of, atmel_ecc_dt_ids);#endif static const struct i2c_device_id atmel_ecc_id[] = { - {"atecc508a" ,0 }, + {"atecc508a" }, { } };MODULE_DEVICE_TABLE (i2c, atmel_ecc_id);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 crypto: atmel-sha204a - drop hwrng quality reduction for ATSHA204A
In reply to Sasha LevinFrom: Thorsten Blum <[email protected]>
[ Upstream commit ea5e57cc97185329dcc5ebdcaae7e1500bf0ad0b ]
Commit 8006aff15516 ("crypto: atmel-sha204a - Set hwrng quality to lowest possible") reduced the hwrng quality to 1 based on a review by Bill Cox [1]. However, despite its title, the review only tested the ATSHA204, not the ATSHA204A.
In the same thread, Atmel engineer Landon Cox wrote "this behavior has been eliminated entirely"[2] in the ATSHA204A and "this problem does not affect the ATECC108 or the ATECC108A (or the ATSHA204A)"[3].
According to the official ATSHA204A datasheet [4], the device contains a high-quality hardware RNG that combines its output with an internal seed value stored in EEPROM or SRAM to generate random numbers. The device also implements all security functions using SHA-256, and the driver uses the chip's Random command in seed-update mode.
Keep 'quality = 1' for ATSHA204, but drop the explicit hwrng quality reduction for ATSHA204A and fall back to the hwrng core default.
[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html
[2] https://www.metzdowd.com/pipermail/cryptography/2014-December/023852.html
[3] https://www.metzdowd.com/pipermail/cryptography/2014-December/023886.html
[4] https://ww1.microchip.com/downloads/en/DeviceDoc/ATSHA204A-Data-Sheet-40002025A.pdf
--- drivers/crypto/atmel-sha204a.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/crypto/atmel-sha204a.c +12 -7
@@ -18,6 +18,12 @@#include <linux/workqueue.h> #include "atmel-i2c.h" +/* +* According to review by Bill Cox [1], the ATSHA204 has very low entropy. +* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html +*/ +static const unsigned short atsha204_quality =1 ; +static void atmel_sha204a_rng_done (struct atmel_i2c_work_data *work_data,void *areq,int status) {
@@ -96,6 +102,7 @@ static int atmel_sha204a_probe(struct i2c_client *client, const struct i2c_device_id *id) {struct atmel_i2c_client_priv *i2c_priv; +const unsigned short *quality;int ret; ret =atmel_i2c_probe (client, id);
@@ -109,11 +116,9 @@ static int atmel_sha204a_probe(struct i2c_client *client, i2c_priv->hwrng.name =dev_name (&client->dev); i2c_priv->hwrng.read = atmel_sha204a_rng_read; -/* -* According to review by Bill Cox [1], this HWRNG has very low entropy. -* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html -*/ - i2c_priv->hwrng.quality =1 ; + quality =i2c_get_match_data (client); +if (quality) + i2c_priv->hwrng.quality = *quality; ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng);if (ret)
@@ -138,14 +143,14 @@ static int atmel_sha204a_remove(struct i2c_client *client) }static const struct of_device_id atmel_sha204a_dt_ids[]__maybe_unused = { - { .compatible ="atmel,atsha204" , }, + { .compatible ="atmel,atsha204" , .data = &atsha204_quality }, { .compatible ="atmel,atsha204a" , }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, atmel_sha204a_dt_ids);static const struct i2c_device_id atmel_sha204a_id[] = { - {"atsha204" }, + {"atsha204" , (kernel_ulong_t)&atsha204_quality }, {"atsha204a" }, {/* sentinel */ } };
Signature · 1 line
2.53.0