forked from Minki/linux
d19d5efd8c
- Numerous minor fixes, cleanups etc. - More EEH work from Gavin to remove its dependency on device_nodes. - Memory hotplug implemented entirely in the kernel from Nathan Fontenot. - Removal of redundant CONFIG_PPC_OF by Kevin Hao. - Rewrite of VPHN parsing logic & tests from Greg Kurz. - A fix from Nish Aravamudan to reduce memory usage by clamping nodes_possible_map. - Support for pstore on powernv from Hari Bathini. - Removal of old powerpc specific byte swap routines by David Gibson. - Fix from Vasant Hegde to prevent the flash driver telling you it was flashing your firmware when it wasn't. - Patch from Ben Herrenschmidt to add an OPAL heartbeat driver. - Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan Stancek. - Some fixes for migration from Tyrel Datwyler. - A new syscall to switch the cpu endian by Michael Ellerman. - Large series from Wei Yang to implement SRIOV, reviewed and acked by Bjorn. - A fix for the OPAL sensor driver from Cédric Le Goater. - Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman. - Large series from Daniel Axtens to make our PCI hooks per PHB rather than per machine. - Small patch from Sam Bobroff to explicitly abort non-suspended transactions on syscalls, plus a test to exercise it. - Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu. - Small patch to enable the hard lockup detector from Anton Blanchard. - Fix from Dave Olson for missing L2 cache information on some CPUs. - Some fixes from Michael Ellerman to get Cell machines booting again. - Freescale updates from Scott: Highlights include BMan device tree nodes, an MSI erratum workaround, a couple minor performance improvements, config updates, and misc fixes/cleanup. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVL2cxAAoJEFHr6jzI4aWAR8cP/19VTo/CzCE4ffPSx7qR464n F+WFZcbNjIMXu6+B0YLuJZEsuWtKKrCit/MCg3+mSgE4iqvxmtI+HDD0445Buszj UD4E4HMdPrXQ+KUSUDORvRjv/FFUXIa94LSv/0g2UeMsPz/HeZlhMxEu7AkXw9Nf rTxsmRTsOWME85Y/c9ss7XHuWKXT3DJV7fOoK9roSaN3dJAuWTtG3WaKS0nUu0ok 0M81D6ZczoD6ybwh2DUMPD9K6SGxLdQ4OzQwtW6vWzcQIBDfy5Pdeo0iAFhGPvXf T4LLPkv4cF4AwHsAC4rKDPHQNa+oZBoLlScrHClaebAlDiv+XYKNdMogawUObvSh h7avKmQr0Ygp1OvvZAaXLhuDJI9FJJ8lf6AOIeULgHsDR9SyKMjZWxRzPe11uarO Fyi0qj3oJaQu6LjazZraApu8mo+JBtQuD3z3o5GhLxeFtBBF60JXj6zAXJikufnl kk1/BUF10nKUhtKcDX767AMUCtMH3fp5hx8K/z9T5v+pobJB26Wup1bbdT68pNBT NjdKUppV6QTjZvCsA6U2/ECu6E9KeIaFtFSL2IRRoiI0dWBN5/5eYn3RGkO2ZFoL 1NdwKA2XJcchwTPkpSRrUG70sYH0uM2AldNYyaLfjzrQqza7Y6lF699ilxWmCN/H OplzJAE5cQ8Am078veTW =03Yh -----END PGP SIGNATURE----- Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux Pull powerpc updates from Michael Ellerman: - Numerous minor fixes, cleanups etc. - More EEH work from Gavin to remove its dependency on device_nodes. - Memory hotplug implemented entirely in the kernel from Nathan Fontenot. - Removal of redundant CONFIG_PPC_OF by Kevin Hao. - Rewrite of VPHN parsing logic & tests from Greg Kurz. - A fix from Nish Aravamudan to reduce memory usage by clamping nodes_possible_map. - Support for pstore on powernv from Hari Bathini. - Removal of old powerpc specific byte swap routines by David Gibson. - Fix from Vasant Hegde to prevent the flash driver telling you it was flashing your firmware when it wasn't. - Patch from Ben Herrenschmidt to add an OPAL heartbeat driver. - Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan Stancek. - Some fixes for migration from Tyrel Datwyler. - A new syscall to switch the cpu endian by Michael Ellerman. - Large series from Wei Yang to implement SRIOV, reviewed and acked by Bjorn. - A fix for the OPAL sensor driver from Cédric Le Goater. - Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman. - Large series from Daniel Axtens to make our PCI hooks per PHB rather than per machine. - Small patch from Sam Bobroff to explicitly abort non-suspended transactions on syscalls, plus a test to exercise it. - Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu. - Small patch to enable the hard lockup detector from Anton Blanchard. - Fix from Dave Olson for missing L2 cache information on some CPUs. - Some fixes from Michael Ellerman to get Cell machines booting again. - Freescale updates from Scott: Highlights include BMan device tree nodes, an MSI erratum workaround, a couple minor performance improvements, config updates, and misc fixes/cleanup. * tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits) powerpc/powermac: Fix build error seen with powermac smp builds powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE powerpc: Remove PPC32 code from pseries specific find_and_init_phbs() powerpc/cell: Fix iommu breakage caused by controller_ops change powerpc/eeh: Fix crash in eeh_add_device_early() on Cell powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails powerpc/pseries: Correct memory hotplug locking powerpc: Fix missing L2 cache size in /sys/devices/system/cpu powerpc: Add ppc64 hard lockup detector support oprofile: Disable oprofile NMI timer on ppc64 powerpc/perf/hv-24x7: Add missing put_cpu_var() powerpc/perf/hv-24x7: Break up single_24x7_request powerpc/perf/hv-24x7: Define update_event_count() powerpc/perf/hv-24x7: Whitespace cleanup powerpc/perf/hv-24x7: Define add_event_to_24x7_request() powerpc/perf/hv-24x7: Rename hv_24x7_event_update powerpc/perf/hv-24x7: Move debug prints to separate function powerpc/perf/hv-24x7: Drop event_24x7_request() powerpc/perf/hv-24x7: Use pr_devel() to log message ... Conflicts: tools/testing/selftests/powerpc/Makefile tools/testing/selftests/powerpc/tm/Makefile
371 lines
8.0 KiB
C
371 lines
8.0 KiB
C
/*
|
|
* Support for Partition Mobility/Migration
|
|
*
|
|
* Copyright (C) 2010 Nathan Fontenot
|
|
* Copyright (C) 2010 IBM Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License version
|
|
* 2 as published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/kobject.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/completion.h>
|
|
#include <linux/device.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/machdep.h>
|
|
#include <asm/rtas.h>
|
|
#include "pseries.h"
|
|
|
|
static struct kobject *mobility_kobj;
|
|
|
|
struct update_props_workarea {
|
|
__be32 phandle;
|
|
__be32 state;
|
|
__be64 reserved;
|
|
__be32 nprops;
|
|
} __packed;
|
|
|
|
#define NODE_ACTION_MASK 0xff000000
|
|
#define NODE_COUNT_MASK 0x00ffffff
|
|
|
|
#define DELETE_DT_NODE 0x01000000
|
|
#define UPDATE_DT_NODE 0x02000000
|
|
#define ADD_DT_NODE 0x03000000
|
|
|
|
#define MIGRATION_SCOPE (1)
|
|
|
|
static int mobility_rtas_call(int token, char *buf, s32 scope)
|
|
{
|
|
int rc;
|
|
|
|
spin_lock(&rtas_data_buf_lock);
|
|
|
|
memcpy(rtas_data_buf, buf, RTAS_DATA_BUF_SIZE);
|
|
rc = rtas_call(token, 2, 1, NULL, rtas_data_buf, scope);
|
|
memcpy(buf, rtas_data_buf, RTAS_DATA_BUF_SIZE);
|
|
|
|
spin_unlock(&rtas_data_buf_lock);
|
|
return rc;
|
|
}
|
|
|
|
static int delete_dt_node(__be32 phandle)
|
|
{
|
|
struct device_node *dn;
|
|
|
|
dn = of_find_node_by_phandle(be32_to_cpu(phandle));
|
|
if (!dn)
|
|
return -ENOENT;
|
|
|
|
dlpar_detach_node(dn);
|
|
of_node_put(dn);
|
|
return 0;
|
|
}
|
|
|
|
static int update_dt_property(struct device_node *dn, struct property **prop,
|
|
const char *name, u32 vd, char *value)
|
|
{
|
|
struct property *new_prop = *prop;
|
|
int more = 0;
|
|
|
|
/* A negative 'vd' value indicates that only part of the new property
|
|
* value is contained in the buffer and we need to call
|
|
* ibm,update-properties again to get the rest of the value.
|
|
*
|
|
* A negative value is also the two's compliment of the actual value.
|
|
*/
|
|
if (vd & 0x80000000) {
|
|
vd = ~vd + 1;
|
|
more = 1;
|
|
}
|
|
|
|
if (new_prop) {
|
|
/* partial property fixup */
|
|
char *new_data = kzalloc(new_prop->length + vd, GFP_KERNEL);
|
|
if (!new_data)
|
|
return -ENOMEM;
|
|
|
|
memcpy(new_data, new_prop->value, new_prop->length);
|
|
memcpy(new_data + new_prop->length, value, vd);
|
|
|
|
kfree(new_prop->value);
|
|
new_prop->value = new_data;
|
|
new_prop->length += vd;
|
|
} else {
|
|
new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL);
|
|
if (!new_prop)
|
|
return -ENOMEM;
|
|
|
|
new_prop->name = kstrdup(name, GFP_KERNEL);
|
|
if (!new_prop->name) {
|
|
kfree(new_prop);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
new_prop->length = vd;
|
|
new_prop->value = kzalloc(new_prop->length, GFP_KERNEL);
|
|
if (!new_prop->value) {
|
|
kfree(new_prop->name);
|
|
kfree(new_prop);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
memcpy(new_prop->value, value, vd);
|
|
*prop = new_prop;
|
|
}
|
|
|
|
if (!more) {
|
|
of_update_property(dn, new_prop);
|
|
*prop = NULL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int update_dt_node(__be32 phandle, s32 scope)
|
|
{
|
|
struct update_props_workarea *upwa;
|
|
struct device_node *dn;
|
|
struct property *prop = NULL;
|
|
int i, rc, rtas_rc;
|
|
char *prop_data;
|
|
char *rtas_buf;
|
|
int update_properties_token;
|
|
u32 nprops;
|
|
u32 vd;
|
|
|
|
update_properties_token = rtas_token("ibm,update-properties");
|
|
if (update_properties_token == RTAS_UNKNOWN_SERVICE)
|
|
return -EINVAL;
|
|
|
|
rtas_buf = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
|
|
if (!rtas_buf)
|
|
return -ENOMEM;
|
|
|
|
dn = of_find_node_by_phandle(be32_to_cpu(phandle));
|
|
if (!dn) {
|
|
kfree(rtas_buf);
|
|
return -ENOENT;
|
|
}
|
|
|
|
upwa = (struct update_props_workarea *)&rtas_buf[0];
|
|
upwa->phandle = phandle;
|
|
|
|
do {
|
|
rtas_rc = mobility_rtas_call(update_properties_token, rtas_buf,
|
|
scope);
|
|
if (rtas_rc < 0)
|
|
break;
|
|
|
|
prop_data = rtas_buf + sizeof(*upwa);
|
|
nprops = be32_to_cpu(upwa->nprops);
|
|
|
|
/* On the first call to ibm,update-properties for a node the
|
|
* the first property value descriptor contains an empty
|
|
* property name, the property value length encoded as u32,
|
|
* and the property value is the node path being updated.
|
|
*/
|
|
if (*prop_data == 0) {
|
|
prop_data++;
|
|
vd = be32_to_cpu(*(__be32 *)prop_data);
|
|
prop_data += vd + sizeof(vd);
|
|
nprops--;
|
|
}
|
|
|
|
for (i = 0; i < nprops; i++) {
|
|
char *prop_name;
|
|
|
|
prop_name = prop_data;
|
|
prop_data += strlen(prop_name) + 1;
|
|
vd = be32_to_cpu(*(__be32 *)prop_data);
|
|
prop_data += sizeof(vd);
|
|
|
|
switch (vd) {
|
|
case 0x00000000:
|
|
/* name only property, nothing to do */
|
|
break;
|
|
|
|
case 0x80000000:
|
|
prop = of_find_property(dn, prop_name, NULL);
|
|
of_remove_property(dn, prop);
|
|
prop = NULL;
|
|
break;
|
|
|
|
default:
|
|
rc = update_dt_property(dn, &prop, prop_name,
|
|
vd, prop_data);
|
|
if (rc) {
|
|
printk(KERN_ERR "Could not update %s"
|
|
" property\n", prop_name);
|
|
}
|
|
|
|
prop_data += vd;
|
|
}
|
|
}
|
|
} while (rtas_rc == 1);
|
|
|
|
of_node_put(dn);
|
|
kfree(rtas_buf);
|
|
return 0;
|
|
}
|
|
|
|
static int add_dt_node(__be32 parent_phandle, __be32 drc_index)
|
|
{
|
|
struct device_node *dn;
|
|
struct device_node *parent_dn;
|
|
int rc;
|
|
|
|
parent_dn = of_find_node_by_phandle(be32_to_cpu(parent_phandle));
|
|
if (!parent_dn)
|
|
return -ENOENT;
|
|
|
|
dn = dlpar_configure_connector(drc_index, parent_dn);
|
|
if (!dn)
|
|
return -ENOENT;
|
|
|
|
rc = dlpar_attach_node(dn);
|
|
if (rc)
|
|
dlpar_free_cc_nodes(dn);
|
|
|
|
of_node_put(parent_dn);
|
|
return rc;
|
|
}
|
|
|
|
int pseries_devicetree_update(s32 scope)
|
|
{
|
|
char *rtas_buf;
|
|
__be32 *data;
|
|
int update_nodes_token;
|
|
int rc;
|
|
|
|
update_nodes_token = rtas_token("ibm,update-nodes");
|
|
if (update_nodes_token == RTAS_UNKNOWN_SERVICE)
|
|
return -EINVAL;
|
|
|
|
rtas_buf = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
|
|
if (!rtas_buf)
|
|
return -ENOMEM;
|
|
|
|
do {
|
|
rc = mobility_rtas_call(update_nodes_token, rtas_buf, scope);
|
|
if (rc && rc != 1)
|
|
break;
|
|
|
|
data = (__be32 *)rtas_buf + 4;
|
|
while (be32_to_cpu(*data) & NODE_ACTION_MASK) {
|
|
int i;
|
|
u32 action = be32_to_cpu(*data) & NODE_ACTION_MASK;
|
|
u32 node_count = be32_to_cpu(*data) & NODE_COUNT_MASK;
|
|
|
|
data++;
|
|
|
|
for (i = 0; i < node_count; i++) {
|
|
__be32 phandle = *data++;
|
|
__be32 drc_index;
|
|
|
|
switch (action) {
|
|
case DELETE_DT_NODE:
|
|
delete_dt_node(phandle);
|
|
break;
|
|
case UPDATE_DT_NODE:
|
|
update_dt_node(phandle, scope);
|
|
break;
|
|
case ADD_DT_NODE:
|
|
drc_index = *data++;
|
|
add_dt_node(phandle, drc_index);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
} while (rc == 1);
|
|
|
|
kfree(rtas_buf);
|
|
return rc;
|
|
}
|
|
|
|
void post_mobility_fixup(void)
|
|
{
|
|
int rc;
|
|
int activate_fw_token;
|
|
|
|
activate_fw_token = rtas_token("ibm,activate-firmware");
|
|
if (activate_fw_token == RTAS_UNKNOWN_SERVICE) {
|
|
printk(KERN_ERR "Could not make post-mobility "
|
|
"activate-fw call.\n");
|
|
return;
|
|
}
|
|
|
|
do {
|
|
rc = rtas_call(activate_fw_token, 0, 1, NULL);
|
|
} while (rtas_busy_delay(rc));
|
|
|
|
if (rc)
|
|
printk(KERN_ERR "Post-mobility activate-fw failed: %d\n", rc);
|
|
|
|
rc = pseries_devicetree_update(MIGRATION_SCOPE);
|
|
if (rc)
|
|
printk(KERN_ERR "Post-mobility device tree update "
|
|
"failed: %d\n", rc);
|
|
|
|
return;
|
|
}
|
|
|
|
static ssize_t migrate_store(struct class *class, struct class_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
u64 streamid;
|
|
int rc;
|
|
|
|
rc = kstrtou64(buf, 0, &streamid);
|
|
if (rc)
|
|
return rc;
|
|
|
|
do {
|
|
rc = rtas_ibm_suspend_me(streamid);
|
|
if (rc == -EAGAIN)
|
|
ssleep(1);
|
|
} while (rc == -EAGAIN);
|
|
|
|
if (rc)
|
|
return rc;
|
|
|
|
post_mobility_fixup();
|
|
return count;
|
|
}
|
|
|
|
/*
|
|
* Used by drmgr to determine the kernel behavior of the migration interface.
|
|
*
|
|
* Version 1: Performs all PAPR requirements for migration including
|
|
* firmware activation and device tree update.
|
|
*/
|
|
#define MIGRATION_API_VERSION 1
|
|
|
|
static CLASS_ATTR(migration, S_IWUSR, NULL, migrate_store);
|
|
static CLASS_ATTR_STRING(api_version, S_IRUGO, __stringify(MIGRATION_API_VERSION));
|
|
|
|
static int __init mobility_sysfs_init(void)
|
|
{
|
|
int rc;
|
|
|
|
mobility_kobj = kobject_create_and_add("mobility", kernel_kobj);
|
|
if (!mobility_kobj)
|
|
return -ENOMEM;
|
|
|
|
rc = sysfs_create_file(mobility_kobj, &class_attr_migration.attr);
|
|
if (rc)
|
|
pr_err("mobility: unable to create migration sysfs file (%d)\n", rc);
|
|
|
|
rc = sysfs_create_file(mobility_kobj, &class_attr_api_version.attr.attr);
|
|
if (rc)
|
|
pr_err("mobility: unable to create api_version sysfs file (%d)\n", rc);
|
|
|
|
return 0;
|
|
}
|
|
machine_device_initcall(pseries, mobility_sysfs_init);
|