Skip to content

Commit 8c61eaf

Browse files
committed
x86/microcode: Remove ->request_microcode_user()
181b6f4 ("x86/microcode: Rip out the OLD_INTERFACE") removed the old microcode loading interface but forgot to remove the related ->request_microcode_user() functionality which it uses. Rip it out now too. Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lore.kernel.org/r/20220825075445.28171-1-bp@alien8.de
1 parent 3ecf671 commit 8c61eaf

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

arch/x86/include/asm/microcode.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ enum ucode_state {
3232
};
3333

3434
struct microcode_ops {
35-
enum ucode_state (*request_microcode_user) (int cpu,
36-
const void __user *buf, size_t size);
37-
3835
enum ucode_state (*request_microcode_fw) (int cpu, struct device *,
3936
bool refresh_fw);
4037

arch/x86/kernel/cpu/microcode/amd.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -924,12 +924,6 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,
924924
return ret;
925925
}
926926

927-
static enum ucode_state
928-
request_microcode_user(int cpu, const void __user *buf, size_t size)
929-
{
930-
return UCODE_ERROR;
931-
}
932-
933927
static void microcode_fini_cpu_amd(int cpu)
934928
{
935929
struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
@@ -938,7 +932,6 @@ static void microcode_fini_cpu_amd(int cpu)
938932
}
939933

940934
static struct microcode_ops microcode_amd_ops = {
941-
.request_microcode_user = request_microcode_user,
942935
.request_microcode_fw = request_microcode_amd,
943936
.collect_cpu_info = collect_cpu_info_amd,
944937
.apply_microcode = apply_microcode_amd,

arch/x86/kernel/cpu/microcode/intel.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -916,24 +916,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
916916
return ret;
917917
}
918918

919-
static enum ucode_state
920-
request_microcode_user(int cpu, const void __user *buf, size_t size)
921-
{
922-
struct iov_iter iter;
923-
struct iovec iov;
924-
925-
if (is_blacklisted(cpu))
926-
return UCODE_NFOUND;
927-
928-
iov.iov_base = (void __user *)buf;
929-
iov.iov_len = size;
930-
iov_iter_init(&iter, WRITE, &iov, 1, size);
931-
932-
return generic_load_microcode(cpu, &iter);
933-
}
934-
935919
static struct microcode_ops microcode_intel_ops = {
936-
.request_microcode_user = request_microcode_user,
937920
.request_microcode_fw = request_microcode_fw,
938921
.collect_cpu_info = collect_cpu_info,
939922
.apply_microcode = apply_microcode_intel,

0 commit comments

Comments
 (0)