Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 312301
b: refs/heads/master
c: 3d8986b
h: refs/heads/master
i:
  312299: dba081e
v: v3
  • Loading branch information
Borislav Petkov authored and H. Peter Anvin committed Jul 1, 2012
1 parent e7fd19b commit d2ae591
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c9fc3f778a6a215ace14ee556067c73982b6d40f
refs/heads/master: 3d8986bc7f309483ee09c7a02888bab09072c19b
36 changes: 28 additions & 8 deletions trunk/arch/x86/kernel/microcode_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,6 @@ static ssize_t reload_store(struct device *dev,
int cpu;
ssize_t ret = 0, tmp_ret;

/* allow reload only from the BSP */
if (boot_cpu_data.cpu_index != dev->id)
return -EINVAL;

ret = kstrtoul(buf, 0, &val);
if (ret)
return ret;
Expand Down Expand Up @@ -351,7 +347,6 @@ static DEVICE_ATTR(version, 0400, version_show, NULL);
static DEVICE_ATTR(processor_flags, 0400, pf_show, NULL);

static struct attribute *mc_default_attrs[] = {
&dev_attr_reload.attr,
&dev_attr_version.attr,
&dev_attr_processor_flags.attr,
NULL
Expand Down Expand Up @@ -528,6 +523,16 @@ static const struct x86_cpu_id microcode_id[] = {
MODULE_DEVICE_TABLE(x86cpu, microcode_id);
#endif

static struct attribute *cpu_root_microcode_attrs[] = {
&dev_attr_reload.attr,
NULL
};

static struct attribute_group cpu_root_microcode_group = {
.name = "microcode",
.attrs = cpu_root_microcode_attrs,
};

static int __init microcode_init(void)
{
struct cpuinfo_x86 *c = &cpu_data(0);
Expand Down Expand Up @@ -559,9 +564,17 @@ static int __init microcode_init(void)
if (error)
goto out_pdev;

error = sysfs_create_group(&cpu_subsys.dev_root->kobj,
&cpu_root_microcode_group);

if (error) {
pr_err("Error creating microcode group!\n");
goto out_driver;
}

error = microcode_dev_init();
if (error)
goto out_driver;
goto out_ucode_group;

register_syscore_ops(&mc_syscore_ops);
register_hotcpu_notifier(&mc_cpu_notifier);
Expand All @@ -571,7 +584,11 @@ static int __init microcode_init(void)

return 0;

out_driver:
out_ucode_group:
sysfs_remove_group(&cpu_subsys.dev_root->kobj,
&cpu_root_microcode_group);

out_driver:
get_online_cpus();
mutex_lock(&microcode_mutex);

Expand All @@ -580,7 +597,7 @@ static int __init microcode_init(void)
mutex_unlock(&microcode_mutex);
put_online_cpus();

out_pdev:
out_pdev:
platform_device_unregister(microcode_pdev);
return error;

Expand All @@ -596,6 +613,9 @@ static void __exit microcode_exit(void)
unregister_hotcpu_notifier(&mc_cpu_notifier);
unregister_syscore_ops(&mc_syscore_ops);

sysfs_remove_group(&cpu_subsys.dev_root->kobj,
&cpu_root_microcode_group);

get_online_cpus();
mutex_lock(&microcode_mutex);

Expand Down

0 comments on commit d2ae591

Please sign in to comment.