Commit 5c584dd5 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner

ia64/topology: Convert to hotplug state machine

Install the callbacks via the state machine and let the core invoke
the callbacks on the already online CPUs.
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: kbuild test robot <lkp@intel.com>
Cc: rt@linutronix.de
Cc: kbuild-all@01.org
Link: http://lkml.kernel.org/r/20161103173353.dudhkpioitghd74x@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent aa17662b
...@@ -349,9 +349,9 @@ static int cpu_cache_sysfs_init(unsigned int cpu) ...@@ -349,9 +349,9 @@ static int cpu_cache_sysfs_init(unsigned int cpu)
} }
/* Add cache interface for CPU device */ /* Add cache interface for CPU device */
static int cache_add_dev(struct device *sys_dev) static int cache_add_dev(unsigned int cpu)
{ {
unsigned int cpu = sys_dev->id; struct device *sys_dev = get_cpu_device(cpu);
unsigned long i, j; unsigned long i, j;
struct cache_info *this_object; struct cache_info *this_object;
int retval = 0; int retval = 0;
...@@ -399,9 +399,8 @@ static int cache_add_dev(struct device *sys_dev) ...@@ -399,9 +399,8 @@ static int cache_add_dev(struct device *sys_dev)
} }
/* Remove cache interface for CPU device */ /* Remove cache interface for CPU device */
static int cache_remove_dev(struct device *sys_dev) static int cache_remove_dev(unsigned int cpu)
{ {
unsigned int cpu = sys_dev->id;
unsigned long i; unsigned long i;
for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++)
...@@ -419,52 +418,13 @@ static int cache_remove_dev(struct device *sys_dev) ...@@ -419,52 +418,13 @@ static int cache_remove_dev(struct device *sys_dev)
return 0; return 0;
} }
/*
* When a cpu is hot-plugged, do a check and initiate
* cache kobject if necessary
*/
static int cache_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
struct device *sys_dev;
sys_dev = get_cpu_device(cpu);
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
cache_add_dev(sys_dev);
break;
case CPU_DEAD:
case CPU_DEAD_FROZEN:
cache_remove_dev(sys_dev);
break;
}
return NOTIFY_OK;
}
static struct notifier_block cache_cpu_notifier =
{
.notifier_call = cache_cpu_callback
};
static int __init cache_sysfs_init(void) static int __init cache_sysfs_init(void)
{ {
int i; int ret;
cpu_notifier_register_begin();
for_each_online_cpu(i) {
struct device *sys_dev = get_cpu_device((unsigned int)i);
cache_add_dev(sys_dev);
}
__register_hotcpu_notifier(&cache_cpu_notifier);
cpu_notifier_register_done();
ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "ia64/topology:online",
cache_add_dev, cache_remove_dev);
WARN_ON(ret < 0);
return 0; return 0;
} }
device_initcall(cache_sysfs_init); device_initcall(cache_sysfs_init);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment