]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/x86/kernel/microcode_amd.c
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / microcode_amd.c
index db199e3fdd1fa529d8c922f0040854430b3fb370..7a1f8eeac2c7c212712666b797eb55f4c2f43d83 100644 (file)
 
 MODULE_DESCRIPTION("AMD Microcode Update Driver");
 MODULE_AUTHOR("Peter Oruba <peter.oruba@amd.com>");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
 
 #define UCODE_MAGIC                0x00414d44
 #define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000
 #define UCODE_UCODE_TYPE           0x00000001
 
+struct equiv_cpu_entry {
+       unsigned int installed_cpu;
+       unsigned int fixed_errata_mask;
+       unsigned int fixed_errata_compare;
+       unsigned int equiv_cpu;
+};
+
+struct microcode_header_amd {
+       unsigned int  data_code;
+       unsigned int  patch_id;
+       unsigned char mc_patch_data_id[2];
+       unsigned char mc_patch_data_len;
+       unsigned char init_flag;
+       unsigned int  mc_patch_data_checksum;
+       unsigned int  nb_dev_id;
+       unsigned int  sb_dev_id;
+       unsigned char processor_rev_id[2];
+       unsigned char nb_rev_id;
+       unsigned char sb_rev_id;
+       unsigned char bios_api_rev;
+       unsigned char reserved1[3];
+       unsigned int  match_reg[8];
+};
+
+struct microcode_amd {
+       struct microcode_header_amd hdr;
+       unsigned int mpb[0];
+};
+
 #define UCODE_MAX_SIZE          (2048)
-#define DEFAULT_UCODE_DATASIZE (896)     /* 896 bytes */
-#define MC_HEADER_SIZE         (sizeof(struct microcode_header_amd))     /* 64 bytes */
-#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE) /* 960 bytes */
+#define DEFAULT_UCODE_DATASIZE (896)
+#define MC_HEADER_SIZE         (sizeof(struct microcode_header_amd))
+#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
 #define DWSIZE                 (sizeof(u32))
 /* For now we support a fixed ucode total size only */
 #define get_totalsize(mc) \
        ((((struct microcode_amd *)mc)->hdr.mc_patch_data_len * 28) \
         + MC_HEADER_SIZE)
 
-extern int microcode_init(void *opaque, struct module *module);
-extern void microcode_exit(void);
-
 /* serialize access to the physical write */
 static DEFINE_SPINLOCK(microcode_update_lock);
 
-/* no concurrent ->write()s are allowed on /dev/cpu/microcode */
-extern struct mutex (microcode_mutex);
+static struct equiv_cpu_entry *equiv_cpu_table;
 
-struct equiv_cpu_entry *equiv_cpu_table;
-
-extern struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
-
-static void collect_cpu_info_amd(int cpu)
+static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
 {
        struct cpuinfo_x86 *c = &cpu_data(cpu);
-       struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
-       /* We should bind the task to the CPU */
-       BUG_ON(raw_smp_processor_id() != cpu);
-       uci->rev = 0;
-       uci->pf = 0;
-       uci->mc.mc_amd = NULL;
-       uci->valid = 1;
+       memset(csig, 0, sizeof(*csig));
 
        if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) {
                printk(KERN_ERR "microcode: CPU%d not a capable AMD processor\n",
                       cpu);
-               uci->valid = 0;
-               return;
+               return -1;
        }
 
        asm volatile("movl %1, %%ecx; rdmsr"
-                    : "=a" (uci->rev)
+                    : "=a" (csig->rev)
                     : "i" (0x0000008B) : "ecx");
 
        printk(KERN_INFO "microcode: collect_cpu_info_amd : patch_id=0x%x\n",
-              uci->rev);
+               csig->rev);
+
+       return 0;
 }
 
-static int get_matching_microcode_amd(void *mc, int cpu)
+static int get_matching_microcode(int cpu, void *mc, int rev)
 {
-       struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
        struct microcode_header_amd *mc_header = mc;
-       unsigned long total_size = get_totalsize(mc_header);
-       void *new_mc;
        struct pci_dev *nb_pci_dev, *sb_pci_dev;
        unsigned int current_cpu_id;
        unsigned int equiv_cpu_id = 0x00;
        unsigned int i = 0;
 
-       /* We should bind the task to the CPU */
-       BUG_ON(cpu != raw_smp_processor_id());
-
-       /* 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. */
-       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->rev);
-               goto out;
-       }
-
+       BUG_ON(equiv_cpu_table == NULL);
        current_cpu_id = cpuid_eax(0x00000001);
 
        while (equiv_cpu_table[i].installed_cpu != 0) {
@@ -188,27 +183,9 @@ static int get_matching_microcode_amd(void *mc, int cpu)
                pci_dev_put(sb_pci_dev);
        }
 
-       if (mc_header->patch_id <= uci->rev)
+       if (mc_header->patch_id <= rev)
                return 0;
 
-       printk(KERN_INFO "microcode: CPU%d found a matching microcode "
-              "update with version 0x%x (current=0x%x)\n",
-              cpu, mc_header->patch_id, uci->rev);
-
-out:
-       new_mc = vmalloc(UCODE_MAX_SIZE);
-       if (!new_mc) {
-               printk(KERN_ERR "microcode: error, can't allocate memory\n");
-               return -ENOMEM;
-       }
-       memset(new_mc, 0, UCODE_MAX_SIZE);
-
-       /* free previous update file */
-       vfree(uci->mc.mc_amd);
-
-       memcpy(new_mc, mc, total_size);
-
-       uci->mc.mc_amd = new_mc;
        return 1;
 }
 
@@ -219,19 +196,20 @@ static void apply_microcode_amd(int cpu)
        unsigned int rev;
        int cpu_num = raw_smp_processor_id();
        struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;
+       struct microcode_amd *mc_amd = uci->mc;
+       unsigned long addr;
 
        /* We should bind the task to the CPU */
        BUG_ON(cpu_num != cpu);
 
-       if (uci->mc.mc_amd == NULL)
+       if (mc_amd == NULL)
                return;
 
        spin_lock_irqsave(&microcode_update_lock, flags);
 
-       edx = (unsigned int)(((unsigned long)
-                             &(uci->mc.mc_amd->hdr.data_code)) >> 32);
-       eax = (unsigned int)(((unsigned long)
-                             &(uci->mc.mc_amd->hdr.data_code)) & 0xffffffffL);
+       addr = (unsigned long)&mc_amd->hdr.data_code;
+       edx = (unsigned int)(((unsigned long)upper_32_bits(addr)));
+       eax = (unsigned int)(((unsigned long)lower_32_bits(addr)));
 
        asm volatile("movl %0, %%ecx; wrmsr" :
                     : "i" (0xc0010020), "a" (eax), "d" (edx) : "ecx");
@@ -244,118 +222,78 @@ static void apply_microcode_amd(int cpu)
        spin_unlock_irqrestore(&microcode_update_lock, flags);
 
        /* check current patch id and patch's id for match */
-       if (rev != uci->mc.mc_amd->hdr.patch_id) {
+       if (rev != mc_amd->hdr.patch_id) {
                printk(KERN_ERR "microcode: CPU%d update from revision "
                       "0x%x to 0x%x failed\n", cpu_num,
-                      uci->mc.mc_amd->hdr.patch_id, rev);
+                      mc_amd->hdr.patch_id, rev);
                return;
        }
 
        printk(KERN_INFO "microcode: CPU%d updated from revision "
               "0x%x to 0x%x \n",
-              cpu_num, uci->rev, uci->mc.mc_amd->hdr.patch_id);
+              cpu_num, uci->cpu_sig.rev, mc_amd->hdr.patch_id);
 
-       uci->rev = rev;
+       uci->cpu_sig.rev = rev;
 }
 
-#ifdef CONFIG_MICROCODE_OLD_INTERFACE
-extern void __user *user_buffer;        /* user area microcode data buffer */
-extern unsigned int user_buffer_size;   /* it's size */
-
-static long get_next_ucode_amd(void **mc, long offset)
+static void * get_next_ucode(u8 *buf, unsigned int size,
+                       int (*get_ucode_data)(void *, const void *, size_t),
+                       unsigned int *mc_size)
 {
-       struct microcode_header_amd mc_header;
-       unsigned long total_size;
-
-       /* No more data */
-       if (offset >= user_buffer_size)
-               return 0;
-       if (copy_from_user(&mc_header, user_buffer + offset, MC_HEADER_SIZE)) {
-               printk(KERN_ERR "microcode: error! Can not read user data\n");
-               return -EFAULT;
-       }
-       total_size = get_totalsize(&mc_header);
-       if (offset + total_size > user_buffer_size) {
-               printk(KERN_ERR "microcode: error! Bad total size in microcode "
-                      "data file\n");
-               return -EINVAL;
-       }
-       *mc = vmalloc(UCODE_MAX_SIZE);
-       if (!*mc)
-               return -ENOMEM;
-       memset(*mc, 0, UCODE_MAX_SIZE);
-
-       if (copy_from_user(*mc, user_buffer + offset, total_size)) {
-               printk(KERN_ERR "microcode: error! Can not read user data\n");
-               vfree(*mc);
-               return -EFAULT;
-       }
-       return offset + total_size;
-}
-#else
-#define get_next_ucode_amd() NULL
-#endif
-
-static long get_next_ucode_from_buffer_amd(void **mc, void *buf,
-                                      unsigned long size, long offset)
-{
-       struct microcode_header_amd *mc_header;
-       unsigned long total_size;
-       unsigned char *buf_pos = buf;
+       unsigned int total_size;
+#define UCODE_CONTAINER_SECTION_HDR    8
+       u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
+       void *mc;
 
-       /* No more data */
-       if (offset >= size)
-               return 0;
+       if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR))
+               return NULL;
 
-       if (buf_pos[offset] != UCODE_UCODE_TYPE) {
+       if (section_hdr[0] != UCODE_UCODE_TYPE) {
                printk(KERN_ERR "microcode: error! "
                       "Wrong microcode payload type field\n");
-               return -EINVAL;
+               return NULL;
        }
 
-       mc_header = (struct microcode_header_amd *)(&buf_pos[offset+8]);
+       total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8));
 
-       total_size = (unsigned long) (buf_pos[offset+4] +
-                                     (buf_pos[offset+5] << 8));
+       printk(KERN_INFO "microcode: size %u, total_size %u\n",
+               size, total_size);
 
-       printk(KERN_INFO "microcode: size %lu, total_size %lu, offset %ld\n",
-               size, total_size, offset);
-
-       if (offset + total_size > size) {
+       if (total_size > size || total_size > UCODE_MAX_SIZE) {
                printk(KERN_ERR "microcode: error! Bad data in microcode data file\n");
-               return -EINVAL;
+               return NULL;
        }
 
-       *mc = vmalloc(UCODE_MAX_SIZE);
-       if (!*mc) {
-               printk(KERN_ERR "microcode: error! "
-                      "Can not allocate memory for microcode patch\n");
-               return -ENOMEM;
+       mc = vmalloc(UCODE_MAX_SIZE);
+       if (mc) {
+               memset(mc, 0, UCODE_MAX_SIZE);
+               if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) {
+                       vfree(mc);
+                       mc = NULL;
+               } else
+                       *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
        }
-
-       memset(*mc, 0, UCODE_MAX_SIZE);
-       memcpy(*mc, buf + offset + 8, total_size);
-
-       return offset + total_size + 8;
+#undef UCODE_CONTAINER_SECTION_HDR
+       return mc;
 }
 
-static long install_equiv_cpu_table(void *buf, unsigned long size, long offset)
+
+static int install_equiv_cpu_table(u8 *buf,
+               int (*get_ucode_data)(void *, const void *, size_t))
 {
-       unsigned int *buf_pos = buf;
+#define UCODE_CONTAINER_HEADER_SIZE    12
+       u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE];
+       unsigned int *buf_pos = (unsigned int *)container_hdr;
+       unsigned long size;
 
-       /* No more data */
-       if (offset >= size)
+       if (get_ucode_data(&container_hdr, buf, UCODE_CONTAINER_HEADER_SIZE))
                return 0;
 
-       if (buf_pos[1] != UCODE_EQUIV_CPU_TABLE_TYPE) {
-               printk(KERN_ERR "microcode: error! "
-                      "Wrong microcode equivalnet cpu table type field\n");
-               return 0;
-       }
+       size = buf_pos[2];
 
-       if (size == 0) {
+       if (buf_pos[1] != UCODE_EQUIV_CPU_TABLE_TYPE || !size) {
                printk(KERN_ERR "microcode: error! "
-                      "Wrong microcode equivalnet cpu table length\n");
+                      "Wrong microcode equivalnet cpu table\n");
                return 0;
        }
 
@@ -365,157 +303,133 @@ static long install_equiv_cpu_table(void *buf, unsigned long size, long offset)
                return 0;
        }
 
-       memset(equiv_cpu_table, 0, size);
-       memcpy(equiv_cpu_table, &buf_pos[3], size);
+       buf += UCODE_CONTAINER_HEADER_SIZE;
+       if (get_ucode_data(equiv_cpu_table, buf, size)) {
+               vfree(equiv_cpu_table);
+               return 0;
+       }
 
-       return size + 12; /* add header length */
+       return size + UCODE_CONTAINER_HEADER_SIZE; /* add header length */
+#undef UCODE_CONTAINER_HEADER_SIZE
 }
 
-/* fake device for request_firmware */
-extern struct platform_device *microcode_pdev;
-
-static int cpu_request_microcode_amd(int cpu)
+static void free_equiv_cpu_table(void)
 {
-       char name[30];
-       const struct firmware *firmware;
-       void *buf;
-       unsigned int *buf_pos;
-       unsigned long size;
-       long offset = 0;
-       int error;
-       void *mc;
-
-       /* We should bind the task to the CPU */
-       BUG_ON(cpu != raw_smp_processor_id());
-
-       sprintf(name, "amd-ucode/microcode_amd.bin");
-       error = request_firmware(&firmware, "amd-ucode/microcode_amd.bin",
-                                &microcode_pdev->dev);
-       if (error) {
-               printk(KERN_ERR "microcode: ucode data file %s load failed\n",
-                      name);
-               return error;
-       }
-
-       buf_pos = buf = firmware->data;
-       size = firmware->size;
-
-       if (buf_pos[0] != UCODE_MAGIC) {
-               printk(KERN_ERR "microcode: error! Wrong microcode patch file magic\n");
-               return -EINVAL;
+       if (equiv_cpu_table) {
+               vfree(equiv_cpu_table);
+               equiv_cpu_table = NULL;
        }
+}
 
-       offset = install_equiv_cpu_table(buf, buf_pos[2], offset);
+static int generic_load_microcode(int cpu, void *data, size_t size,
+               int (*get_ucode_data)(void *, const void *, size_t))
+{
+       struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
+       u8 *ucode_ptr = data, *new_mc = NULL, *mc;
+       int new_rev = uci->cpu_sig.rev;
+       unsigned int leftover;
+       unsigned long offset;
 
+       offset = install_equiv_cpu_table(ucode_ptr, get_ucode_data);
        if (!offset) {
                printk(KERN_ERR "microcode: installing equivalent cpu table failed\n");
                return -EINVAL;
        }
 
-       while ((offset =
-               get_next_ucode_from_buffer_amd(&mc, buf, size, offset)) > 0) {
-               error = get_matching_microcode_amd(mc, cpu);
-               if (error < 0)
+       ucode_ptr += offset;
+       leftover = size - offset;
+
+       while (leftover) {
+               unsigned int uninitialized_var(mc_size);
+               struct microcode_header_amd *mc_header;
+
+               mc = get_next_ucode(ucode_ptr, leftover, get_ucode_data, &mc_size);
+               if (!mc)
                        break;
-               /*
-                * It's possible the data file has multiple matching ucode,
-                * lets keep searching till the latest version
-                */
-               if (error == 1) {
-                       apply_microcode_amd(cpu);
-                       error = 0;
-               }
-               vfree(mc);
+
+               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 
+                       vfree(mc);
+
+               ucode_ptr += mc_size;
+               leftover  -= mc_size;
        }
-       if (offset > 0) {
-               vfree(mc);
-               vfree(equiv_cpu_table);
-               equiv_cpu_table = NULL;
+
+       if (new_mc) {
+               if (!leftover) {
+                       if (uci->mc)
+                               vfree(uci->mc);
+                       uci->mc = new_mc;
+                       pr_debug("microcode: CPU%d found a matching microcode update with"
+                               " version 0x%x (current=0x%x)\n",
+                               cpu, new_rev, uci->cpu_sig.rev);
+               } else
+                       vfree(new_mc);
        }
-       if (offset < 0)
-               error = offset;
-       release_firmware(firmware);
 
-       return error;
+       free_equiv_cpu_table();
+
+       return (int)leftover;
 }
 
-static int apply_microcode_check_cpu_amd(int cpu)
+static int get_ucode_fw(void *to, const void *from, size_t n)
 {
-       struct cpuinfo_x86 *c = &cpu_data(cpu);
-       struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
-       unsigned int rev;
-       cpumask_t old;
-       cpumask_of_cpu_ptr(newmask, cpu);
-       int err = 0;
+       memcpy(to, from, n);
+       return 0;
+}
 
-       /* Check if the microcode is available */
-       if (!uci->mc.mc_amd)
-               return 0;
+static int request_microcode_fw(int cpu, struct device *device)
+{
+       const char *fw_name = "amd-ucode/microcode_amd.bin";
+       const struct firmware *firmware;
+       int ret;
 
-       old = current->cpus_allowed;
-       set_cpus_allowed(current, newmask);
+       /* We should bind the task to the CPU */
+       BUG_ON(cpu != raw_smp_processor_id());
 
-       /* Check if the microcode we have in memory matches the CPU */
-       if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 16)
-               err = -EINVAL;
+       ret = request_firmware(&firmware, fw_name, device);
+       if (ret) {
+               printk(KERN_ERR "microcode: ucode data file %s load failed\n", fw_name);
+               return ret;
+       }
 
-       if (!err) {
-               asm volatile("movl %1, %%ecx; rdmsr"
-                    : "=a" (rev)
-                    : "i" (0x0000008B) : "ecx");
+       ret = generic_load_microcode(cpu, (void*)firmware->data, firmware->size,
+                       &get_ucode_fw);
 
-               if (uci->rev != rev)
-                       err = -EINVAL;
-       }
+       release_firmware(firmware);
 
-       if (!err)
-               apply_microcode_amd(cpu);
-       else
-               printk(KERN_ERR "microcode: Could not apply microcode to CPU%d:"
-                      " rev=0x%x\n",
-                      cpu,  uci->rev);
+       return ret;
+}
 
-       set_cpus_allowed(current, old);
-       return err;
+static int request_microcode_user(int cpu, const void __user *buf, size_t size)
+{
+       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)
 {
        struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
-       mutex_lock(&microcode_mutex);
-       uci->valid = 0;
-       vfree(uci->mc.mc_amd);
-       uci->mc.mc_amd = NULL;
-       mutex_unlock(&microcode_mutex);
+       vfree(uci->mc);
+       uci->mc = NULL;
 }
 
 static struct microcode_ops microcode_amd_ops = {
-       .get_next_ucode                   = get_next_ucode_amd,
-       .get_matching_microcode           = get_matching_microcode_amd,
-       .microcode_sanity_check           = NULL,
-       .apply_microcode_check_cpu        = apply_microcode_check_cpu_amd,
-       .cpu_request_microcode            = cpu_request_microcode_amd,
+       .request_microcode_user           = request_microcode_user,
+       .request_microcode_fw             = request_microcode_fw,
        .collect_cpu_info                 = collect_cpu_info_amd,
        .apply_microcode                  = apply_microcode_amd,
        .microcode_fini_cpu               = microcode_fini_cpu_amd,
 };
 
-static int __init microcode_amd_module_init(void)
-{
-       struct cpuinfo_x86 *c = &cpu_data(get_cpu());
-
-       equiv_cpu_table = NULL;
-       if (c->x86_vendor == X86_VENDOR_AMD)
-               return microcode_init(&microcode_amd_ops, THIS_MODULE);
-       else
-               return -ENODEV;
-}
-
-static void __exit microcode_amd_module_exit(void)
+struct microcode_ops * __init init_amd_microcode(void)
 {
-       microcode_exit();
+       return &microcode_amd_ops;
 }
-
-module_init(microcode_amd_module_init)
-module_exit(microcode_amd_module_exit)