* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 2005-2006 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2005 Silicon Graphics, Inc. All rights reserved.
*
* This work was based on the 2.4/2.6 kernel development by Dick Reigner.
* Work to add BIOS PROM support was completed by Mike Habeck.
#include <linux/pci.h>
#include <linux/proc_fs.h>
#include <linux/types.h>
-#include <linux/mutex.h>
#include <asm/sn/addrs.h>
-#include <asm/sn/geo.h>
#include <asm/sn/l1.h>
#include <asm/sn/module.h>
#include <asm/sn/pcibr_provider.h>
#include <asm/sn/pcibus_provider_defs.h>
#include <asm/sn/pcidev.h>
-#include <asm/sn/sn_feature_sets.h>
#include <asm/sn/sn_sal.h>
#include <asm/sn/types.h>
.get_power_status = get_power_status,
};
-static DEFINE_MUTEX(sn_hotplug_mutex);
+static DECLARE_MUTEX(sn_hotplug_sem);
static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
char *buf)
static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)
{
struct pcibus_info *pcibus_info;
- u16 busnum, segment, ioboard_type;
+ int bricktype;
+ int bus_num;
pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);
if (!(pcibus_info->pbi_valid_devices & (1 << device)))
return -EPERM;
- ioboard_type = sn_ioboard_to_pci_bus(pci_bus);
- busnum = pcibus_info->pbi_buscommon.bs_persist_busnum;
- segment = pci_domain_nr(pci_bus) & 0xf;
+ bricktype = MODULE_GET_BTYPE(pcibus_info->pbi_moduleid);
+ bus_num = pcibus_info->pbi_buscommon.bs_persist_busnum & 0xf;
/* Do not allow hotplug operations on base I/O cards */
- if ((ioboard_type == L1_BRICKTYPE_IX ||
- ioboard_type == L1_BRICKTYPE_IA) &&
- (segment == 1 && busnum == 0 && device != 1))
+ if ((bricktype == L1_BRICKTYPE_IX || bricktype == L1_BRICKTYPE_IA) &&
+ (bus_num == 1 && device != 1))
return -EPERM;
return 1;
static int sn_pci_bus_valid(struct pci_bus *pci_bus)
{
struct pcibus_info *pcibus_info;
- u32 asic_type;
- u16 ioboard_type;
+ int asic_type;
+ int bricktype;
- /* Don't register slots hanging off the TIOCA bus */
pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);
+
+ /* Don't register slots hanging off the TIOCA bus */
asic_type = pcibus_info->pbi_buscommon.bs_asic_type;
if (asic_type == PCIIO_ASIC_TYPE_TIOCA)
return -EPERM;
/* Only register slots in I/O Bricks that support hotplug */
- ioboard_type = sn_ioboard_to_pci_bus(pci_bus);
- switch (ioboard_type) {
+ bricktype = MODULE_GET_BTYPE(pcibus_info->pbi_moduleid);
+ switch (bricktype) {
case L1_BRICKTYPE_IX:
case L1_BRICKTYPE_PX:
case L1_BRICKTYPE_IA:
case L1_BRICKTYPE_PA:
- case L1_BOARDTYPE_PCIX3SLOT:
return 1;
break;
default:
slot->pci_bus = pci_bus;
sprintf(bss_hotplug_slot->name, "%04x:%02x:%02x",
pci_domain_nr(pci_bus),
- ((u16)pcibus_info->pbi_buscommon.bs_persist_busnum),
+ ((int)pcibus_info->pbi_buscommon.bs_persist_busnum) & 0xf,
device + 1);
-
- sn_generate_path(pci_bus, slot->physical_path);
-
+ sprintf(slot->physical_path, "module_%c%c%c%c%.2d",
+ '0'+RACK_GET_CLASS(MODULE_GET_RACK(pcibus_info->pbi_moduleid)),
+ '0'+RACK_GET_GROUP(MODULE_GET_RACK(pcibus_info->pbi_moduleid)),
+ '0'+RACK_GET_NUM(MODULE_GET_RACK(pcibus_info->pbi_moduleid)),
+ MODULE_GET_BTCHAR(pcibus_info->pbi_moduleid),
+ MODULE_GET_BPOS(pcibus_info->pbi_moduleid));
slot->hotplug_slot = bss_hotplug_slot;
list_add(&slot->hp_list, &sn_hp_list);
list_for_each_entry(child, &subordinate_bus->devices, bus_list)
sn_bus_free_data(child);
}
- /*
- * Some drivers may use dma accesses during the
- * driver remove function. We release the sysdata
- * areas after the driver remove functions have
- * been called.
- */
- sn_bus_store_sysdata(dev);
sn_pci_unfixup_slot(dev);
}
int rc;
/* Serialize the Linux PCI infrastructure */
- mutex_lock(&sn_hotplug_mutex);
+ down(&sn_hotplug_sem);
/*
* Power-on and initialize the slot in the SN
*/
rc = sn_slot_enable(bss_hotplug_slot, slot->device_num);
if (rc) {
- mutex_unlock(&sn_hotplug_mutex);
+ up(&sn_hotplug_sem);
return rc;
}
PCI_DEVFN(slot->device_num + 1, 0));
if (!num_funcs) {
dev_dbg(slot->pci_bus->self, "no device in slot\n");
- mutex_unlock(&sn_hotplug_mutex);
+ up(&sn_hotplug_sem);
return -ENODEV;
}
if (new_ppb)
pci_bus_add_devices(new_bus);
- mutex_unlock(&sn_hotplug_mutex);
+ up(&sn_hotplug_sem);
if (rc == 0)
dev_dbg(slot->pci_bus->self,
int rc;
/* Acquire update access to the bus */
- mutex_lock(&sn_hotplug_mutex);
+ down(&sn_hotplug_sem);
/* is it okay to bring this slot down? */
rc = sn_slot_disable(bss_hotplug_slot, slot->device_num,
PCI_DEVFN(slot->device_num + 1,
PCI_FUNC(func)));
if (dev) {
+ /*
+ * Some drivers may use dma accesses during the
+ * driver remove function. We release the sysdata
+ * areas after the driver remove functions have
+ * been called.
+ */
+ sn_bus_store_sysdata(dev);
sn_bus_free_data(dev);
pci_remove_bus_device(dev);
pci_dev_put(dev);
PCI_REQ_SLOT_DISABLE);
leaving:
/* Release the bus lock */
- mutex_unlock(&sn_hotplug_mutex);
+ up(&sn_hotplug_sem);
return rc;
}
{
struct slot *slot = bss_hotplug_slot->private;
struct pcibus_info *pcibus_info;
- u32 power;
pcibus_info = SN_PCIBUS_BUSSOFT_INFO(slot->pci_bus);
- mutex_lock(&sn_hotplug_mutex);
- power = pcibus_info->pbi_enabled_devices & (1 << slot->device_num);
- *value = power ? 1 : 0;
- mutex_unlock(&sn_hotplug_mutex);
+ down(&sn_hotplug_sem);
+ *value = pcibus_info->pbi_enabled_devices & (1 << slot->device_num);
+ up(&sn_hotplug_sem);
return 0;
}
int rc;
int registered = 0;
- if (!sn_prom_feature_available(PRF_HOTPLUG_SUPPORT)) {
- printk(KERN_ERR "%s: PROM version does not support hotplug.\n",
+ if (sn_sal_rev() < SGI_HOTPLUG_PROM_REV) {
+ printk(KERN_ERR "%s: PROM version must be greater than 4.30\n",
__FUNCTION__);
return -EPERM;
}
git://git.onelab.eu / linux-2.6.git / blobdiff