ARM: tegra: throw the unique chip ID into the entropy pool
Subsystems (3)
PATCH 1/1 ARM: tegra: throw the unique chip ID into the entropy pool
This adds a hook at common late init to extract the 64 bits of chip-unique data and throw it into the entropy pool to make it more device-unique.
---
Stephen: since I don't have the Tegra reference manual I don't know what "UID" means, but if it means "unique ID" then this patch should be relevant for initializing the entropy pool.
--- arch/arm/mach-tegra/common.c | 1 + arch/arm/mach-tegra/fuse.c | 9 +++++++++ arch/arm/mach-tegra/fuse.h | 1 + 3 files changed, 11 insertions(+)
arch/arm/mach-tegra/common.c +1 -0
@@ -109,6 +109,7 @@ void __init tegra_init_early(void)void __init tegra_init_late (void ) { +tegra_random_init ();tegra_init_suspend ();tegra_cpuidle_init ();tegra_powergate_debugfs_init ();
arch/arm/mach-tegra/fuse.c +9 -0
@@ -22,6 +22,7 @@#include <linux/io.h> #include <linux/export.h> #include <linux/tegra-soc.h> +#include <linux/random.h> #include "fuse.h" #include "iomap.h"
@@ -165,3 +166,11 @@ unsigned long long tegra_chip_uid(void)return (hi <<32ull ) | lo; }EXPORT_SYMBOL (tegra_chip_uid); + +void __init tegra_random_init (void ) +{ +unsigned long long uid; + + uid =tegra_chip_uid (); +add_device_randomness (&uid,sizeof (uid)); +}
arch/arm/mach-tegra/fuse.h +1 -0
@@ -55,6 +55,7 @@ unsigned long long tegra_chip_uid(void);void tegra_init_fuse (void );bool tegra_spare_fuse (int bit);u32 tegra_fuse_readl (unsigned long offset); +void tegra_random_init (void );#ifdef CONFIG_ARCH_TEGRA_2x_SOCvoid tegra20_init_speedo_data (void );
Signature · 1 line
1.8.3.1
PATCH 1/1 ARM: tegra: throw the unique chip ID into the entropy pool
Quoted 9 lines · Linus Walleij
This adds a hook at common late init to extract the 64 bits of chip-unique data and throw it into the entropy pool to make it more device-unique.
Signed-off-by Linus Walleij <[email protected]>---
Stephen: since I don't have the Tegra reference manual I don't know what "UID" means, but if it means "unique ID" then this patch should be relevant for initializing the entropy pool.
I believe that's what it means, although even the TRM doesn't actually say.
I'll try and remember to apply this after the merge window.
Note that the UID value appears to be incorrect on anything other than Tegra20; I'll file an internal bug to track that down.
PATCH 1/1 ARM: tegra: throw the unique chip ID into the entropy pool
Quoted 5 lines · Stephen Warren
Quoted 4 lines · Linus Walleij
This adds a hook at common late init to extract the 64 bits of chip-unique data and throw it into the entropy pool to make it more device-unique.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Linus Walleij <[email protected]>---
Stephen: since I don't have the Tegra reference manual I don't know what "UID" means, but if it means "unique ID" then this patch should be relevant for initializing the entropy pool.I believe that's what it means, although even the TRM doesn't actually say.
I sort of half-guessed it from the fact that it was being used as random seed in the crypto driver in drivers/crypto/tegra-aes.c
Quoted 4 lines
I'll try and remember to apply this after the merge window.
Note that the UID value appears to be incorrect on anything other than Tegra20; I'll file an internal bug to track that down.
Hm, that will not affect the kernel entropy pool so much, but the crypto driver is in trouble since that seems to be the only entropy it's using :-(
If it will return something like a constant, that is actually a quite valid case for initializing tmp[1] from the kernel entropy pool with get_random_bytes() instead of using UID.
I don't know if the Tegra AES needs that specific initializer though (it seems not). Shall I propose a patch?
Yours,
Linus Walleij
PATCH 1/1 ARM: tegra: throw the unique chip ID into the entropy pool
Quoted 1 line · Linus Walleij
On Thu, Sep 5, 2013 at 9:43 PM, Stephen Warren <[email protected]> wrote:
...
Quoted 6 lines
Quoted 2 lines
Note that the UID value appears to be incorrect on anything other than Tegra20; I'll file an internal bug to track that down.
Hm, that will not affect the kernel entropy pool so much, but the crypto driver is in trouble since that seems to be the only entropy it's using :-(
Well, it calls getnstimeofday() too, so there's presumably a small amount of entropy there, unless tegra_aes_rng_reset() gets called at predictable times, which is probably true.
Quoted 6 lines
If it will return something like a constant, that is actually a quite valid case for initializing tmp[1] from the kernel entropy pool with
get_random_bytes()instead of using UID.I don't know if the Tegra AES needs that specific initializer though (it seems not). Shall I propose a patch?
That sounds reasonable. Perhaps Varun can comment?
PATCH 1/1 ARM: tegra: throw the unique chip ID into the entropy pool
In reply to Linus Walleijarch/arm/mach-tegra/common.c void __init tegra_init_early(void) · line 112
Quoted 9 lines · Linus Walleij
This adds a hook at common late init to extract the 64 bits of chip-unique data and throw it into the entropy pool to make it more device-unique.
arch/arm/mach-tegra/common.c +1
-0void __init tegra_init_late (void ) { +tegra_random_init ();
Looking at this further, there's already a tegra_init_fuse() call made from tegra_init_early(), so rather than adding a second init function into the fuse code, I'd rather just augment that function, unless there's some reason add_device_randomness() won't work at that time?
If that will work, I'll supply an alternate patch that replaces this, since I also want to remove the tegra_chip_uid() function, and need to make the add_device_randomness() call not use tegra_chip_uid() on Tegra30 or later, since the set of fuses for the chip ID changed radically.
PATCH 1/1 ARM: tegra: throw the unique chip ID into the entropy pool
Quoted 7 lines · Stephen Warren
Quoted 5 lines · Linus Walleij
This adds a hook at common late init to extract the 64 bits of chip-unique data and throw it into the entropy pool to make it more device-unique.
arch/arm/mach-tegra/common.c +0
-0
Quoted 8 lines
Quoted 3 lines
void
__inittegra_init_late(void)
{
+tegra_random_init();Looking at this further, there's already a
tegra_init_fuse()call made fromtegra_init_early(), so rather than adding a second init function into the fuse code, I'd rather just augment that function, unless there's some reasonadd_device_randomness()won't work at that time?
This seems to be possible, due to the comment above rand_initialize():
/*
* Note that setup_arch() may call add_device_randomness()
* long before we get here. This allows seeding of the pools
* with some platform dependent data very early in the boot
* process.
(...)
Quoted 4 lines
If that will work, I'll supply an alternate patch that replaces this, since I also want to remove the
tegra_chip_uid()function, and need to make theadd_device_randomness()call not usetegra_chip_uid()on Tegra30 or later, since the set of fuses for the chip ID changed radically.
Sure, go ahead.
Yours,
Linus Walleij