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

Commit a1c75cc5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, microcode rework, v2, fix 



based on patch from Dmitry Adamushko.

- add missing vfree()
- update debug printks

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a0a29b62

arch/x86/kernel/microcode.c

+1 −3
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ 
 *		Fix sigmatch() macro to handle old CPUs with pf == 0.

 *		Thanks to Stuart Swales for pointing out this bug.

 */



/* #define DEBUG pr_debug */

#include <linux/capability.h>

#include <linux/kernel.h>

#include <linux/init.h>
@@ -396,7 +394,7 @@ static int mc_sysdev_resume(struct sys_device *dev) 


	if (!cpu_online(cpu))

		return 0;

	pr_debug("microcode: CPU%d resumed\n", cpu);



	/* only CPU 0 will apply ucode here */

	microcode_update_cpu(0);

	return 0;

arch/x86/kernel/microcode_amd.c

+4 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int get_matching_microcode(int cpu, void *mc, int rev) 
	unsigned int i = 0;



	/*

	 * dimm: do we need this? Why an update via /dev/... is different

	 * FIXME! dimm: do we need this? Why an update via /dev/... is different

	 * from the one via firmware?

	 *

	 * This is a tricky part. We might be called from a write operation
@@ -246,7 +246,7 @@ static void * get_next_ucode(u8 *buf, unsigned int size, 
		return NULL;

	}



	/* Why not by means of get_totalsize(hdr)? */

	/* FIXME! dimm: Why not by means of get_totalsize(hdr)? */

	total_size = (unsigned long) (hdr[4] + (hdr[5] << 8));



	printk(KERN_INFO "microcode: size %u, total_size %u\n",
@@ -342,6 +342,8 @@ static int generic_load_microcode(int cpu, void *data, size_t size, 


		mc_header = (struct microcode_header_amd *)mc;

		if (get_matching_microcode(cpu, mc, new_rev)) {

			if (new_mc)

				vfree(new_mc);

			new_rev = mc_header->patch_id;

			new_mc  = mc;

		} else

arch/x86/kernel/microcode_intel.c

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ 
 *		Fix sigmatch() macro to handle old CPUs with pf == 0.

 *		Thanks to Stuart Swales for pointing out this bug.

 */



/* #define DEBUG */ /* pr_debug */

#include <linux/capability.h>

#include <linux/kernel.h>

#include <linux/init.h>
@@ -356,6 +354,8 @@ static int generic_load_microcode(int cpu, void *data, size_t size, 
		}



		if (get_matching_microcode(&uci->cpu_sig, mc, new_rev)) {

			if (new_mc)

				vfree(new_mc);

			new_rev = mc_header.rev;

			new_mc  = mc;

		} else