Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1508447
| From | tip-bot for Borislav Petkov <tipbot@zytor.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [tip:x86/microcode] x86/microcode/amd: Move private inlines to .c and mark local functions static |
| Date | 2016-10-25 18:40 +0200 |
| Message-ID | <swcVB-86H-45@gated-at.bofh.it> (permalink) |
| References | <sw6Gu-3S0-27@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Commit-ID: 76bd11c23aaa5c4bed504bfc4cf690240759598d
Gitweb: http://git.kernel.org/tip/76bd11c23aaa5c4bed504bfc4cf690240759598d
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 25 Oct 2016 11:55:19 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 25 Oct 2016 12:28:59 +0200
x86/microcode/amd: Move private inlines to .c and mark local functions static
Make them all static as they're used in a single file now.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161025095522.11964-10-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/microcode_amd.h | 21 --------------
arch/x86/kernel/cpu/microcode/amd.c | 53 +++++++++++++++++++++++++-----------
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h
index ad6a7be..3e3e20b 100644
--- a/arch/x86/include/asm/microcode_amd.h
+++ b/arch/x86/include/asm/microcode_amd.h
@@ -40,27 +40,6 @@ struct microcode_amd {
unsigned int mpb[0];
};
-static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table,
- unsigned int sig)
-{
- int i = 0;
-
- if (!equiv_cpu_table)
- return 0;
-
- while (equiv_cpu_table[i].installed_cpu != 0) {
- if (sig == equiv_cpu_table[i].installed_cpu)
- return equiv_cpu_table[i].equiv_cpu;
-
- i++;
- }
- return 0;
-}
-
-extern int __apply_microcode_amd(struct microcode_amd *mc_amd);
-extern int apply_microcode_amd(int cpu);
-extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);
-
#define PATCH_MAX_SIZE PAGE_SIZE
#ifdef CONFIG_MICROCODE_AMD
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index bb16418..03c19a6 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -126,6 +126,37 @@ static size_t compute_container_size(u8 *data, u32 total_size)
return size;
}
+static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table,
+ unsigned int sig)
+{
+ int i = 0;
+
+ if (!equiv_cpu_table)
+ return 0;
+
+ while (equiv_cpu_table[i].installed_cpu != 0) {
+ if (sig == equiv_cpu_table[i].installed_cpu)
+ return equiv_cpu_table[i].equiv_cpu;
+
+ i++;
+ }
+ return 0;
+}
+
+static int __apply_microcode_amd(struct microcode_amd *mc_amd)
+{
+ u32 rev, dummy;
+
+ native_wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&mc_amd->hdr.data_code);
+
+ /* verify patch application was successful */
+ native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
+ if (rev != mc_amd->hdr.patch_id)
+ return -1;
+
+ return 0;
+}
+
/*
* Early load occurs before we can vmalloc(). So we look for the microcode
* patch container file in initrd, traverse equivalent cpu table, look for a
@@ -395,6 +426,9 @@ void load_ucode_amd_ap(unsigned int family)
}
#endif
+static enum ucode_state
+load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);
+
int __init save_microcode_in_initrd_amd(unsigned int family)
{
unsigned long cont;
@@ -649,21 +683,7 @@ bool check_current_patch_level(u32 *rev, bool early)
return ret;
}
-int __apply_microcode_amd(struct microcode_amd *mc_amd)
-{
- u32 rev, dummy;
-
- native_wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&mc_amd->hdr.data_code);
-
- /* verify patch application was successful */
- native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
- if (rev != mc_amd->hdr.patch_id)
- return -1;
-
- return 0;
-}
-
-int apply_microcode_amd(int cpu)
+static int apply_microcode_amd(int cpu)
{
struct cpuinfo_x86 *c = &cpu_data(cpu);
struct microcode_amd *mc_amd;
@@ -846,7 +866,8 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,
return UCODE_OK;
}
-enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size)
+static enum ucode_state
+load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size)
{
enum ucode_state ret;
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/12] x86/microcode: Rework microcode loading Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
[PATCH 07/12] x86/microcode: Issue the debug printk on resume only on success Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
[tip:x86/microcode] x86/microcode: Issue the debug printk on resume only on success tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
[PATCH 01/12] x86/microcode: Run the AP-loading routine only on the application processors Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
[tip:x86/microcode] x86/microcode: Run the AP-loading routine only on the application processors tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:30 +0200
[PATCH 09/12] x86/microcode/AMD: Retract functions Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
[tip:x86/microcode] x86/microcode/amd: Move private inlines to .c and mark local functions static tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
[PATCH 08/12] x86/microcode: Collect CPU info on resume Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
[tip:x86/microcode] x86/microcode: Collect CPU info on resume tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
[PATCH 10/12] x86/microcode/intel: Remove intel_lib.c Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
[tip:x86/microcode] x86/microcode/intel: Remove intel_lib.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
[PATCH 06/12] x86/microcode/AMD: Hand down the CPU family Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
[tip:x86/microcode] x86/microcode/amd: Hand down the CPU family tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
[PATCH 02/12] x86/microcode: Move driver authors to CREDITS Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
[tip:x86/microcode] x86/microcode: Move driver authors to CREDITS tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
csiph-web