x86/microcode: Remove ->request_microcode_user()
Subsystems (2)
Borislav Petkov
maintainerPATCH 1/1 x86/microcode: Remove ->request_microcode_user()
From: Borislav Petkov <[email protected]>
181b6f40e9ea ("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.
--- arch/x86/include/asm/microcode.h | 3 --- arch/x86/kernel/cpu/microcode/amd.c | 7 ------- arch/x86/kernel/cpu/microcode/intel.c | 17 ----------------- 3 files changed, 27 deletions(-)
arch/x86/include/asm/microcode.h +0 -3
@@ -32,9 +32,6 @@ enum ucode_state { };struct microcode_ops { -enum ucode_state (*request_microcode_user) (int cpu, -const void __user *buf,size_t size); -enum ucode_state (*request_microcode_fw) (int cpu,struct device *,bool refresh_fw);
arch/x86/kernel/cpu/microcode/amd.c +0 -7
@@ -924,12 +924,6 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,return ret; } -static enum ucode_state -request_microcode_user (int cpu,const void __user *buf,size_t size) -{ -return UCODE_ERROR ; -} -static void microcode_fini_cpu_amd (int cpu) {struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
@@ -938,7 +932,6 @@ static void microcode_fini_cpu_amd(int cpu) }static struct microcode_ops microcode_amd_ops = { - .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_amd, .collect_cpu_info = collect_cpu_info_amd, .apply_microcode = apply_microcode_amd,
arch/x86/kernel/cpu/microcode/intel.c +0 -17
@@ -916,24 +916,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,return ret; } -static enum ucode_state -request_microcode_user (int cpu,const void __user *buf,size_t size) -{ -struct iov_iter iter; -struct iovec iov; - -if (is_blacklisted (cpu)) -return UCODE_NFOUND ; - - iov.iov_base = (void __user *)buf; - iov.iov_len = size; -iov_iter_init (&iter,WRITE , &iov,1 , size); - -return generic_load_microcode (cpu, &iter); -} -static struct microcode_ops microcode_intel_ops = { - .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_fw, .collect_cpu_info = collect_cpu_info, .apply_microcode = apply_microcode_intel,
Signature · 1 line
2.35.1
Quoted 8 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
181b6f40e9ea("x86/microcode: Rip out theOLD_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.
Nice, I had this in my cleanup pile too :-)
Quoted 8 lines
Signed-off-by Borislav Petkov <[email protected]>--- arch/x86/include/asm/microcode.h | 3 --- arch/x86/kernel/cpu/microcode/amd.c | 7 ------- arch/x86/kernel/cpu/microcode/intel.c | 17 ----------------- 3 files changed, 27 deletions(-)
The following commit has been merged into the x86/microcode branch of tip:
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: 8c61eafd22d7207039bff85c6e1d386f15abd17e Gitweb: https://git.kernel.org/tip/8c61eafd22d7207039bff85c6e1d386f15abd17e Author: Borislav Petkov <[email protected]> AuthorDate: Thu, 25 Aug 2022 09:51:57 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Fri, 26 Aug 2022 11:56:08 +02:00
x86/microcode: Remove ->request_microcode_user()
181b6f40e9ea ("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.
--- arch/x86/include/asm/microcode.h | 3 --- arch/x86/kernel/cpu/microcode/amd.c | 7 ------- arch/x86/kernel/cpu/microcode/intel.c | 17 ----------------- 3 files changed, 27 deletions(-)
arch/x86/include/asm/microcode.h +0 -3
@@ -32,9 +32,6 @@ enum ucode_state { };struct microcode_ops { -enum ucode_state (*request_microcode_user) (int cpu, -const void __user *buf,size_t size); -enum ucode_state (*request_microcode_fw) (int cpu,struct device *,bool refresh_fw);
arch/x86/kernel/cpu/microcode/amd.c +0 -7
@@ -924,12 +924,6 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,return ret; } -static enum ucode_state -request_microcode_user (int cpu,const void __user *buf,size_t size) -{ -return UCODE_ERROR ; -} -static void microcode_fini_cpu_amd (int cpu) {struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
@@ -938,7 +932,6 @@ static void microcode_fini_cpu_amd(int cpu) }static struct microcode_ops microcode_amd_ops = { - .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_amd, .collect_cpu_info = collect_cpu_info_amd, .apply_microcode = apply_microcode_amd,
arch/x86/kernel/cpu/microcode/intel.c +0 -17
@@ -916,24 +916,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,return ret; } -static enum ucode_state -request_microcode_user (int cpu,const void __user *buf,size_t size) -{ -struct iov_iter iter; -struct iovec iov; - -if (is_blacklisted (cpu)) -return UCODE_NFOUND ; - - iov.iov_base = (void __user *)buf; - iov.iov_len = size; -iov_iter_init (&iter,WRITE , &iov,1 , size); - -return generic_load_microcode (cpu, &iter); -} -static struct microcode_ops microcode_intel_ops = { - .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_fw, .collect_cpu_info = collect_cpu_info, .apply_microcode = apply_microcode_intel,