diff options
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.22/0004-hwrng-atmel-rng-fix-data-valid-check.patch')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.22/0004-hwrng-atmel-rng-fix-data-valid-check.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.22/0004-hwrng-atmel-rng-fix-data-valid-check.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.22/0004-hwrng-atmel-rng-fix-data-valid-check.patch new file mode 100644 index 00000000..85105deb --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.22/0004-hwrng-atmel-rng-fix-data-valid-check.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From 28a0aa72b2ef00a665564ea05846ad22cb3f18ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Korsgaard <jacmet@sunsite.dk> | ||
3 | Date: Tue, 12 Jun 2012 08:27:04 +0800 | ||
4 | Subject: [PATCH 04/46] hwrng: atmel-rng - fix data valid check | ||
5 | |||
6 | commit c475c06f4bb689d6ad87d7512e036d6dface3160 upstream. | ||
7 | |||
8 | Brown paper bag: Data valid is LSB of the ISR (status register), and NOT | ||
9 | of ODATA (current random data word)! | ||
10 | |||
11 | With this, rngtest is a lot happier. Before: | ||
12 | |||
13 | rngtest 3 | ||
14 | Copyright (c) 2004 by Henrique de Moraes Holschuh | ||
15 | This is free software; see the source for copying conditions. There is NO warr. | ||
16 | |||
17 | rngtest: starting FIPS tests... | ||
18 | rngtest: bits received from input: 20000032 | ||
19 | rngtest: FIPS 140-2 successes: 3 | ||
20 | rngtest: FIPS 140-2 failures: 997 | ||
21 | rngtest: FIPS 140-2(2001-10-10) Monobit: 604 | ||
22 | rngtest: FIPS 140-2(2001-10-10) Poker: 996 | ||
23 | rngtest: FIPS 140-2(2001-10-10) Runs: 36 | ||
24 | rngtest: FIPS 140-2(2001-10-10) Long run: 0 | ||
25 | rngtest: FIPS 140-2(2001-10-10) Continuous run: 117 | ||
26 | rngtest: input channel speed: (min=622.371; avg=23682.481; max=28224.350)Kibitss | ||
27 | rngtest: FIPS tests speed: (min=12.361; avg=12.718; max=12.861)Mibits/s | ||
28 | rngtest: Program run time: 2331696 microsecondsx | ||
29 | |||
30 | After: | ||
31 | rngtest 3 | ||
32 | Copyright (c) 2004 by Henrique de Moraes Holschuh | ||
33 | This is free software; see the source for copying conditions. There is NO warr. | ||
34 | |||
35 | rngtest: starting FIPS tests... | ||
36 | rngtest: bits received from input: 20000032 | ||
37 | rngtest: FIPS 140-2 successes: 999 | ||
38 | rngtest: FIPS 140-2 failures: 1 | ||
39 | rngtest: FIPS 140-2(2001-10-10) Monobit: 0 | ||
40 | rngtest: FIPS 140-2(2001-10-10) Poker: 0 | ||
41 | rngtest: FIPS 140-2(2001-10-10) Runs: 1 | ||
42 | rngtest: FIPS 140-2(2001-10-10) Long run: 0 | ||
43 | rngtest: FIPS 140-2(2001-10-10) Continuous run: 0 | ||
44 | rngtest: input channel speed: (min=777.363; avg=43588.270; max=47870.711)Kibitss | ||
45 | rngtest: FIPS tests speed: (min=11.943; avg=12.716; max=12.844)Mibits/s | ||
46 | rngtest: Program run time: 1955282 microseconds | ||
47 | |||
48 | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> | ||
49 | Reported-by: George Pontis <GPontis@z9.com> | ||
50 | Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> | ||
51 | Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
52 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> | ||
53 | --- | ||
54 | drivers/char/hw_random/atmel-rng.c | 2 +- | ||
55 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
56 | |||
57 | diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c | ||
58 | index 0477982..1b5675b 100644 | ||
59 | --- a/drivers/char/hw_random/atmel-rng.c | ||
60 | +++ b/drivers/char/hw_random/atmel-rng.c | ||
61 | @@ -34,7 +34,7 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max, | ||
62 | u32 *data = buf; | ||
63 | |||
64 | /* data ready? */ | ||
65 | - if (readl(trng->base + TRNG_ODATA) & 1) { | ||
66 | + if (readl(trng->base + TRNG_ISR) & 1) { | ||
67 | *data = readl(trng->base + TRNG_ODATA); | ||
68 | /* | ||
69 | ensure data ready is only set again AFTER the next data | ||
70 | -- | ||
71 | 1.7.10 | ||
72 | |||