Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a76096a6 authored by Jacob Shin's avatar Jacob Shin Committed by H. Peter Anvin
Browse files

x86, microcode, amd: Refactor functions to prepare for early loading 



In preparation work for early loading, refactor some common functions
that will be shared, and move some struct defines to a common header file.

Signed-off-by: default avatarJacob Shin <jacob.shin@amd.com>
Link: http://lkml.kernel.org/r/1369940959-2077-4-git-send-email-jacob.shin@amd.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
parent f2b3ee82

arch/x86/include/asm/microcode_amd.h

0 → 100644
+64 −0
Original line number Diff line number Diff line 
#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



#define SECTION_HDR_SIZE		8

#define CONTAINER_HDR_SZ		12



struct equiv_cpu_entry {

	u32	installed_cpu;

	u32	fixed_errata_mask;

	u32	fixed_errata_compare;

	u16	equiv_cpu;

	u16	res;

} __attribute__((packed));



struct microcode_header_amd {

	u32	data_code;

	u32	patch_id;

	u16	mc_patch_data_id;

	u8	mc_patch_data_len;

	u8	init_flag;

	u32	mc_patch_data_checksum;

	u32	nb_dev_id;

	u32	sb_dev_id;

	u16	processor_rev_id;

	u8	nb_rev_id;

	u8	sb_rev_id;

	u8	bios_api_rev;

	u8	reserved1[3];

	u32	match_reg[8];

} __attribute__((packed));



struct microcode_amd {

	struct microcode_header_amd	hdr;

	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, const u8 *data, size_t size);



#endif /* _ASM_X86_MICROCODE_AMD_H */

arch/x86/kernel/microcode_amd.c

+42 −69
Original line number Diff line number Diff line
@@ -31,48 +31,12 @@ 
#include <asm/microcode.h>

#include <asm/processor.h>

#include <asm/msr.h>

#include <asm/microcode_amd.h>



MODULE_DESCRIPTION("AMD Microcode Update Driver");

MODULE_AUTHOR("Peter Oruba");

MODULE_LICENSE("GPL v2");



#define UCODE_MAGIC                0x00414d44

#define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000

#define UCODE_UCODE_TYPE           0x00000001



struct equiv_cpu_entry {

	u32	installed_cpu;

	u32	fixed_errata_mask;

	u32	fixed_errata_compare;

	u16	equiv_cpu;

	u16	res;

} __attribute__((packed));



struct microcode_header_amd {

	u32	data_code;

	u32	patch_id;

	u16	mc_patch_data_id;

	u8	mc_patch_data_len;

	u8	init_flag;

	u32	mc_patch_data_checksum;

	u32	nb_dev_id;

	u32	sb_dev_id;

	u16	processor_rev_id;

	u8	nb_rev_id;

	u8	sb_rev_id;

	u8	bios_api_rev;

	u8	reserved1[3];

	u32	match_reg[8];

} __attribute__((packed));



struct microcode_amd {

	struct microcode_header_amd	hdr;

	unsigned int			mpb[0];

};



#define SECTION_HDR_SIZE	8

#define CONTAINER_HDR_SZ	12



static struct equiv_cpu_entry *equiv_cpu_table;



struct ucode_patch {
@@ -84,21 +48,10 @@ struct ucode_patch { 


static LIST_HEAD(pcache);



static u16 find_equiv_id(unsigned int cpu)

static u16 __find_equiv_id(unsigned int cpu)

{

	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;

	int i = 0;



	if (!equiv_cpu_table)

		return 0;



	while (equiv_cpu_table[i].installed_cpu != 0) {

		if (uci->cpu_sig.sig == equiv_cpu_table[i].installed_cpu)

			return equiv_cpu_table[i].equiv_cpu;



		i++;

	}

	return 0;

	return find_equiv_id(equiv_cpu_table, uci->cpu_sig.sig);

}



static u32 find_cpu_family_by_equiv_cpu(u16 equiv_cpu)
@@ -163,7 +116,7 @@ static struct ucode_patch *find_patch(unsigned int cpu) 
{

	u16 equiv_id;



	equiv_id = find_equiv_id(cpu);

	equiv_id = __find_equiv_id(cpu);

	if (!equiv_id)

		return NULL;
@@ -215,7 +168,21 @@ static unsigned int verify_patch_size(int cpu, u32 patch_size, 
	return patch_size;

}



static int apply_microcode_amd(int cpu)

int __apply_microcode_amd(struct microcode_amd *mc_amd)

{

	u32 rev, dummy;



	wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&mc_amd->hdr.data_code);



	/* verify patch application was successful */

	rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);

	if (rev != mc_amd->hdr.patch_id)

		return -1;



	return 0;

}



int apply_microcode_amd(int cpu)

{

	struct cpuinfo_x86 *c = &cpu_data(cpu);

	struct microcode_amd *mc_amd;
@@ -242,19 +209,15 @@ static int apply_microcode_amd(int cpu) 
		return 0;

	}



	wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&mc_amd->hdr.data_code);



	/* verify patch application was successful */

	rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);

	if (rev != mc_amd->hdr.patch_id) {

	if (__apply_microcode_amd(mc_amd))

		pr_err("CPU%d: update failed for patch_level=0x%08x\n",

			cpu, mc_amd->hdr.patch_id);

		return -1;

	}

	else

		pr_info("CPU%d: new patch_level=0x%08x\n", cpu,

			mc_amd->hdr.patch_id);



	pr_info("CPU%d: new patch_level=0x%08x\n", cpu, rev);

	uci->cpu_sig.rev = rev;

	c->microcode = rev;

	uci->cpu_sig.rev = mc_amd->hdr.patch_id;

	c->microcode = mc_amd->hdr.patch_id;



	return 0;

}
@@ -364,7 +327,7 @@ static int verify_and_add_patch(unsigned int cpu, u8 *fw, unsigned int leftover) 
	return crnt_size;

}



static enum ucode_state load_microcode_amd(int cpu, const u8 *data, size_t size)

static enum ucode_state __load_microcode_amd(int cpu, const u8 *data, size_t size)

{

	enum ucode_state ret = UCODE_ERROR;

	unsigned int leftover;
@@ -398,6 +361,21 @@ static enum ucode_state load_microcode_amd(int cpu, const u8 *data, size_t size) 
	return UCODE_OK;

}



enum ucode_state load_microcode_amd(int cpu, const u8 *data, size_t size)

{

	enum ucode_state ret;



	/* free old equiv table */

	free_equiv_cpu_table();



	ret = __load_microcode_amd(cpu, data, size);



	if (ret != UCODE_OK)

		cleanup();



	return ret;

}



/*

 * AMD microcode firmware naming convention, up to family 15h they are in

 * the legacy file:
@@ -440,12 +418,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, 
		goto fw_release;

	}



	/* free old equiv table */

	free_equiv_cpu_table();



	ret = load_microcode_amd(cpu, fw->data, fw->size);

	if (ret != UCODE_OK)

		cleanup();



 fw_release:

	release_firmware(fw);