Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp...

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / microcode_amd.c

diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 62058e9c8b4ed9951468a8ca91815aeb948e30e6..7a1f8eeac2c7c212712666b797eb55f4c2f43d83 100644 (file)
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -120,29 +120,7 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
        unsigned int equiv_cpu_id = 0x00;
        unsigned int i = 0;
 
-       /*
-        * 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
-        * to the device file instead of the usual process of firmware
-        * loading. This routine needs to be able to distinguish both
-        * cases. This is done by checking if there alread is a equivalent
-        * CPU table installed. If not, we're written through
-        * /dev/cpu/microcode.
-        * Since we ignore all checks. The error case in which going through
-        * firmware loading and that table is not loaded has already been
-        * checked earlier.
-        */
        BUG_ON(equiv_cpu_table == NULL);
-#if 0
-       if (equiv_cpu_table == NULL) {
-               printk(KERN_INFO "microcode: CPU%d microcode update with "
-                      "version 0x%x (current=0x%x)\n",
-                      cpu, mc_header->patch_id, uci->cpu_sig.rev);
-               goto out;
-       }
-#endif
        current_cpu_id = cpuid_eax(0x00000001);
 
        while (equiv_cpu_table[i].installed_cpu != 0) {
@@ -263,21 +241,20 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
                        unsigned int *mc_size)
 {
        unsigned int total_size;
-#define UCODE_UNKNOWN_HDR      8
-       u8 hdr[UCODE_UNKNOWN_HDR];
+#define UCODE_CONTAINER_SECTION_HDR    8
+       u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
        void *mc;
 
-       if (get_ucode_data(hdr, buf, UCODE_UNKNOWN_HDR))
+       if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR))
                return NULL;
 
-       if (hdr[0] != UCODE_UCODE_TYPE) {
+       if (section_hdr[0] != UCODE_UCODE_TYPE) {
                printk(KERN_ERR "microcode: error! "
                       "Wrong microcode payload type field\n");
                return NULL;
        }
 
-       /* FIXME! dimm: Why not by means of get_totalsize(hdr)? */
-       total_size = (unsigned long) (hdr[4] + (hdr[5] << 8));
+       total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8));
 
        printk(KERN_INFO "microcode: size %u, total_size %u\n",
                size, total_size);
@@ -290,13 +267,13 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
        mc = vmalloc(UCODE_MAX_SIZE);
        if (mc) {
                memset(mc, 0, UCODE_MAX_SIZE);
-               if (get_ucode_data(mc, buf + UCODE_UNKNOWN_HDR, total_size)) {
+               if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) {
                        vfree(mc);
                        mc = NULL;
                } else
-                       *mc_size = total_size + UCODE_UNKNOWN_HDR;
+                       *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
        }
-#undef UCODE_UNKNOWN_HDR
+#undef UCODE_CONTAINER_SECTION_HDR
        return mc;
 }
 
@@ -363,7 +340,7 @@ static int generic_load_microcode(int cpu, void *data, size_t size,
        leftover = size - offset;
 
        while (leftover) {
-               unsigned int mc_size;
+               unsigned int uninitialized_var(mc_size);
                struct microcode_header_amd *mc_header;
 
                mc = get_next_ucode(ucode_ptr, leftover, get_ucode_data, &mc_size);
@@ -429,17 +406,11 @@ static int request_microcode_fw(int cpu, struct device *device)
        return ret;
 }
 
-static int get_ucode_user(void *to, const void *from, size_t n)
-{
-       return copy_from_user(to, from, n);
-}
-
 static int request_microcode_user(int cpu, const void __user *buf, size_t size)
 {
-       /* We should bind the task to the CPU */
-       BUG_ON(cpu != raw_smp_processor_id());
-
-       return generic_load_microcode(cpu, (void*)buf, size, &get_ucode_user);
+       printk(KERN_WARNING "microcode: AMD microcode update via /dev/cpu/microcode"
+                       "is not supported\n");
+       return -1;
 }
 
 static void microcode_fini_cpu_amd(int cpu)