x86: ucode-amd: Load ucode-patches once and not separately of each CPU
This also implies that corresponding log messages, e.g. platform microcode: firmware: requesting amd-ucode/microcode_amd.bin show up only once on module load and not when ucode is updated for each CPU. Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> Cc: dimm <dmitry.adamushko@gmail.com> LKML-Reference: <20091110110723.GH30802@alberich.amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
		
					parent
					
						
							
								6e18da75c2
							
						
					
				
			
			
				commit
				
					
						d1c84f79a6
					
				
			
		
					 3 changed files with 25 additions and 7 deletions
				
			
		| 
						 | 
					@ -12,6 +12,8 @@ struct device;
 | 
				
			||||||
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
 | 
					enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct microcode_ops {
 | 
					struct microcode_ops {
 | 
				
			||||||
 | 
						void (*init)(struct device *device);
 | 
				
			||||||
 | 
						void (*fini)(void);
 | 
				
			||||||
	enum ucode_state (*request_microcode_user) (int cpu,
 | 
						enum ucode_state (*request_microcode_user) (int cpu,
 | 
				
			||||||
				const void __user *buf, size_t size);
 | 
									const void __user *buf, size_t size);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -33,6 +33,8 @@ MODULE_LICENSE("GPL v2");
 | 
				
			||||||
#define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000
 | 
					#define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000
 | 
				
			||||||
#define UCODE_UCODE_TYPE           0x00000001
 | 
					#define UCODE_UCODE_TYPE           0x00000001
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const struct firmware *firmware;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct equiv_cpu_entry {
 | 
					struct equiv_cpu_entry {
 | 
				
			||||||
	u32	installed_cpu;
 | 
						u32	installed_cpu;
 | 
				
			||||||
	u32	fixed_errata_mask;
 | 
						u32	fixed_errata_mask;
 | 
				
			||||||
| 
						 | 
					@ -301,14 +303,10 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static enum ucode_state request_microcode_fw(int cpu, struct device *device)
 | 
					static enum ucode_state request_microcode_fw(int cpu, struct device *device)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	const char *fw_name = "amd-ucode/microcode_amd.bin";
 | 
					 | 
				
			||||||
	const struct firmware *firmware;
 | 
					 | 
				
			||||||
	enum ucode_state ret;
 | 
						enum ucode_state ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (request_firmware(&firmware, fw_name, device)) {
 | 
						if (firmware == NULL)
 | 
				
			||||||
		printk(KERN_ERR "microcode: failed to load file %s\n", fw_name);
 | 
					 | 
				
			||||||
		return UCODE_NFOUND;
 | 
							return UCODE_NFOUND;
 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (*(u32 *)firmware->data != UCODE_MAGIC) {
 | 
						if (*(u32 *)firmware->data != UCODE_MAGIC) {
 | 
				
			||||||
		printk(KERN_ERR "microcode: invalid UCODE_MAGIC (0x%08x)\n",
 | 
							printk(KERN_ERR "microcode: invalid UCODE_MAGIC (0x%08x)\n",
 | 
				
			||||||
| 
						 | 
					@ -318,8 +316,6 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ret = generic_load_microcode(cpu, firmware->data, firmware->size);
 | 
						ret = generic_load_microcode(cpu, firmware->data, firmware->size);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	release_firmware(firmware);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -339,7 +335,21 @@ static void microcode_fini_cpu_amd(int cpu)
 | 
				
			||||||
	uci->mc = NULL;
 | 
						uci->mc = NULL;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void init_microcode_amd(struct device *device)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						const char *fw_name = "amd-ucode/microcode_amd.bin";
 | 
				
			||||||
 | 
						if (request_firmware(&firmware, fw_name, device))
 | 
				
			||||||
 | 
							printk(KERN_ERR "microcode: failed to load file %s\n", fw_name);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void fini_microcode_amd(void)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						release_firmware(firmware);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static struct microcode_ops microcode_amd_ops = {
 | 
					static struct microcode_ops microcode_amd_ops = {
 | 
				
			||||||
 | 
						.init				  = init_microcode_amd,
 | 
				
			||||||
 | 
						.fini				  = fini_microcode_amd,
 | 
				
			||||||
	.request_microcode_user           = request_microcode_user,
 | 
						.request_microcode_user           = request_microcode_user,
 | 
				
			||||||
	.request_microcode_fw             = request_microcode_fw,
 | 
						.request_microcode_fw             = request_microcode_fw,
 | 
				
			||||||
	.collect_cpu_info                 = collect_cpu_info_amd,
 | 
						.collect_cpu_info                 = collect_cpu_info_amd,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -520,6 +520,9 @@ static int __init microcode_init(void)
 | 
				
			||||||
		return PTR_ERR(microcode_pdev);
 | 
							return PTR_ERR(microcode_pdev);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (microcode_ops->init)
 | 
				
			||||||
 | 
							microcode_ops->init(µcode_pdev->dev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	get_online_cpus();
 | 
						get_online_cpus();
 | 
				
			||||||
	mutex_lock(µcode_mutex);
 | 
						mutex_lock(µcode_mutex);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -563,6 +566,9 @@ static void __exit microcode_exit(void)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	platform_device_unregister(microcode_pdev);
 | 
						platform_device_unregister(microcode_pdev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (microcode_ops->fini)
 | 
				
			||||||
 | 
							microcode_ops->fini();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	microcode_ops = NULL;
 | 
						microcode_ops = NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pr_info("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n");
 | 
						pr_info("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue