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>
88 lines
2.7 KiB
C
88 lines
2.7 KiB
C
#ifndef _ASM_X86_MICROCODE_INTEL_H
|
|
#define _ASM_X86_MICROCODE_INTEL_H
|
|
|
|
#include <asm/microcode.h>
|
|
|
|
struct microcode_header_intel {
|
|
unsigned int hdrver;
|
|
unsigned int rev;
|
|
unsigned int date;
|
|
unsigned int sig;
|
|
unsigned int cksum;
|
|
unsigned int ldrver;
|
|
unsigned int pf;
|
|
unsigned int datasize;
|
|
unsigned int totalsize;
|
|
unsigned int reserved[3];
|
|
};
|
|
|
|
struct microcode_intel {
|
|
struct microcode_header_intel hdr;
|
|
unsigned int bits[0];
|
|
};
|
|
|
|
/* microcode format is extended from prescott processors */
|
|
struct extended_signature {
|
|
unsigned int sig;
|
|
unsigned int pf;
|
|
unsigned int cksum;
|
|
};
|
|
|
|
struct extended_sigtable {
|
|
unsigned int count;
|
|
unsigned int cksum;
|
|
unsigned int reserved[3];
|
|
struct extended_signature sigs[0];
|
|
};
|
|
|
|
#define DEFAULT_UCODE_DATASIZE (2000)
|
|
#define MC_HEADER_SIZE (sizeof(struct microcode_header_intel))
|
|
#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
|
|
#define EXT_HEADER_SIZE (sizeof(struct extended_sigtable))
|
|
#define EXT_SIGNATURE_SIZE (sizeof(struct extended_signature))
|
|
#define DWSIZE (sizeof(u32))
|
|
|
|
#define get_totalsize(mc) \
|
|
(((struct microcode_intel *)mc)->hdr.totalsize ? \
|
|
((struct microcode_intel *)mc)->hdr.totalsize : \
|
|
DEFAULT_UCODE_TOTALSIZE)
|
|
|
|
#define get_datasize(mc) \
|
|
(((struct microcode_intel *)mc)->hdr.datasize ? \
|
|
((struct microcode_intel *)mc)->hdr.datasize : DEFAULT_UCODE_DATASIZE)
|
|
|
|
#define sigmatch(s1, s2, p1, p2) \
|
|
(((s1) == (s2)) && (((p1) & (p2)) || (((p1) == 0) && ((p2) == 0))))
|
|
|
|
#define exttable_size(et) ((et)->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)
|
|
|
|
extern int
|
|
get_matching_microcode(unsigned int csig, int cpf, void *mc, int rev);
|
|
extern int microcode_sanity_check(void *mc, int print_err);
|
|
extern int get_matching_sig(unsigned int csig, int cpf, void *mc, int rev);
|
|
extern int
|
|
update_match_revision(struct microcode_header_intel *mc_header, int rev);
|
|
|
|
#ifdef CONFIG_MICROCODE_INTEL_EARLY
|
|
extern void __init load_ucode_intel_bsp(void);
|
|
extern void load_ucode_intel_ap(void);
|
|
extern void show_ucode_info_early(void);
|
|
extern int __init save_microcode_in_initrd_intel(void);
|
|
#else
|
|
static inline __init void load_ucode_intel_bsp(void) {}
|
|
static inline void load_ucode_intel_ap(void) {}
|
|
static inline void show_ucode_info_early(void) {}
|
|
static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; }
|
|
#endif
|
|
|
|
#if defined(CONFIG_MICROCODE_INTEL_EARLY) && defined(CONFIG_HOTPLUG_CPU)
|
|
extern int save_mc_for_early(u8 *mc);
|
|
#else
|
|
static inline int save_mc_for_early(u8 *mc)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#endif /* _ASM_X86_MICROCODE_INTEL_H */
|