148f9bb877
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
75 lines
1.8 KiB
C
75 lines
1.8 KiB
C
#ifndef _ASM_X86_MICROCODE_H
|
|
#define _ASM_X86_MICROCODE_H
|
|
|
|
struct cpu_signature {
|
|
unsigned int sig;
|
|
unsigned int pf;
|
|
unsigned int rev;
|
|
};
|
|
|
|
struct device;
|
|
|
|
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
|
|
|
|
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);
|
|
|
|
void (*microcode_fini_cpu) (int cpu);
|
|
|
|
/*
|
|
* The generic 'microcode_core' part guarantees that
|
|
* the callbacks below run on a target cpu when they
|
|
* are being called.
|
|
* See also the "Synchronization" section in microcode_core.c.
|
|
*/
|
|
int (*apply_microcode) (int cpu);
|
|
int (*collect_cpu_info) (int cpu, struct cpu_signature *csig);
|
|
};
|
|
|
|
struct ucode_cpu_info {
|
|
struct cpu_signature cpu_sig;
|
|
int valid;
|
|
void *mc;
|
|
};
|
|
extern struct ucode_cpu_info ucode_cpu_info[];
|
|
|
|
#ifdef CONFIG_MICROCODE_INTEL
|
|
extern struct microcode_ops * __init init_intel_microcode(void);
|
|
#else
|
|
static inline struct microcode_ops * __init init_intel_microcode(void)
|
|
{
|
|
return NULL;
|
|
}
|
|
#endif /* CONFIG_MICROCODE_INTEL */
|
|
|
|
#ifdef CONFIG_MICROCODE_AMD
|
|
extern struct microcode_ops * __init init_amd_microcode(void);
|
|
extern void __exit exit_amd_microcode(void);
|
|
#else
|
|
static inline struct microcode_ops * __init init_amd_microcode(void)
|
|
{
|
|
return NULL;
|
|
}
|
|
static inline void __exit exit_amd_microcode(void) {}
|
|
#endif
|
|
|
|
#ifdef CONFIG_MICROCODE_EARLY
|
|
#define MAX_UCODE_COUNT 128
|
|
extern void __init load_ucode_bsp(void);
|
|
extern void load_ucode_ap(void);
|
|
extern int __init save_microcode_in_initrd(void);
|
|
#else
|
|
static inline void __init load_ucode_bsp(void) {}
|
|
static inline void load_ucode_ap(void) {}
|
|
static inline int __init save_microcode_in_initrd(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#endif /* _ASM_X86_MICROCODE_H */
|