diff options
| author | Borislav Petkov <bp@suse.de> | 2018-07-28 19:04:02 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2018-11-19 10:51:00 +0100 |
| commit | cfffbfeb424bc274aba3b5ed4afd5891662481a8 (patch) | |
| tree | 4de3c3fac89b61b955b6a5f8b75f09c682176703 /arch/x86/kernel/cpu/microcode | |
| parent | 3974b68114fed3735f623931e673538d8ab92d26 (diff) | |
| download | linux-0-day-cfffbfeb424bc274aba3b5ed4afd5891662481a8.tar.gz linux-0-day-cfffbfeb424bc274aba3b5ed4afd5891662481a8.tar.xz | |
x86/microcode/AMD: Clean up per-family patch size checks
Starting with family 0x15, the patch size verification is not needed
anymore. Thus get rid of the need to update this checking function with
each new family.
Keep the check for older families.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20181107170218.7596-5-bp@alien8.de
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/amd.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index f8d60cb9bb9a0..bf682deb84e84 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -183,27 +183,22 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size, unsigned int si { u32 max_size; + if (family >= 0x15) + return min_t(u32, patch_size, size); + #define F1XH_MPB_MAX_SIZE 2048 #define F14H_MPB_MAX_SIZE 1824 -#define F15H_MPB_MAX_SIZE 4096 -#define F16H_MPB_MAX_SIZE 3458 -#define F17H_MPB_MAX_SIZE 3200 switch (family) { + case 0x10 ... 0x12: + max_size = F1XH_MPB_MAX_SIZE; + break; case 0x14: max_size = F14H_MPB_MAX_SIZE; break; - case 0x15: - max_size = F15H_MPB_MAX_SIZE; - break; - case 0x16: - max_size = F16H_MPB_MAX_SIZE; - break; - case 0x17: - max_size = F17H_MPB_MAX_SIZE; - break; default: - max_size = F1XH_MPB_MAX_SIZE; + WARN(1, "%s: WTF family: 0x%x\n", __func__, family); + return 0; break; } |