diff -r 3155a367b476 xen/arch/x86/Makefile --- a/xen/arch/x86/Makefile Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/arch/x86/Makefile Fri Jan 30 14:03:52 2009 +0100 @@ -28,6 +28,8 @@ obj-y += ioport_emulate.o obj-y += ioport_emulate.o obj-y += irq.o obj-y += microcode.o +obj-y += microcode_amd.o +obj-y += microcode_intel.o obj-y += mm.o obj-y += mpparse.o obj-y += nmi.o diff -r 3155a367b476 xen/arch/x86/domain.c --- a/xen/arch/x86/domain.c Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/arch/x86/domain.c Fri Jan 30 14:03:52 2009 +0100 @@ -1350,6 +1350,7 @@ struct migrate_info { void *data; void (*saved_schedule_tail)(struct vcpu *); cpumask_t saved_affinity; + unsigned int nest; }; static void continue_hypercall_on_cpu_helper(struct vcpu *v) @@ -1357,47 +1358,63 @@ static void continue_hypercall_on_cpu_he struct cpu_user_regs *regs = guest_cpu_user_regs(); struct migrate_info *info = v->arch.continue_info; cpumask_t mask = info->saved_affinity; + void (*saved_schedule_tail)(struct vcpu *) = info->saved_schedule_tail; regs->eax = info->func(info->data); - v->arch.schedule_tail = info->saved_schedule_tail; - v->arch.continue_info = NULL; + if ( info->nest-- == 0 ) + { + xfree(info); + v->arch.schedule_tail = saved_schedule_tail; + v->arch.continue_info = NULL; + vcpu_unlock_affinity(v, &mask); + } - xfree(info); - - vcpu_unlock_affinity(v, &mask); - schedule_tail(v); + (*saved_schedule_tail)(v); } int continue_hypercall_on_cpu(int cpu, long (*func)(void *data), void *data) { struct vcpu *v = current; struct migrate_info *info; + cpumask_t mask = cpumask_of_cpu(cpu); int rc; if ( cpu == smp_processor_id() ) return func(data); - info = xmalloc(struct migrate_info); + info = v->arch.continue_info; if ( info == NULL ) - return -ENOMEM; + { + info = xmalloc(struct migrate_info); + if ( info == NULL ) + return -ENOMEM; + + rc = vcpu_lock_affinity(v, &mask); + if ( rc ) + { + xfree(info); + return rc; + } + + info->saved_schedule_tail = v->arch.schedule_tail; + info->saved_affinity = mask; + info->nest = 0; + + v->arch.schedule_tail = continue_hypercall_on_cpu_helper; + v->arch.continue_info = info; + } + else + { + BUG_ON(info->nest != 0); + rc = vcpu_locked_change_affinity(v, &mask); + if ( rc ) + return rc; + info->nest++; + } info->func = func; info->data = data; - info->saved_schedule_tail = v->arch.schedule_tail; - info->saved_affinity = cpumask_of_cpu(cpu); - - v->arch.schedule_tail = continue_hypercall_on_cpu_helper; - v->arch.continue_info = info; - - rc = vcpu_lock_affinity(v, &info->saved_affinity); - if ( rc ) - { - v->arch.schedule_tail = info->saved_schedule_tail; - v->arch.continue_info = NULL; - xfree(info); - return rc; - } /* Dummy return value will be overwritten by new schedule_tail. */ BUG_ON(!test_bit(SCHEDULE_SOFTIRQ, &softirq_pending(smp_processor_id()))); diff -r 3155a367b476 xen/arch/x86/microcode.c --- a/xen/arch/x86/microcode.c Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/arch/x86/microcode.c Fri Jan 30 14:03:52 2009 +0100 @@ -1,72 +1,24 @@ /* - * Intel CPU Microcode Update Driver for Linux + * Intel CPU Microcode Update Driver for Linux * - * Copyright (C) 2000-2004 Tigran Aivazian + * Copyright (C) 2000-2006 Tigran Aivazian + * 2006 Shaohua Li * + * This driver allows to upgrade microcode on Intel processors + * belonging to IA-32 family - PentiumPro, Pentium II, + * Pentium III, Xeon, Pentium 4, etc. * - * This driver allows to upgrade microcode on Intel processors - * belonging to IA-32 family - PentiumPro, Pentium II, - * Pentium III, Xeon, Pentium 4, etc. + * Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture + * Software Developer's Manual + * Order Number 253668 or free download from: * - * Reference: Section 8.10 of Volume III, Intel Pentium 4 Manual, - * Order Number 245472 or free download from: - * - * http://developer.intel.com/design/pentium4/manuals/245472.htm + * http://developer.intel.com/design/pentium4/manuals/253668.htm * - * For more information, go to http://www.urbanmyth.org/microcode + * For more information, go to http://www.urbanmyth.org/microcode * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * 1.0 16 Feb 2000, Tigran Aivazian - * Initial release. - * 1.01 18 Feb 2000, Tigran Aivazian - * Added read() support + cleanups. - * 1.02 21 Feb 2000, Tigran Aivazian - * Added 'device trimming' support. open(O_WRONLY) zeroes - * and frees the saved copy of applied microcode. - * 1.03 29 Feb 2000, Tigran Aivazian - * Made to use devfs (/dev/cpu/microcode) + cleanups. - * 1.04 06 Jun 2000, Simon Trimmer - * Added misc device support (now uses both devfs and misc). - * Added MICROCODE_IOCFREE ioctl to clear memory. - * 1.05 09 Jun 2000, Simon Trimmer - * Messages for error cases (non Intel & no suitable microcode). - * 1.06 03 Aug 2000, Tigran Aivazian - * Removed ->release(). Removed exclusive open and status bitmap. - * Added microcode_rwsem to serialize read()/write()/ioctl(). - * Removed global kernel lock usage. - * 1.07 07 Sep 2000, Tigran Aivazian - * Write 0 to 0x8B msr and then cpuid before reading revision, - * so that it works even if there were no update done by the - * BIOS. Otherwise, reading from 0x8B gives junk (which happened - * to be 0 on my machine which is why it worked even when I - * disabled update by the BIOS) - * Thanks to Eric W. Biederman for the fix. - * 1.08 11 Dec 2000, Richard Schaal and - * Tigran Aivazian - * Intel Pentium 4 processor support and bugfixes. - * 1.09 30 Oct 2001, Tigran Aivazian - * Bugfix for HT (Hyper-Threading) enabled processors - * whereby processor resources are shared by all logical processors - * in a single CPU package. - * 1.10 28 Feb 2002 Asit K Mallick and - * Tigran Aivazian , - * Serialize updates as required on HT processors due to speculative - * nature of implementation. - * 1.11 22 Mar 2002 Tigran Aivazian - * Fix the panic when writing zero-length microcode chunk. - * 1.12 29 Sep 2003 Nitin Kamble , - * Jun Nakajima - * Support for the microcode updates in the new format. - * 1.13 10 Oct 2003 Tigran Aivazian - * Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl - * because we no longer hold a copy of applied microcode - * in kernel memory. - * 1.14 25 Jun 2004 Tigran Aivazian - * Fix sigmatch() macro to handle old CPUs with pf == 0. - * Thanks to Stuart Swales for pointing out this bug. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. */ #include @@ -76,402 +28,142 @@ #include #include #include +#include #include #include #include #include +#include -#define pr_debug(x...) ((void)0) -#define DEFINE_MUTEX(_m) DEFINE_SPINLOCK(_m) -#define mutex_lock(_m) spin_lock(_m) -#define mutex_unlock(_m) spin_unlock(_m) -#define vmalloc(_s) xmalloc_bytes(_s) -#define vfree(_p) xfree(_p) +const struct microcode_ops *microcode_ops; -#if 0 -MODULE_DESCRIPTION("Intel CPU (IA-32) Microcode Update Driver"); -MODULE_AUTHOR("Tigran Aivazian "); -MODULE_LICENSE("GPL"); -#endif +static DEFINE_SPINLOCK(microcode_mutex); -static int verbose; -boolean_param("microcode.verbose", verbose); +struct ucode_cpu_info ucode_cpu_info[NR_CPUS]; -#define MICROCODE_VERSION "1.14a" +struct microcode_info { + unsigned int cpu; + uint32_t buffer_size; + int error; + char buffer[1]; +}; -#define DEFAULT_UCODE_DATASIZE (2000) /* 2000 bytes */ -#define MC_HEADER_SIZE (sizeof (microcode_header_t)) /* 48 bytes */ -#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE) /* 2048 bytes */ -#define EXT_HEADER_SIZE (sizeof (struct extended_sigtable)) /* 20 bytes */ -#define EXT_SIGNATURE_SIZE (sizeof (struct extended_signature)) /* 12 bytes */ -#define DWSIZE (sizeof (u32)) -#define get_totalsize(mc) \ - (((microcode_t *)mc)->hdr.totalsize ? \ - ((microcode_t *)mc)->hdr.totalsize : DEFAULT_UCODE_TOTALSIZE) -#define get_datasize(mc) \ - (((microcode_t *)mc)->hdr.datasize ? \ - ((microcode_t *)mc)->hdr.datasize : DEFAULT_UCODE_DATASIZE) - -#define sigmatch(s1, s2, p1, p2) \ - (((s1) == (s2)) && (((p1) & (p2)) || (((p1) == 0) && ((p2) == 0)))) - -#define exttable_size(et) ((et)->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE) - -/* serialize access to the physical write to MSR 0x79 */ -static DEFINE_SPINLOCK(microcode_update_lock); - -/* no concurrent ->write()s are allowed on /dev/cpu/microcode */ -static DEFINE_MUTEX(microcode_mutex); - -static void __user *user_buffer; /* user area microcode data buffer */ -static unsigned int user_buffer_size; /* it's size */ - -typedef enum mc_error_code { - MC_SUCCESS = 0, - MC_IGNORED = 1, - MC_NOTFOUND = 2, - MC_MARKED = 3, - MC_ALLOCATED = 4, -} mc_error_code_t; - -static struct ucode_cpu_info { - unsigned int sig; - unsigned int pf, orig_pf; - unsigned int rev; - unsigned int cksum; - mc_error_code_t err; - microcode_t *mc; -} ucode_cpu_info[NR_CPUS]; - -static void collect_cpu_info (void *unused) +static void microcode_fini_cpu(struct ucode_cpu_info *uci, int cpu) { - int cpu_num = smp_processor_id(); - struct cpuinfo_x86 *c = cpu_data + cpu_num; - struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; - unsigned int val[2]; - - uci->sig = uci->pf = uci->rev = uci->cksum = 0; - uci->err = MC_NOTFOUND; - uci->mc = NULL; - - if (c->x86_vendor != X86_VENDOR_INTEL || c->x86 < 6 || - cpu_has(c, X86_FEATURE_IA64)) { - printk(KERN_ERR "microcode: CPU%d not a capable Intel processor\n", cpu_num); - return; - } else { - uci->sig = cpuid_eax(0x00000001); - - if ((c->x86_model >= 5) || (c->x86 > 6)) { - /* get processor flags from MSR 0x17 */ - rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]); - uci->pf = 1 << ((val[1] >> 18) & 7); - } - uci->orig_pf = uci->pf; - } - - wrmsr(MSR_IA32_UCODE_REV, 0, 0); - /* see notes above for revision 1.07. Apparent chip bug */ - sync_core(); - /* get the current revision from MSR 0x8B */ - rdmsr(MSR_IA32_UCODE_REV, val[0], uci->rev); - pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n", - uci->sig, uci->pf, uci->rev); + spin_lock(µcode_mutex); + xfree(uci->mc.mc_valid); + uci->mc.mc_valid = NULL; + spin_unlock(µcode_mutex); } -static inline void mark_microcode_update (int cpu_num, microcode_header_t *mc_header, int sig, int pf, int cksum) +static int collect_cpu_info(struct ucode_cpu_info *uci, int cpu) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; - - pr_debug("Microcode Found.\n"); - pr_debug(" Header Revision 0x%x\n", mc_header->hdrver); - pr_debug(" Loader Revision 0x%x\n", mc_header->ldrver); - pr_debug(" Revision 0x%x \n", mc_header->rev); - pr_debug(" Date %x/%x/%x\n", - ((mc_header->date >> 24 ) & 0xff), - ((mc_header->date >> 16 ) & 0xff), - (mc_header->date & 0xFFFF)); - pr_debug(" Signature 0x%x\n", sig); - pr_debug(" Type 0x%x Family 0x%x Model 0x%x Stepping 0x%x\n", - ((sig >> 12) & 0x3), - ((sig >> 8) & 0xf), - ((sig >> 4) & 0xf), - ((sig & 0xf))); - pr_debug(" Processor Flags 0x%x\n", pf); - pr_debug(" Checksum 0x%x\n", cksum); - - if (mc_header->rev < uci->rev) { - if (uci->err == MC_NOTFOUND) { - uci->err = MC_IGNORED; - uci->cksum = mc_header->rev; - } else if (uci->err == MC_IGNORED && uci->cksum < mc_header->rev) - uci->cksum = mc_header->rev; - } else if (mc_header->rev == uci->rev) { - if (uci->err < MC_MARKED) { - /* notify the caller of success on this cpu */ - uci->err = MC_SUCCESS; - } - } else if (uci->err != MC_ALLOCATED || mc_header->rev > uci->mc->hdr.rev) { - pr_debug("microcode: CPU%d found a matching microcode update with " - " revision 0x%x (current=0x%x)\n", cpu_num, mc_header->rev, uci->rev); - uci->cksum = cksum; - uci->pf = pf; /* keep the original mc pf for cksum calculation */ - uci->err = MC_MARKED; /* found the match */ - for_each_online_cpu(cpu_num) { - if (ucode_cpu_info + cpu_num != uci - && ucode_cpu_info[cpu_num].mc == uci->mc) { - uci->mc = NULL; - break; - } - } - if (uci->mc != NULL) { - vfree(uci->mc); - uci->mc = NULL; - } - } - return; + memset(uci, 0, sizeof(*uci)); + return microcode_ops->collect_cpu_info(cpu, &uci->cpu_sig); } -static int find_matching_ucodes (void) +static int microcode_resume_cpu(struct ucode_cpu_info *uci, int cpu) { - int cursor = 0; - int error = 0; + int err = 0; + struct cpu_signature nsig; - while (cursor + MC_HEADER_SIZE < user_buffer_size) { - microcode_header_t mc_header; - void *newmc = NULL; - int i, sum, cpu_num, allocated_flag, total_size, data_size, ext_table_size; + gdprintk(XENLOG_INFO, "microcode: CPU%d resumed\n", cpu); - if (copy_from_user(&mc_header, user_buffer + cursor, MC_HEADER_SIZE)) { - printk(KERN_ERR "microcode: error! Can not read user data\n"); - error = -EFAULT; - goto out; - } + if ( !uci->mc.mc_valid ) + return -EIO; - total_size = get_totalsize(&mc_header); - if (cursor + total_size > user_buffer_size) { - printk(KERN_ERR "microcode: error! Bad data in microcode data file\n"); - error = -EINVAL; - goto out; - } + /* + * Let's verify that the 'cached' ucode does belong + * to this cpu (a bit of paranoia): + */ + err = microcode_ops->collect_cpu_info(cpu, &nsig); + if ( err ) + { + microcode_fini_cpu(uci, cpu); + return err; + } - data_size = get_datasize(&mc_header); - if (data_size + MC_HEADER_SIZE > total_size) { - printk(KERN_ERR "microcode: error! Bad data in microcode data file\n"); - error = -EINVAL; - goto out; - } + if ( memcmp(&nsig, &uci->cpu_sig, sizeof(nsig)) ) + { + microcode_fini_cpu(uci, cpu); + /* Should we look for a new ucode here? */ + return -EIO; + } - if (mc_header.ldrver != 1 || mc_header.hdrver != 1) { - printk(KERN_ERR "microcode: error! Unknown microcode update format\n"); - error = -EINVAL; - goto out; - } - - for_each_online_cpu(cpu_num) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; - - if (sigmatch(mc_header.sig, uci->sig, mc_header.pf, uci->orig_pf)) - mark_microcode_update(cpu_num, &mc_header, mc_header.sig, mc_header.pf, mc_header.cksum); - } - - ext_table_size = total_size - (MC_HEADER_SIZE + data_size); - if (ext_table_size) { - struct extended_sigtable ext_header; - struct extended_signature ext_sig; - int ext_sigcount; - - if ((ext_table_size < EXT_HEADER_SIZE) - || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) { - printk(KERN_ERR "microcode: error! Bad data in microcode data file\n"); - error = -EINVAL; - goto out; - } - if (copy_from_user(&ext_header, user_buffer + cursor - + MC_HEADER_SIZE + data_size, EXT_HEADER_SIZE)) { - printk(KERN_ERR "microcode: error! Can not read user data\n"); - error = -EFAULT; - goto out; - } - if (ext_table_size != exttable_size(&ext_header)) { - printk(KERN_ERR "microcode: error! Bad data in microcode data file\n"); - error = -EFAULT; - goto out; - } - - ext_sigcount = ext_header.count; - - for (i = 0; i < ext_sigcount; i++) { - if (copy_from_user(&ext_sig, user_buffer + cursor + MC_HEADER_SIZE + data_size + EXT_HEADER_SIZE - + EXT_SIGNATURE_SIZE * i, EXT_SIGNATURE_SIZE)) { - printk(KERN_ERR "microcode: error! Can not read user data\n"); - error = -EFAULT; - goto out; - } - for_each_online_cpu(cpu_num) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; - - if (sigmatch(ext_sig.sig, uci->sig, ext_sig.pf, uci->orig_pf)) { - mark_microcode_update(cpu_num, &mc_header, ext_sig.sig, ext_sig.pf, ext_sig.cksum); - } - } - } - } - /* now check if any cpu has matched */ - allocated_flag = 0; - sum = 0; - for_each_online_cpu(cpu_num) { - if (ucode_cpu_info[cpu_num].err == MC_MARKED) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; - if (!allocated_flag) { - allocated_flag = 1; - newmc = vmalloc(total_size); - if (!newmc) { - printk(KERN_ERR "microcode: error! Can not allocate memory\n"); - error = -ENOMEM; - goto out; - } - if (copy_from_user(newmc + MC_HEADER_SIZE, - user_buffer + cursor + MC_HEADER_SIZE, - total_size - MC_HEADER_SIZE)) { - printk(KERN_ERR "microcode: error! Can not read user data\n"); - vfree(newmc); - error = -EFAULT; - goto out; - } - memcpy(newmc, &mc_header, MC_HEADER_SIZE); - /* check extended table checksum */ - if (ext_table_size) { - int ext_table_sum = 0; - int * ext_tablep = (((void *) newmc) + MC_HEADER_SIZE + data_size); - i = ext_table_size / DWSIZE; - while (i--) ext_table_sum += ext_tablep[i]; - if (ext_table_sum) { - printk(KERN_WARNING "microcode: aborting, bad extended signature table checksum\n"); - vfree(newmc); - error = -EINVAL; - goto out; - } - } - - /* calculate the checksum */ - i = (MC_HEADER_SIZE + data_size) / DWSIZE; - while (i--) sum += ((int *)newmc)[i]; - sum -= (mc_header.sig + mc_header.pf + mc_header.cksum); - } - ucode_cpu_info[cpu_num].mc = newmc; - ucode_cpu_info[cpu_num].err = MC_ALLOCATED; /* mc updated */ - if (sum + uci->sig + uci->pf + uci->cksum != 0) { - printk(KERN_ERR "microcode: CPU%d aborting, bad checksum\n", cpu_num); - error = -EINVAL; - goto out; - } - } - } - cursor += total_size; /* goto the next update patch */ - } /* end of while */ -out: - return error; + return microcode_ops->apply_microcode(uci, cpu); } -static void do_update_one (void * unused) +static int microcode_update_cpu(const void *buf, size_t size) { - unsigned long flags; - unsigned int val[2]; - int cpu_num = smp_processor_id(); - struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; + int err; + unsigned int cpu = smp_processor_id(); + struct ucode_cpu_info *uci = &ucode_cpu_info[cpu]; - if (uci->mc == NULL) { - if (verbose) { - if (uci->err == MC_SUCCESS) - printk(KERN_INFO "microcode: CPU%d already at revision 0x%x\n", - cpu_num, uci->rev); - else - printk(KERN_INFO "microcode: No new microcode data for CPU%d\n", cpu_num); - } - return; - } + spin_lock(µcode_mutex); - /* serialize access to the physical write to MSR 0x79 */ - spin_lock_irqsave(µcode_update_lock, flags); + /* + * Check if the system resume is in progress (uci->mc.mc_valid != NULL), + * otherwise just request a firmware: + */ + if ( uci->mc.mc_valid ) { + err = microcode_resume_cpu(uci, cpu); + } else { + err = collect_cpu_info(uci, cpu); + if ( !err ) + err = microcode_ops->cpu_request_microcode(uci, cpu, buf, size); + } - /* write microcode via MSR 0x79 */ - wrmsr(MSR_IA32_UCODE_WRITE, - (unsigned long) uci->mc->bits, - (unsigned long) uci->mc->bits >> 16 >> 16); - wrmsr(MSR_IA32_UCODE_REV, 0, 0); + spin_unlock(µcode_mutex); - /* see notes above for revision 1.07. Apparent chip bug */ - sync_core(); - - /* get the current revision from MSR 0x8B */ - rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]); - - /* notify the caller of success on this cpu */ - uci->err = MC_SUCCESS; - spin_unlock_irqrestore(µcode_update_lock, flags); - printk(KERN_INFO "microcode: CPU%d updated from revision " - "0x%x to 0x%x, date = %08x \n", - cpu_num, uci->rev, val[1], uci->mc->hdr.date); - return; + return err; } -static int do_microcode_update (void) +static long do_microcode_update(void *_info) { - int i, error; + struct microcode_info *info = _info; + int error; - if (on_each_cpu(collect_cpu_info, NULL, 1, 1) != 0) { - printk(KERN_ERR "microcode: Error! Could not run on all processors\n"); - error = -EIO; - goto out; - } + BUG_ON(info->cpu != smp_processor_id()); - if ((error = find_matching_ucodes())) { - printk(KERN_ERR "microcode: Error in the microcode data\n"); - goto out_free; - } + error = microcode_update_cpu(info->buffer, info->buffer_size); + if ( error ) + info->error = error; - if (on_each_cpu(do_update_one, NULL, 1, 1) != 0) { - printk(KERN_ERR "microcode: Error! Could not run on all processors\n"); - error = -EIO; - } + info->cpu = next_cpu(info->cpu, cpu_online_map); + if ( info->cpu < NR_CPUS ) + return continue_hypercall_on_cpu(info->cpu, do_microcode_update, info); -out_free: - for_each_online_cpu(i) { - if (ucode_cpu_info[i].mc) { - int j; - void *tmp = ucode_cpu_info[i].mc; - vfree(tmp); - for_each_online_cpu(j) { - if (ucode_cpu_info[j].mc == tmp) - ucode_cpu_info[j].mc = NULL; - } - } - if (ucode_cpu_info[i].err == MC_IGNORED && verbose) - printk(KERN_WARNING "microcode: CPU%d not 'upgrading' to earlier revision" - " 0x%x (current=0x%x)\n", i, ucode_cpu_info[i].cksum, ucode_cpu_info[i].rev); - } -out: - return error; + error = info->error; + xfree(info); + return error; } -int microcode_update(XEN_GUEST_HANDLE(void) buf, unsigned long len) +int microcode_update(XEN_GUEST_HANDLE(const_void) buf, unsigned long len) { - int ret; + int ret; + struct microcode_info *info; - if (len != (typeof(user_buffer_size))len) { - printk(KERN_ERR "microcode: too much data\n"); - return -E2BIG; - } + if ( len != (uint32_t)len ) + return -E2BIG; - mutex_lock(µcode_mutex); + if ( microcode_ops == NULL ) + return -EINVAL; - user_buffer = buf.p; - user_buffer_size = len; + info = xmalloc_bytes(sizeof(*info) + len); + if ( info == NULL ) + return -ENOMEM; - ret = do_microcode_update(); + ret = copy_from_guest(info->buffer, buf, len); + if ( ret != 0 ) + { + xfree(info); + return ret; + } - mutex_unlock(µcode_mutex); + info->buffer_size = len; + info->error = 0; + info->cpu = first_cpu(cpu_online_map); - return ret; + return continue_hypercall_on_cpu(info->cpu, do_microcode_update, info); } diff -r 3155a367b476 xen/arch/x86/platform_hypercall.c --- a/xen/arch/x86/platform_hypercall.c Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/arch/x86/platform_hypercall.c Fri Jan 30 14:03:52 2009 +0100 @@ -147,8 +147,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe case XENPF_microcode_update: { - extern int microcode_update(XEN_GUEST_HANDLE(void), unsigned long len); - XEN_GUEST_HANDLE(void) data; + XEN_GUEST_HANDLE(const_void) data; ret = xsm_microcode(); if ( ret ) diff -r 3155a367b476 xen/common/schedule.c --- a/xen/common/schedule.c Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/common/schedule.c Fri Jan 30 14:03:52 2009 +0100 @@ -295,6 +295,11 @@ int vcpu_lock_affinity(struct vcpu *v, c int vcpu_lock_affinity(struct vcpu *v, cpumask_t *affinity) { return __vcpu_set_affinity(v, affinity, 0, 1); +} + +int vcpu_locked_change_affinity(struct vcpu *v, cpumask_t *affinity) +{ + return __vcpu_set_affinity(v, affinity, 1, 1); } void vcpu_unlock_affinity(struct vcpu *v, cpumask_t *affinity) diff -r 3155a367b476 xen/include/asm-x86/msr-index.h --- a/xen/include/asm-x86/msr-index.h Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/include/asm-x86/msr-index.h Fri Jan 30 14:03:52 2009 +0100 @@ -211,6 +211,10 @@ #define FAM10H_MMIO_CONF_BASE_MASK 0xfffffff #define FAM10H_MMIO_CONF_BASE_SHIFT 20 +/* AMD Microcode MSRs */ +#define MSR_AMD_PATCHLEVEL 0x0000008b +#define MSR_AMD_PATCHLOADER 0xc0010020 + /* K6 MSRs */ #define MSR_K6_EFER 0xc0000080 #define MSR_K6_STAR 0xc0000081 diff -r 3155a367b476 xen/include/asm-x86/processor.h --- a/xen/include/asm-x86/processor.h Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/include/asm-x86/processor.h Fri Jan 30 14:03:52 2009 +0100 @@ -486,41 +486,6 @@ long set_gdt(struct vcpu *d, }) long set_debugreg(struct vcpu *p, int reg, unsigned long value); -struct microcode_header { - unsigned int hdrver; - unsigned int rev; - unsigned int date; - unsigned int sig; - unsigned int cksum; - unsigned int ldrver; - unsigned int pf; - unsigned int datasize; - unsigned int totalsize; - unsigned int reserved[3]; -}; - -struct microcode { - struct microcode_header hdr; - unsigned int bits[0]; -}; - -typedef struct microcode microcode_t; -typedef struct microcode_header microcode_header_t; - -/* microcode format is extended from prescott processors */ -struct extended_signature { - unsigned int sig; - unsigned int pf; - unsigned int cksum; -}; - -struct extended_sigtable { - unsigned int count; - unsigned int cksum; - unsigned int reserved[3]; - struct extended_signature sigs[0]; -}; - /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ static always_inline void rep_nop(void) { @@ -583,6 +548,8 @@ int wrmsr_hypervisor_regs( int wrmsr_hypervisor_regs( uint32_t idx, uint32_t eax, uint32_t edx); +int microcode_update(XEN_GUEST_HANDLE(const_void), unsigned long len); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_X86_PROCESSOR_H */ diff -r 3155a367b476 xen/include/public/platform.h --- a/xen/include/public/platform.h Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/include/public/platform.h Fri Jan 30 14:03:52 2009 +0100 @@ -97,7 +97,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_read_memty #define XENPF_microcode_update 35 struct xenpf_microcode_update { /* IN variables. */ - XEN_GUEST_HANDLE(void) data; /* Pointer to microcode data */ + XEN_GUEST_HANDLE(const_void) data;/* Pointer to microcode data */ uint32_t length; /* Length of microcode data. */ }; typedef struct xenpf_microcode_update xenpf_microcode_update_t; diff -r 3155a367b476 xen/include/xen/compat.h --- a/xen/include/xen/compat.h Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/include/xen/compat.h Fri Jan 30 14:03:52 2009 +0100 @@ -19,7 +19,9 @@ type *_[0] __attribute__((__packed__)); \ } __compat_handle_ ## name -#define DEFINE_COMPAT_HANDLE(name) __DEFINE_COMPAT_HANDLE(name, name) +#define DEFINE_COMPAT_HANDLE(name) \ + __DEFINE_COMPAT_HANDLE(name, name); \ + __DEFINE_COMPAT_HANDLE(const_ ## name, const name) #define COMPAT_HANDLE(name) __compat_handle_ ## name /* Is the compat handle a NULL reference? */ diff -r 3155a367b476 xen/include/xen/sched.h --- a/xen/include/xen/sched.h Tue Jan 27 16:06:29 2009 +0000 +++ b/xen/include/xen/sched.h Fri Jan 30 14:03:52 2009 +0100 @@ -526,6 +526,7 @@ void vcpu_force_reschedule(struct vcpu * void vcpu_force_reschedule(struct vcpu *v); int vcpu_set_affinity(struct vcpu *v, cpumask_t *affinity); int vcpu_lock_affinity(struct vcpu *v, cpumask_t *affinity); +int vcpu_locked_change_affinity(struct vcpu *v, cpumask_t *affinity); void vcpu_unlock_affinity(struct vcpu *v, cpumask_t *affinity); void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate);