renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00
Code

powerpc/pseries: Factor out common cpu hotplug code

Browse Source 
Re-factor the cpu hotplug code to support doing cpu hotplug completely in
the kernel and using the existing sysfs probe/release interfaces. This
patch pulls out pieces of existing cpu hotplug code into common routines,
dlpar_cpu_add() and dlpar_cpu_remove(), to be used by both interfaces.
There are no functional changes introduced.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nathan Fontenot 2015-12-16 14:51:26 -06:00 committed by Michael Ellerman
parent 183deeea58
commit d98389f375
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
arch/powerpc/platforms/pseries/hotplug-cpu.c
View File

@ -335,8 +335,6 @@ static void pseries_remove_processor(struct device_node *np)
cpu_maps_update_done(); cpu_maps_update_done();
} }
#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
static int dlpar_online_cpu(struct device_node *dn) static int dlpar_online_cpu(struct device_node *dn)
{ {
int rc = 0; int rc = 0;
@ -404,16 +402,11 @@ static bool dlpar_cpu_exists(struct device_node *parent, u32 drc_index)
return found; return found;
} }
static ssize_t dlpar_cpu_probe(const char *buf, size_t count) static ssize_t dlpar_cpu_add(u32 drc_index)
{ {
struct device_node *dn, *parent; struct device_node *dn, *parent;
u32 drc_index;
int rc; int rc;
rc = kstrtou32(buf, 0, &drc_index);
if (rc)
return -EINVAL;
parent = of_find_node_by_path("/cpus"); parent = of_find_node_by_path("/cpus");
if (!parent) if (!parent)
return -ENODEV; return -ENODEV;
@ -444,10 +437,7 @@ static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
} }
rc = dlpar_online_cpu(dn); rc = dlpar_online_cpu(dn);
if (rc) return rc;
return rc;
return count;
} }
static int dlpar_offline_cpu(struct device_node *dn) static int dlpar_offline_cpu(struct device_node *dn)
@ -506,6 +496,41 @@ out:
} }
static ssize_t dlpar_cpu_remove(struct device_node *dn, u32 drc_index)
{
int rc;
rc = dlpar_offline_cpu(dn);
if (rc)
return -EINVAL;
rc = dlpar_release_drc(drc_index);
if (rc)
return rc;
rc = dlpar_detach_node(dn);
if (rc)
dlpar_acquire_drc(drc_index);
return rc;
}
#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
{
u32 drc_index;
int rc;
rc = kstrtou32(buf, 0, &drc_index);
if (rc)
return -EINVAL;
rc = dlpar_cpu_add(drc_index);
return rc ? rc : count;
}
static ssize_t dlpar_cpu_release(const char *buf, size_t count) static ssize_t dlpar_cpu_release(const char *buf, size_t count)
{ {
struct device_node *dn; struct device_node *dn;
@ -522,27 +547,10 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count)
return -EINVAL; return -EINVAL;
} }
rc = dlpar_offline_cpu(dn); rc = dlpar_cpu_remove(dn, drc_index);
if (rc) {
of_node_put(dn);
return -EINVAL;
}
rc = dlpar_release_drc(drc_index);
if (rc) {
of_node_put(dn);
return rc;
}
rc = dlpar_detach_node(dn);
if (rc) {
dlpar_acquire_drc(drc_index);
return rc;
}
of_node_put(dn); of_node_put(dn);
return count; return rc ? rc : count;
} }
#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */