x86, microcode rework, v2, fix

based on patch from Dmitry Adamushko.

- add missing vfree()
- update debug printks

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c
index 902dada2eb6d72a00870b1eda4036ec6799bc10b..0c2634f4fd7c9979c0f8497ff9e3e333944494e0 100644 (file)
--- a/arch/x86/kernel/microcode.c
+++ b/arch/x86/kernel/microcode.c
@@ -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;

diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 6815837a7753f871dcc2d2ff578d68a9ff7c8425..48aec9f48e4f476b51b6418dde3bb77be2f332ad 100644 (file)
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -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 

diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
index f4930b55c6a080c2dc2f8bfe9457939b2bd77966..48ed3cef58c104dd341d0af2c63d90e3576d3fd8 100644 (file)
--- a/arch/x86/kernel/microcode_intel.c
+++ b/arch/x86/kernel/microcode_intel.c
@@ -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