Commit 82ad097b authored by Ashok Raj's avatar Ashok Raj Committed by Borislav Petkov (AMD)
Browse files

x86/microcode: Include vendor headers into microcode.h 



Currently vendor specific headers are included explicitly when used in
common code. Instead, include the vendor specific headers in
microcode.h, and include that in all usages.

No functional change.

Suggested-by: default avatarBoris Petkov <bp@alien8.de>
Signed-off-by: default avatarAshok Raj <ashok.raj@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230812195727.776541545@linutronix.de
parent 4da2131f

arch/x86/include/asm/microcode.h

+4 −1
Original line number Diff line number Diff line
@@ -2,10 +2,13 @@ 
#ifndef _ASM_X86_MICROCODE_H

#define _ASM_X86_MICROCODE_H



#include <asm/cpu.h>

#include <linux/earlycpio.h>

#include <linux/initrd.h>



#include <asm/cpu.h>

#include <asm/microcode_amd.h>

#include <asm/microcode_intel.h>



struct ucode_patch {

	struct list_head plist;

	void *data;		/* Intel uses only this one */

arch/x86/include/asm/microcode_amd.h

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _ASM_X86_MICROCODE_AMD_H

#define _ASM_X86_MICROCODE_AMD_H



#include <asm/microcode.h>



#define UCODE_MAGIC			0x00414d44

#define UCODE_EQUIV_CPU_TABLE_TYPE	0x00000000

#define UCODE_UCODE_TYPE		0x00000001

arch/x86/include/asm/microcode_intel.h

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#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;

arch/x86/kernel/cpu/common.c

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
#include <asm/cacheinfo.h>

#include <asm/memtype.h>

#include <asm/microcode.h>

#include <asm/microcode_intel.h>

#include <asm/intel-family.h>

#include <asm/cpu_device_id.h>

#include <asm/uv/uv.h>

arch/x86/kernel/cpu/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/bugs.h>

#include <asm/cpu.h>

#include <asm/intel-family.h>

#include <asm/microcode_intel.h>

#include <asm/microcode.h>

#include <asm/hwcap2.h>

#include <asm/elf.h>

#include <asm/cpu_device_id.h>