MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
-module_param(debug, int, 0644);
+void eeh_register_disable_func(int (*)(struct pci_dev *));
+
+module_param(debug, bool, 0644);
static int enable_slot(struct hotplug_slot *slot);
static int disable_slot(struct hotplug_slot *slot);
static int get_attention_status(struct hotplug_slot *slot, u8 * value);
static int get_adapter_status(struct hotplug_slot *slot, u8 * value);
static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value);
-static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value);
+static int rpaphp_disable_slot(struct pci_dev *dev);
struct hotplug_slot_ops rpaphp_hotplug_slot_ops = {
.owner = THIS_MODULE,
.get_attention_status = get_attention_status,
.get_adapter_status = get_adapter_status,
.get_max_bus_speed = get_max_bus_speed,
- .get_cur_bus_speed = get_cur_bus_speed,
};
-static inline struct slot *get_slot (struct hotplug_slot *hotplug_slot, const char *function)
-{
- if (!hotplug_slot) {
- dbg("%s - hotplug_slot == NULL\n", function);
- return NULL;
- }
- return (struct slot *)hotplug_slot->private;
-}
-
static int rpaphp_get_attention_status(struct slot *slot)
{
return slot->hotplug_slot->info->attention_status;
static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
{
int retval = 0;
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = (struct slot *)hotplug_slot->private;
down(&rpaphp_sem);
switch (value) {
static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
{
int retval;
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = (struct slot *)hotplug_slot->private;
down(&rpaphp_sem);
retval = rpaphp_get_power_status(slot, value);
static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
{
int retval = 0;
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = (struct slot *)hotplug_slot->private;
down(&rpaphp_sem);
*value = rpaphp_get_attention_status(slot);
static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 * value)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+ struct slot *slot = (struct slot *)hotplug_slot->private;
int retval = 0;
- if (slot == NULL)
- return -ENODEV;
down(&rpaphp_sem);
/* have to go through this */
switch (slot->dev_type) {
static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = (struct slot *)hotplug_slot->private;
down(&rpaphp_sem);
switch (slot->type) {
return 0;
}
-/* return dummy value because not sure if PRA provides any method... */
-static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
+int rpaphp_remove_slot(struct slot *slot)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
-
- *value = PCI_SPEED_UNKNOWN;
- return 0;
+ return deregister_slot(slot);
}
-int rpaphp_remove_slot(struct slot *slot)
+static int get_dn_properties(struct device_node *dn, int **indexes, int **names,
+ int **types, int **power_domains)
{
- int retval = 0;
- struct hotplug_slot *php_slot = slot->hotplug_slot;
-
- list_del(&slot->rpaphp_slot_list);
-
- /* remove "php_location" file */
- rpaphp_sysfs_remove_attr_location(php_slot);
+ *indexes = (int *) get_property(dn, "ibm,drc-indexes", NULL);
- retval = pci_hp_deregister(php_slot);
- if (retval)
- err("Problem unregistering a slot %s\n", slot->name);
+ /* &names[1] contains NULL terminated slot names */
+ *names = (int *) get_property(dn, "ibm,drc-names", NULL);
- num_slots--;
+ /* &types[1] contains NULL terminated slot types */
+ *types = (int *) get_property(dn, "ibm,drc-types", NULL);
- dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
- return retval;
+ /* power_domains[1...n] are the slot power domains */
+ *power_domains = (int *) get_property(dn, "ibm,drc-power-domains", NULL);
+
+ if (*indexes && *names && *types && *power_domains)
+ return (1);
+
+ return (0);
}
static int is_php_dn(struct device_node *dn, int **indexes, int **names, int **types,
int **power_domains)
{
- *indexes = (int *) get_property(dn, "ibm,drc-indexes", NULL);
- if (!*indexes)
+ if (!is_hotplug_capable(dn))
return (0);
- /* &names[1] contains NULL terminated slot names */
- *names = (int *) get_property(dn, "ibm,drc-names", NULL);
- if (!*names)
+ if (!get_dn_properties(dn, indexes, names, types, power_domains))
return (0);
- /* &types[1] contains NULL terminated slot types */
- *types = (int *) get_property(dn, "ibm,drc-types", NULL);
- if (!*types)
+ return (1);
+}
+
+static int is_dr_dn(struct device_node *dn, int **indexes, int **names, int **types,
+ int **power_domains, int **my_drc_index)
+{
+ if (!is_hotplug_capable(dn))
return (0);
- /* power_domains[1...n] are the slot power domains */
- *power_domains = (int *) get_property(dn,
- "ibm,drc-power-domains", NULL);
- if (!*power_domains)
+
+ *my_drc_index = (int *) get_property(dn, "ibm,my-drc-index", NULL);
+ if(!*my_drc_index)
return (0);
- if (strcmp(dn->name, "pci") == 0 &&
- !get_property(dn, "ibm,fw-pci-hot-plug-ctrl", NULL))
+
+ if (!dn->parent)
return (0);
- return (1);
+
+ return get_dn_properties(dn->parent, indexes, names, types, power_domains);
}
static inline int is_vdevice_root(struct device_node *dn)
return !strcmp(dn->name, "vdevice");
}
-/*************************************
- * Add Hot Plug slot(s) to sysfs
- *
- ************************************/
+char *rpaphp_get_drc_name(struct device_node *dn)
+{
+ char *name, *ptr = NULL;
+ int *drc_names, *drc_indexes, i;
+ struct device_node *parent = dn->parent;
+ u32 *my_drc_index;
+
+ if (!parent)
+ return NULL;
+
+ my_drc_index = (u32 *) get_property(dn, "ibm,my-drc-index", NULL);
+ if (!my_drc_index)
+ return NULL;
+
+ drc_names = (int *) get_property(parent, "ibm,drc-names", NULL);
+ drc_indexes = (int *) get_property(parent, "ibm,drc-indexes", NULL);
+ if (!drc_names || !drc_indexes)
+ return NULL;
+
+ name = (char *) &drc_names[1];
+ for (i = 0; i < drc_indexes[0]; i++, name += (strlen(name) + 1)) {
+ if (drc_indexes[i + 1] == *my_drc_index) {
+ ptr = (char *) name;
+ break;
+ }
+ }
+
+ return ptr;
+}
+
+/****************************************************************
+ * rpaphp not only registers PCI hotplug slots(HOTPLUG),
+ * but also logical DR slots(EMBEDDED).
+ * HOTPLUG slot: An adapter can be physically added/removed.
+ * EMBEDDED slot: An adapter can be logically removed/added
+ * from/to a partition with the slot.
+ ***************************************************************/
int rpaphp_add_slot(struct device_node *dn)
{
struct slot *slot;
int retval = 0;
- int i;
+ int i, *my_drc_index, slot_type;
int *indexes, *names, *types, *power_domains;
char *name, *type;
}
/* register PCI devices */
- if (dn->name != 0 && strcmp(dn->name, "pci") == 0 &&
- is_php_dn(dn, &indexes, &names, &types, &power_domains)) {
+ if (dn->name != 0 && strcmp(dn->name, "pci") == 0) {
+ if (is_php_dn(dn, &indexes, &names, &types, &power_domains))
+ slot_type = HOTPLUG;
+ else if (is_dr_dn(dn, &indexes, &names, &types, &power_domains, &my_drc_index))
+ slot_type = EMBEDDED;
+ else goto exit;
name = (char *) &names[1];
type = (char *) &types[1];
- for (i = 0; i < indexes[0];
- i++,
- name += (strlen(name) + 1), type += (strlen(type) + 1)) {
- if (!(slot = alloc_slot_struct(dn, indexes[i + 1], name,
- power_domains[i + 1]))) {
- retval = -ENOMEM;
- goto exit;
+ for (i = 0; i < indexes[0]; i++,
+ name += (strlen(name) + 1), type += (strlen(type) + 1)) {
+
+ if ( slot_type == HOTPLUG ||
+ (slot_type == EMBEDDED && indexes[i + 1] == my_drc_index[0])) {
+
+ if (!(slot = alloc_slot_struct(dn, indexes[i + 1], name,
+ power_domains[i + 1]))) {
+ retval = -ENOMEM;
+ goto exit;
+ }
+ if (slot_type == EMBEDDED)
+ slot->type = EMBEDDED;
+ else
+ slot->type = simple_strtoul(type, NULL, 10);
+
+ dbg(" Found drc-index:0x%x drc-name:%s drc-type:%s\n",
+ indexes[i + 1], name, type);
+
+ retval = register_pci_slot(slot);
+ if (slot_type == EMBEDDED)
+ goto exit;
}
- slot->type = simple_strtoul(type, NULL, 10);
- if (slot->type < 1 || slot->type > 16)
- slot->type = 0;
- retval = register_pci_slot(slot);
-
- } /* for indexes */
- } /* end of PCI device_node */
- exit:
+ }
+ }
+exit:
dbg("%s - Exit: num_slots=%d rc[%d]\n",
__FUNCTION__, num_slots, retval);
return retval;
rpaphp_add_slot(dn);
}
-static int init_rpa(void)
+static int __init init_rpa(void)
{
init_MUTEX(&rpaphp_sem);
return 0;
}
-static void cleanup_slots(void)
+static void __exit cleanup_slots(void)
{
struct list_head *tmp, *n;
struct slot *slot;
{
info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
+ /* let EEH know they can use hotplug */
+ eeh_register_disable_func(&rpaphp_disable_slot);
+
/* read all the PRA info from the system */
return init_rpa();
}
static void __exit rpaphp_exit(void)
{
+ /* let EEH know we are going away */
+ eeh_register_disable_func(NULL);
+
cleanup_slots();
}
static int enable_slot(struct hotplug_slot *hotplug_slot)
{
int retval = 0;
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = (struct slot *)hotplug_slot->private;
if (slot->state == CONFIGURED) {
dbg("%s: %s is already enabled\n", __FUNCTION__, slot->name);
retval = -EINVAL;
}
up(&rpaphp_sem);
- exit:
+exit:
dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
return retval;
}
+static int rpaphp_disable_slot(struct pci_dev *dev)
+{
+ return disable_slot(rpaphp_find_hotplug_slot(dev));
+}
+
static int disable_slot(struct hotplug_slot *hotplug_slot)
{
int retval;
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = (struct slot *)hotplug_slot->private;
dbg("%s - Entry: slot[%s]\n", __FUNCTION__, slot->name);
down(&rpaphp_sem);
switch (slot->dev_type) {
case PCI_DEV:
- rpaphp_set_attention_status(slot, LED_ID);
retval = rpaphp_unconfig_pci_adapter(slot);
- rpaphp_set_attention_status(slot, LED_OFF);
break;
case VIO_DEV:
retval = rpaphp_unconfig_vio_adapter(slot);
retval = -ENODEV;
}
up(&rpaphp_sem);
- exit:
+exit:
dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
return retval;
}
EXPORT_SYMBOL_GPL(rpaphp_add_slot);
EXPORT_SYMBOL_GPL(rpaphp_remove_slot);
EXPORT_SYMBOL_GPL(rpaphp_slot_head);
+EXPORT_SYMBOL_GPL(rpaphp_get_drc_name);
git://git.onelab.eu / linux-2.6.git / blobdiff