Commit 61de9b70 authored by Borislav Petkov's avatar Borislav Petkov Committed by Borislav Petkov (AMD)

x86/microcode/AMD: Rename a couple of functions

- Rename apply_microcode_early_amd() to early_apply_microcode():
simplify the name so that it is clear what it does and when does it do
it.

- Rename __load_ucode_amd() to find_blobs_in_containers(): the new name
actually explains what it does.

Document some.

No functional changes.
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20221219210656.5140-1-bp@alien8.de
parent 1b929c02
...@@ -414,8 +414,7 @@ static int __apply_microcode_amd(struct microcode_amd *mc) ...@@ -414,8 +414,7 @@ static int __apply_microcode_amd(struct microcode_amd *mc)
* *
* Returns true if container found (sets @desc), false otherwise. * Returns true if container found (sets @desc), false otherwise.
*/ */
static bool static bool early_apply_microcode(u32 cpuid_1_eax, void *ucode, size_t size, bool save_patch)
apply_microcode_early_amd(u32 cpuid_1_eax, void *ucode, size_t size, bool save_patch)
{ {
struct cont_desc desc = { 0 }; struct cont_desc desc = { 0 };
u8 (*patch)[PATCH_MAX_SIZE]; u8 (*patch)[PATCH_MAX_SIZE];
...@@ -481,7 +480,7 @@ static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family) ...@@ -481,7 +480,7 @@ static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family)
return false; return false;
} }
static void __load_ucode_amd(unsigned int cpuid_1_eax, struct cpio_data *ret) static void find_blobs_in_containers(unsigned int cpuid_1_eax, struct cpio_data *ret)
{ {
struct ucode_cpu_info *uci; struct ucode_cpu_info *uci;
struct cpio_data cp; struct cpio_data cp;
...@@ -511,11 +510,11 @@ void __init load_ucode_amd_bsp(unsigned int cpuid_1_eax) ...@@ -511,11 +510,11 @@ void __init load_ucode_amd_bsp(unsigned int cpuid_1_eax)
{ {
struct cpio_data cp = { }; struct cpio_data cp = { };
__load_ucode_amd(cpuid_1_eax, &cp); find_blobs_in_containers(cpuid_1_eax, &cp);
if (!(cp.data && cp.size)) if (!(cp.data && cp.size))
return; return;
apply_microcode_early_amd(cpuid_1_eax, cp.data, cp.size, true); early_apply_microcode(cpuid_1_eax, cp.data, cp.size, true);
} }
void load_ucode_amd_ap(unsigned int cpuid_1_eax) void load_ucode_amd_ap(unsigned int cpuid_1_eax)
...@@ -546,11 +545,11 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax) ...@@ -546,11 +545,11 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax)
} }
} }
__load_ucode_amd(cpuid_1_eax, &cp); find_blobs_in_containers(cpuid_1_eax, &cp);
if (!(cp.data && cp.size)) if (!(cp.data && cp.size))
return; return;
apply_microcode_early_amd(cpuid_1_eax, cp.data, cp.size, false); early_apply_microcode(cpuid_1_eax, cp.data, cp.size, false);
} }
static enum ucode_state static enum ucode_state
...@@ -816,6 +815,7 @@ static int verify_and_add_patch(u8 family, u8 *fw, unsigned int leftover, ...@@ -816,6 +815,7 @@ static int verify_and_add_patch(u8 family, u8 *fw, unsigned int leftover,
return 0; return 0;
} }
/* Scan the blob in @data and add microcode patches to the cache. */
static enum ucode_state __load_microcode_amd(u8 family, const u8 *data, static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,
size_t size) size_t size)
{ {
......
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