Commit 75630098 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of...

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/amd-iommu: Fix PCI hotplug with passthrough mode
  x86/amd-iommu: Fix passthrough mode
  x86: mmio-mod.c: Use pr_fmt
  x86: kmmio.c: Add and use pr_fmt(fmt)
  x86: i8254.c: Add pr_fmt(fmt)
  x86: setup_percpu.c: Use pr_<level> and add pr_fmt(fmt)
  x86: es7000_32.c: Use pr_<level> and add pr_fmt(fmt)
  x86: Print DMI_BOARD_NAME as well as DMI_PRODUCT_NAME from __show_regs()
  x86: Factor duplicated code out of __show_regs() into show_regs_common()
  arch/x86/kernel/microcode*: Use pr_fmt() and remove duplicated KERN_ERR prefix
  x86, mce: fix confusion between bank attributes and mce attributes
  x86/mce: Set up timer unconditionally
  x86: Fix bogus warning in apic_noop.apic_write()
  x86: Fix typo in arch/x86/mm/kmmio.c
  x86: ASUS P4S800 reboot=bios quirk
parents df7147b3 9cf78267
...@@ -28,7 +28,9 @@ extern void amd_iommu_flush_all_domains(void); ...@@ -28,7 +28,9 @@ extern void amd_iommu_flush_all_domains(void);
extern void amd_iommu_flush_all_devices(void); extern void amd_iommu_flush_all_devices(void);
extern void amd_iommu_apply_erratum_63(u16 devid); extern void amd_iommu_apply_erratum_63(u16 devid);
extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu); extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);
extern int amd_iommu_init_devices(void);
extern void amd_iommu_uninit_devices(void);
extern void amd_iommu_init_notifier(void);
#ifndef CONFIG_AMD_IOMMU_STATS #ifndef CONFIG_AMD_IOMMU_STATS
static inline void amd_iommu_stats_init(void) { } static inline void amd_iommu_stats_init(void) { }
......
...@@ -23,6 +23,7 @@ struct task_struct *__switch_to(struct task_struct *prev, ...@@ -23,6 +23,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
struct tss_struct; struct tss_struct;
void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p, void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,
struct tss_struct *tss); struct tss_struct *tss);
extern void show_regs_common(void);
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
......
...@@ -166,6 +166,43 @@ static void iommu_uninit_device(struct device *dev) ...@@ -166,6 +166,43 @@ static void iommu_uninit_device(struct device *dev)
{ {
kfree(dev->archdata.iommu); kfree(dev->archdata.iommu);
} }
void __init amd_iommu_uninit_devices(void)
{
struct pci_dev *pdev = NULL;
for_each_pci_dev(pdev) {
if (!check_device(&pdev->dev))
continue;
iommu_uninit_device(&pdev->dev);
}
}
int __init amd_iommu_init_devices(void)
{
struct pci_dev *pdev = NULL;
int ret = 0;
for_each_pci_dev(pdev) {
if (!check_device(&pdev->dev))
continue;
ret = iommu_init_device(&pdev->dev);
if (ret)
goto out_free;
}
return 0;
out_free:
amd_iommu_uninit_devices();
return ret;
}
#ifdef CONFIG_AMD_IOMMU_STATS #ifdef CONFIG_AMD_IOMMU_STATS
/* /*
...@@ -1587,6 +1624,11 @@ static struct notifier_block device_nb = { ...@@ -1587,6 +1624,11 @@ static struct notifier_block device_nb = {
.notifier_call = device_change_notifier, .notifier_call = device_change_notifier,
}; };
void amd_iommu_init_notifier(void)
{
bus_register_notifier(&pci_bus_type, &device_nb);
}
/***************************************************************************** /*****************************************************************************
* *
* The next functions belong to the dma_ops mapping/unmapping code. * The next functions belong to the dma_ops mapping/unmapping code.
...@@ -2145,8 +2187,6 @@ static void prealloc_protection_domains(void) ...@@ -2145,8 +2187,6 @@ static void prealloc_protection_domains(void)
if (!check_device(&dev->dev)) if (!check_device(&dev->dev))
continue; continue;
iommu_init_device(&dev->dev);
/* Is there already any domain for it? */ /* Is there already any domain for it? */
if (domain_for_device(&dev->dev)) if (domain_for_device(&dev->dev))
continue; continue;
...@@ -2215,8 +2255,6 @@ int __init amd_iommu_init_dma_ops(void) ...@@ -2215,8 +2255,6 @@ int __init amd_iommu_init_dma_ops(void)
register_iommu(&amd_iommu_ops); register_iommu(&amd_iommu_ops);
bus_register_notifier(&pci_bus_type, &device_nb);
amd_iommu_stats_init(); amd_iommu_stats_init();
return 0; return 0;
......
...@@ -1274,6 +1274,10 @@ static int __init amd_iommu_init(void) ...@@ -1274,6 +1274,10 @@ static int __init amd_iommu_init(void)
if (ret) if (ret)
goto free; goto free;
ret = amd_iommu_init_devices();
if (ret)
goto free;
if (iommu_pass_through) if (iommu_pass_through)
ret = amd_iommu_init_passthrough(); ret = amd_iommu_init_passthrough();
else else
...@@ -1281,6 +1285,8 @@ static int __init amd_iommu_init(void) ...@@ -1281,6 +1285,8 @@ static int __init amd_iommu_init(void)
if (ret) if (ret)
goto free; goto free;
amd_iommu_init_notifier();
enable_iommus(); enable_iommus();
if (iommu_pass_through) if (iommu_pass_through)
...@@ -1296,6 +1302,9 @@ out: ...@@ -1296,6 +1302,9 @@ out:
return ret; return ret;
free: free:
amd_iommu_uninit_devices();
free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,
get_order(MAX_DOMAIN_ID/8)); get_order(MAX_DOMAIN_ID/8));
......
...@@ -127,7 +127,7 @@ static u32 noop_apic_read(u32 reg) ...@@ -127,7 +127,7 @@ static u32 noop_apic_read(u32 reg)
static void noop_apic_write(u32 reg, u32 v) static void noop_apic_write(u32 reg, u32 v)
{ {
WARN_ON_ONCE((cpu_has_apic || !disable_apic)); WARN_ON_ONCE(cpu_has_apic && !disable_apic);
} }
struct apic apic_noop = { struct apic apic_noop = {
......
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
* *
* http://www.unisys.com * http://www.unisys.com
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
...@@ -223,9 +226,9 @@ static int parse_unisys_oem(char *oemptr) ...@@ -223,9 +226,9 @@ static int parse_unisys_oem(char *oemptr)
mip_addr = val; mip_addr = val;
mip = (struct mip_reg *)val; mip = (struct mip_reg *)val;
mip_reg = __va(mip); mip_reg = __va(mip);
pr_debug("es7000_mipcfg: host_reg = 0x%lx \n", pr_debug("host_reg = 0x%lx\n",
(unsigned long)host_reg); (unsigned long)host_reg);
pr_debug("es7000_mipcfg: mip_reg = 0x%lx \n", pr_debug("mip_reg = 0x%lx\n",
(unsigned long)mip_reg); (unsigned long)mip_reg);
success++; success++;
break; break;
...@@ -401,7 +404,7 @@ static void es7000_enable_apic_mode(void) ...@@ -401,7 +404,7 @@ static void es7000_enable_apic_mode(void)
if (!es7000_plat) if (!es7000_plat)
return; return;
printk(KERN_INFO "ES7000: Enabling APIC mode.\n"); pr_info("Enabling APIC mode.\n");
memset(&es7000_mip_reg, 0, sizeof(struct mip_reg)); memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
es7000_mip_reg.off_0x00 = MIP_SW_APIC; es7000_mip_reg.off_0x00 = MIP_SW_APIC;
es7000_mip_reg.off_0x38 = MIP_VALID; es7000_mip_reg.off_0x38 = MIP_VALID;
...@@ -514,8 +517,7 @@ static void es7000_setup_apic_routing(void) ...@@ -514,8 +517,7 @@ static void es7000_setup_apic_routing(void)
{ {
int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id()); int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id());
printk(KERN_INFO pr_info("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
"Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
(apic_version[apic] == 0x14) ? (apic_version[apic] == 0x14) ?
"Physical Cluster" : "Logical Cluster", "Physical Cluster" : "Logical Cluster",
nr_ioapics, cpumask_bits(es7000_target_cpus())[0]); nr_ioapics, cpumask_bits(es7000_target_cpus())[0]);
......
...@@ -1388,13 +1388,14 @@ static void __mcheck_cpu_init_timer(void) ...@@ -1388,13 +1388,14 @@ static void __mcheck_cpu_init_timer(void)
struct timer_list *t = &__get_cpu_var(mce_timer); struct timer_list *t = &__get_cpu_var(mce_timer);
int *n = &__get_cpu_var(mce_next_interval); int *n = &__get_cpu_var(mce_next_interval);
setup_timer(t, mce_start_timer, smp_processor_id());
if (mce_ignore_ce) if (mce_ignore_ce)
return; return;
*n = check_interval * HZ; *n = check_interval * HZ;
if (!*n) if (!*n)
return; return;
setup_timer(t, mce_start_timer, smp_processor_id());
t->expires = round_jiffies(jiffies + *n); t->expires = round_jiffies(jiffies + *n);
add_timer_on(t, smp_processor_id()); add_timer_on(t, smp_processor_id());
} }
...@@ -1928,7 +1929,7 @@ error2: ...@@ -1928,7 +1929,7 @@ error2:
sysdev_remove_file(&per_cpu(mce_dev, cpu), &mce_banks[j].attr); sysdev_remove_file(&per_cpu(mce_dev, cpu), &mce_banks[j].attr);
error: error:
while (--i >= 0) while (--i >= 0)
sysdev_remove_file(&per_cpu(mce_dev, cpu), &mce_banks[i].attr); sysdev_remove_file(&per_cpu(mce_dev, cpu), mce_attrs[i]);
sysdev_unregister(&per_cpu(mce_dev, cpu)); sysdev_unregister(&per_cpu(mce_dev, cpu));
......
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
* Licensed under the terms of the GNU General Public * Licensed under the terms of the GNU General Public
* License version 2. See file COPYING for details. * License version 2. See file COPYING for details.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
...@@ -81,7 +84,7 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig) ...@@ -81,7 +84,7 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
memset(csig, 0, sizeof(*csig)); memset(csig, 0, sizeof(*csig));
rdmsr(MSR_AMD64_PATCH_LEVEL, csig->rev, dummy); rdmsr(MSR_AMD64_PATCH_LEVEL, csig->rev, dummy);
pr_info("microcode: CPU%d: patch_level=0x%x\n", cpu, csig->rev); pr_info("CPU%d: patch_level=0x%x\n", cpu, csig->rev);
return 0; return 0;
} }
...@@ -111,8 +114,8 @@ static int get_matching_microcode(int cpu, void *mc, int rev) ...@@ -111,8 +114,8 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
/* ucode might be chipset specific -- currently we don't support this */ /* ucode might be chipset specific -- currently we don't support this */
if (mc_header->nb_dev_id || mc_header->sb_dev_id) { if (mc_header->nb_dev_id || mc_header->sb_dev_id) {
pr_err(KERN_ERR "microcode: CPU%d: loading of chipset " pr_err("CPU%d: loading of chipset specific code not yet supported\n",
"specific code not yet supported\n", cpu); cpu);
return 0; return 0;
} }
...@@ -141,12 +144,12 @@ static int apply_microcode_amd(int cpu) ...@@ -141,12 +144,12 @@ static int apply_microcode_amd(int cpu)
/* check current patch id and patch's id for match */ /* check current patch id and patch's id for match */
if (rev != mc_amd->hdr.patch_id) { if (rev != mc_amd->hdr.patch_id) {
pr_err("microcode: CPU%d: update failed " pr_err("CPU%d: update failed (for patch_level=0x%x)\n",
"(for patch_level=0x%x)\n", cpu, mc_amd->hdr.patch_id); cpu, mc_amd->hdr.patch_id);
return -1; return -1;
} }
pr_info("microcode: CPU%d: updated (new patch_level=0x%x)\n", cpu, rev); pr_info("CPU%d: updated (new patch_level=0x%x)\n", cpu, rev);
uci->cpu_sig.rev = rev; uci->cpu_sig.rev = rev;
return 0; return 0;
...@@ -169,15 +172,14 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size) ...@@ -169,15 +172,14 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
return NULL; return NULL;
if (section_hdr[0] != UCODE_UCODE_TYPE) { if (section_hdr[0] != UCODE_UCODE_TYPE) {
pr_err("microcode: error: invalid type field in " pr_err("error: invalid type field in container file section header\n");
"container file section header\n");
return NULL; return NULL;
} }
total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8)); total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8));
if (total_size > size || total_size > UCODE_MAX_SIZE) { if (total_size > size || total_size > UCODE_MAX_SIZE) {
pr_err("microcode: error: size mismatch\n"); pr_err("error: size mismatch\n");
return NULL; return NULL;
} }
...@@ -206,14 +208,13 @@ static int install_equiv_cpu_table(const u8 *buf) ...@@ -206,14 +208,13 @@ static int install_equiv_cpu_table(const u8 *buf)
size = buf_pos[2]; size = buf_pos[2];
if (buf_pos[1] != UCODE_EQUIV_CPU_TABLE_TYPE || !size) { if (buf_pos[1] != UCODE_EQUIV_CPU_TABLE_TYPE || !size) {
pr_err("microcode: error: invalid type field in " pr_err("error: invalid type field in container file section header\n");
"container file section header\n");
return 0; return 0;
} }
equiv_cpu_table = (struct equiv_cpu_entry *) vmalloc(size); equiv_cpu_table = (struct equiv_cpu_entry *) vmalloc(size);
if (!equiv_cpu_table) { if (!equiv_cpu_table) {
pr_err("microcode: failed to allocate equivalent CPU table\n"); pr_err("failed to allocate equivalent CPU table\n");
return 0; return 0;
} }
...@@ -246,7 +247,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size) ...@@ -246,7 +247,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)
offset = install_equiv_cpu_table(ucode_ptr); offset = install_equiv_cpu_table(ucode_ptr);
if (!offset) { if (!offset) {
pr_err("microcode: failed to create equivalent cpu table\n"); pr_err("failed to create equivalent cpu table\n");
return UCODE_ERROR; return UCODE_ERROR;
} }
...@@ -277,8 +278,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size) ...@@ -277,8 +278,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)
if (!leftover) { if (!leftover) {
vfree(uci->mc); vfree(uci->mc);
uci->mc = new_mc; uci->mc = new_mc;
pr_debug("microcode: CPU%d found a matching microcode " pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n",
"update with version 0x%x (current=0x%x)\n",
cpu, new_rev, uci->cpu_sig.rev); cpu, new_rev, uci->cpu_sig.rev);
} else { } else {
vfree(new_mc); vfree(new_mc);
...@@ -300,7 +300,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device) ...@@ -300,7 +300,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
return UCODE_NFOUND; return UCODE_NFOUND;
if (*(u32 *)firmware->data != UCODE_MAGIC) { if (*(u32 *)firmware->data != UCODE_MAGIC) {
pr_err("microcode: invalid UCODE_MAGIC (0x%08x)\n", pr_err("invalid UCODE_MAGIC (0x%08x)\n",
*(u32 *)firmware->data); *(u32 *)firmware->data);
return UCODE_ERROR; return UCODE_ERROR;
} }
...@@ -313,8 +313,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device) ...@@ -313,8 +313,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
static enum ucode_state static enum ucode_state
request_microcode_user(int cpu, const void __user *buf, size_t size) request_microcode_user(int cpu, const void __user *buf, size_t size)
{ {
pr_info("microcode: AMD microcode update via " pr_info("AMD microcode update via /dev/cpu/microcode not supported\n");
"/dev/cpu/microcode not supported\n");
return UCODE_ERROR; return UCODE_ERROR;
} }
...@@ -334,14 +333,13 @@ void init_microcode_amd(struct device *device) ...@@ -334,14 +333,13 @@ void init_microcode_amd(struct device *device)
WARN_ON(c->x86_vendor != X86_VENDOR_AMD); WARN_ON(c->x86_vendor != X86_VENDOR_AMD);
if (c->x86 < 0x10) { if (c->x86 < 0x10) {
pr_warning("microcode: AMD CPU family 0x%x not supported\n", pr_warning("AMD CPU family 0x%x not supported\n", c->x86);
c->x86);
return; return;
} }
supported_cpu = 1; supported_cpu = 1;
if (request_firmware(&firmware, fw_name, device)) if (request_firmware(&firmware, fw_name, device))
pr_err("microcode: failed to load file %s\n", fw_name); pr_err("failed to load file %s\n", fw_name);
} }
void fini_microcode_amd(void) void fini_microcode_amd(void)
......
...@@ -70,6 +70,9 @@ ...@@ -70,6 +70,9 @@
* Fix sigmatch() macro to handle old CPUs with pf == 0. * Fix sigmatch() macro to handle old CPUs with pf == 0.
* Thanks to Stuart Swales for pointing out this bug. * Thanks to Stuart Swales for pointing out this bug.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/capability.h> #include <linux/capability.h>
...@@ -209,7 +212,7 @@ static ssize_t microcode_write(struct file *file, const char __user *buf, ...@@ -209,7 +212,7 @@ static ssize_t microcode_write(struct file *file, const char __user *buf,
ssize_t ret = -EINVAL; ssize_t ret = -EINVAL;
if ((len >> PAGE_SHIFT) > totalram_pages) { if ((len >> PAGE_SHIFT) > totalram_pages) {
pr_err("microcode: too much data (max %ld pages)\n", totalram_pages); pr_err("too much data (max %ld pages)\n", totalram_pages);
return ret; return ret;
} }
...@@ -244,7 +247,7 @@ static int __init microcode_dev_init(void) ...@@ -244,7 +247,7 @@ static int __init microcode_dev_init(void)
error = misc_register(&microcode_dev); error = misc_register(&microcode_dev);
if (error) { if (error) {
pr_err("microcode: can't misc_register on minor=%d\n", MICROCODE_MINOR); pr_err("can't misc_register on minor=%d\n", MICROCODE_MINOR);
return error; return error;
} }
...@@ -359,7 +362,7 @@ static enum ucode_state microcode_resume_cpu(int cpu) ...@@ -359,7 +362,7 @@ static enum ucode_state microcode_resume_cpu(int cpu)
if (!uci->mc) if (!uci->mc)
return UCODE_NFOUND; return UCODE_NFOUND;
pr_debug("microcode: CPU%d updated upon resume\n", cpu); pr_debug("CPU%d updated upon resume\n", cpu);
apply_microcode_on_target(cpu); apply_microcode_on_target(cpu);
return UCODE_OK; return UCODE_OK;
...@@ -379,7 +382,7 @@ static enum ucode_state microcode_init_cpu(int cpu) ...@@ -379,7 +382,7 @@ static enum ucode_state microcode_init_cpu(int cpu)
ustate = microcode_ops->request_microcode_fw(cpu, &microcode_pdev->dev); ustate = microcode_ops->request_microcode_fw(cpu, &microcode_pdev->dev);
if (ustate == UCODE_OK) { if (ustate == UCODE_OK) {
pr_debug("microcode: CPU%d updated upon init\n", cpu); pr_debug("CPU%d updated upon init\n", cpu);
apply_microcode_on_target(cpu); apply_microcode_on_target(cpu);
} }
...@@ -406,7 +409,7 @@ static int mc_sysdev_add(struct sys_device *sys_dev) ...@@ -406,7 +409,7 @@ static int mc_sysdev_add(struct sys_device *sys_dev)
if (!cpu_online(cpu)) if (!cpu_online(cpu))
return 0; return 0;
pr_debug("microcode: CPU%d added\n", cpu); pr_debug("CPU%d added\n", cpu);
err = sysfs_create_group(&sys_dev->kobj, &mc_attr_group); err = sysfs_create_group(&sys_dev->kobj, &mc_attr_group);
if (err) if (err)
...@@ -425,7 +428,7 @@ static int mc_sysdev_remove(struct sys_device *sys_dev) ...@@ -425,7 +428,7 @@ static int mc_sysdev_remove(struct sys_device *sys_dev)
if (!cpu_online(cpu)) if (!cpu_online(cpu))
return 0; return 0;
pr_debug("microcode: CPU%d removed\n", cpu); pr_debug("CPU%d removed\n", cpu);
microcode_fini_cpu(cpu); microcode_fini_cpu(cpu);
sysfs_remove_group(&sys_dev->kobj, &mc_attr_group); sysfs_remove_group(&sys_dev->kobj, &mc_attr_group);
return 0; return 0;
...@@ -473,15 +476,15 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu) ...@@ -473,15 +476,15 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
microcode_update_cpu(cpu); microcode_update_cpu(cpu);
case CPU_DOWN_FAILED: case CPU_DOWN_FAILED:
case CPU_DOWN_FAILED_FROZEN: case CPU_DOWN_FAILED_FROZEN:
pr_debug("microcode: CPU%d added\n", cpu); pr_debug("CPU%d added\n", cpu);
if (sysfs_create_group(&sys_dev->kobj, &mc_attr_group)) if (sysfs_create_group(&sys_dev->kobj, &mc_attr_group))
pr_err("microcode: Failed to create group for CPU%d\n", cpu); pr_err("Failed to create group for CPU%d\n", cpu);
break; break;
case CPU_DOWN_PREPARE: case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE_FROZEN: case CPU_DOWN_PREPARE_FROZEN:
/* Suspend is in progress, only remove the interface */ /* Suspend is in progress, only remove the interface */
sysfs_remove_group(&sys_dev->kobj, &mc_attr_group); sysfs_remove_group(&sys_dev->kobj, &mc_attr_group);
pr_debug("microcode: CPU%d removed\n", cpu); pr_debug("CPU%d removed\n", cpu);
break; break;
case CPU_DEAD: case CPU_DEAD:
case CPU_UP_CANCELED_FROZEN: case CPU_UP_CANCELED_FROZEN:
...@@ -507,7 +510,7 @@ static int __init microcode_init(void) ...@@ -507,7 +510,7 @@ static int __init microcode_init(void)
microcode_ops = init_amd_microcode(); microcode_ops = init_amd_microcode();
if (!microcode_ops) { if (!microcode_ops) {
pr_err("microcode: no support for this CPU vendor\n"); pr_err("no support for this CPU vendor\n");
return -ENODEV; return -ENODEV;
} }
...@@ -541,8 +544,7 @@ static int __init microcode_init(void) ...@@ -541,8 +544,7 @@ static int __init microcode_init(void)
register_hotcpu_notifier(&mc_cpu_notifier); register_hotcpu_notifier(&mc_cpu_notifier);
pr_info("Microcode Update Driver: v" MICROCODE_VERSION pr_info("Microcode Update Driver: v" MICROCODE_VERSION
" <tigran@aivazian.fsnet.co.uk>," " <tigran@aivazian.fsnet.co.uk>, Peter Oruba\n");
" Peter Oruba\n");