Commit a1907ccd authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'x86_microcode_for_v6.10_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 microcode loader updates from Borislav Petkov:

 - Fix a clang-15 build warning and other cleanups

* tag 'x86_microcode_for_v6.10_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode: Remove unused struct cpu_info_ctx
  x86/microcode/AMD: Remove unused PATCH_MAX_SIZE macro
  x86/microcode/AMD: Avoid -Wformat warning with clang-15
parents 5186ba33 57f6d0ae
...@@ -84,8 +84,6 @@ struct microcode_amd { ...@@ -84,8 +84,6 @@ struct microcode_amd {
unsigned int mpb[]; unsigned int mpb[];
}; };
#define PATCH_MAX_SIZE (3 * PAGE_SIZE)
static struct equiv_cpu_table { static struct equiv_cpu_table {
unsigned int num_entries; unsigned int num_entries;
struct equiv_cpu_entry *entry; struct equiv_cpu_entry *entry;
...@@ -465,7 +463,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, u32 old_rev, void *ucode, siz ...@@ -465,7 +463,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, u32 old_rev, void *ucode, siz
return !__apply_microcode_amd(mc); return !__apply_microcode_amd(mc);
} }
static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family) static bool get_builtin_microcode(struct cpio_data *cp, u8 family)
{ {
char fw_name[36] = "amd-ucode/microcode_amd.bin"; char fw_name[36] = "amd-ucode/microcode_amd.bin";
struct firmware fw; struct firmware fw;
......
...@@ -60,11 +60,6 @@ module_param(force_minrev, bool, S_IRUSR | S_IWUSR); ...@@ -60,11 +60,6 @@ module_param(force_minrev, bool, S_IRUSR | S_IWUSR);
*/ */
struct ucode_cpu_info ucode_cpu_info[NR_CPUS]; struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
struct cpu_info_ctx {
struct cpu_signature *cpu_sig;
int err;
};
/* /*
* Those patch levels cannot be updated to newer ones and thus should be final. * Those patch levels cannot be updated to newer ones and thus should be final.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment