diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-31 14:51:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-31 14:51:34 -0700 |
commit | 478f74a3d8085076dfcb481aa9361b808a6aae94 (patch) | |
tree | 9392ad6d7fe8dce797c3ea16fcec3c453348938d /drivers/virt | |
parent | 354b8bf222ee15bf9aac3d870ba8e0880dd9bc8d (diff) | |
parent | 1754abb3e7583c570666fa1e1ee5b317e88c89a0 (diff) | |
download | linux-478f74a3d8085076dfcb481aa9361b808a6aae94.tar.bz2 |
Merge tag 'random-5.18-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random
Pull random number generator fixes from Jason Donenfeld:
- If a hardware random number generator passes a sufficiently large
chunk of entropy to random.c during early boot, we now skip the
"fast_init" business and let it initialize the RNG.
This makes CONFIG_RANDOM_TRUST_BOOTLOADER=y actually useful.
- We already have the command line `random.trust_cpu=0/1` option for
RDRAND, which let distros enable CONFIG_RANDOM_TRUST_CPU=y while
placating concerns of more paranoid users.
Now we add `random.trust_bootloader=0/1` so that distros can
similarly enable CONFIG_RANDOM_TRUST_BOOTLOADER=y.
- Re-add a comment that got removed by accident in the recent revert.
- Add the spec-compliant ACPI CID for vmgenid, which Microsoft added to
the vmgenid spec at Ard's request during earlier review.
- Restore build-time randomness via the latent entropy plugin, which
was lost when we transitioned to using a hash function.
* tag 'random-5.18-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random:
random: mix build-time latent entropy into pool at init
virt: vmgenid: recognize new CID added by Hyper-V
random: re-add removed comment about get_random_{u32,u64} reseeding
random: treat bootloader trust toggle the same way as cpu trust toggle
random: skip fast_init if hwrng provides large chunk of entropy
Diffstat (limited to 'drivers/virt')
-rw-r--r-- | drivers/virt/vmgenid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/virt/vmgenid.c b/drivers/virt/vmgenid.c index 0ae1a39f2e28..a1c467a0e9f7 100644 --- a/drivers/virt/vmgenid.c +++ b/drivers/virt/vmgenid.c @@ -78,6 +78,7 @@ static void vmgenid_notify(struct acpi_device *device, u32 event) } static const struct acpi_device_id vmgenid_ids[] = { + { "VMGENCTR", 0 }, { "VM_GEN_COUNTER", 0 }, { } }; |