Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

9 files changed, 798 insertions, 74 deletions

diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
index 6c7f4d9e8ea0..4f381fb25049 100644
--- a/arch/ia64/sn/kernel/Makefile
+++ b/arch/ia64/sn/kernel/Makefile
@@ -10,3 +10,4 @@
 obj-y                           += setup.o bte.o bte_error.o irq.o mca.o idle.o \
                                    huberror.o io_init.o iomv.o klconflib.o sn2/
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
+obj-$(CONFIG_SGI_TIOCX)         += tiocx.o
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
index ce0bc4085eae..647deae9bfcd 100644
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 #include <linux/config.h>
@@ -170,10 +170,6 @@ retry_bteop:
         /* Initialize the notification to a known value. */
         *bte->most_rcnt_na = BTE_WORD_BUSY;
 
-        /* Set the status reg busy bit and transfer length */
-        BTE_PRINTKV(("IBLS = 0x%lx\n", IBLS_BUSY | transfer_size));
-        BTE_LNSTAT_STORE(bte, IBLS_BUSY | transfer_size);
-
         /* Set the source and destination registers */
         BTE_PRINTKV(("IBSA = 0x%lx)\n", (TO_PHYS(src))));
         BTE_SRC_STORE(bte, TO_PHYS(src));
@@ -188,7 +184,7 @@ retry_bteop:
 
         /* Initiate the transfer */
         BTE_PRINTK(("IBCT = 0x%lx)\n", BTE_VALID_MODE(mode)));
-        BTE_CTRL_STORE(bte, BTE_VALID_MODE(mode));
+        BTE_START_TRANSFER(bte, transfer_size, BTE_VALID_MODE(mode));
 
         itc_end = ia64_get_itc() + (40000000 * local_cpu_data->cyc_per_usec);
 
@@ -429,10 +425,16 @@ void bte_init_node(nodepda_t * mynodepda, cnodeid_t cnode)
         mynodepda->bte_recovery_timer.data = (unsigned long)mynodepda;
 
         for (i = 0; i < BTES_PER_NODE; i++) {
+                u64 *base_addr;
+
                 /* Which link status register should we use? */
-                unsigned long link_status = (i == 0 ? IIO_IBLS0 : IIO_IBLS1);
-                mynodepda->bte_if[i].bte_base_addr = (u64 *)
-                    REMOTE_HUB_ADDR(cnodeid_to_nasid(cnode), link_status);
+                base_addr = (u64 *)
+                    REMOTE_HUB_ADDR(cnodeid_to_nasid(cnode), BTE_BASE_ADDR(i));
+                mynodepda->bte_if[i].bte_base_addr = base_addr;
+                mynodepda->bte_if[i].bte_source_addr = BTE_SOURCE_ADDR(base_addr);
+                mynodepda->bte_if[i].bte_destination_addr = BTE_DEST_ADDR(base_addr);
+                mynodepda->bte_if[i].bte_control_addr = BTE_CTRL_ADDR(base_addr);
+                mynodepda->bte_if[i].bte_notify_addr = BTE_NOTIF_ADDR(base_addr);
 
                 /*
                  * Initialize the notification and spinlock
diff --git a/arch/ia64/sn/kernel/bte_error.c b/arch/ia64/sn/kernel/bte_error.c
index fd104312c6bd..fcbc748ae433 100644
--- a/arch/ia64/sn/kernel/bte_error.c
+++ b/arch/ia64/sn/kernel/bte_error.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 #include <linux/types.h>
@@ -33,48 +33,28 @@ void bte_error_handler(unsigned long);
  * Wait until all BTE related CRBs are completed
  * and then reset the interfaces.
  */
-void bte_error_handler(unsigned long _nodepda)
+void shub1_bte_error_handler(unsigned long _nodepda)
 {
         struct nodepda_s *err_nodepda = (struct nodepda_s *)_nodepda;
-        spinlock_t *recovery_lock = &err_nodepda->bte_recovery_lock;
         struct timer_list *recovery_timer = &err_nodepda->bte_recovery_timer;
         nasid_t nasid;
         int i;
         int valid_crbs;
-        unsigned long irq_flags;
-        volatile u64 *notify;
-        bte_result_t bh_error;
         ii_imem_u_t imem;       /* II IMEM Register */
         ii_icrb0_d_u_t icrbd;   /* II CRB Register D */
         ii_ibcr_u_t ibcr;
         ii_icmr_u_t icmr;
         ii_ieclr_u_t ieclr;
 
-        BTE_PRINTK(("bte_error_handler(%p) - %d\n", err_nodepda,
+        BTE_PRINTK(("shub1_bte_error_handler(%p) - %d\n", err_nodepda,
                     smp_processor_id()));
 
-        spin_lock_irqsave(recovery_lock, irq_flags);
-
         if ((err_nodepda->bte_if[0].bh_error == BTE_SUCCESS) &&
             (err_nodepda->bte_if[1].bh_error == BTE_SUCCESS)) {
                 BTE_PRINTK(("eh:%p:%d Nothing to do.\n", err_nodepda,
                             smp_processor_id()));
-                spin_unlock_irqrestore(recovery_lock, irq_flags);
                 return;
         }
-        /*
-         * Lock all interfaces on this node to prevent new transfers
-         * from being queued.
-         */
-        for (i = 0; i < BTES_PER_NODE; i++) {
-                if (err_nodepda->bte_if[i].cleanup_active) {
-                        continue;
-                }
-                spin_lock(&err_nodepda->bte_if[i].spinlock);
-                BTE_PRINTK(("eh:%p:%d locked %d\n", err_nodepda,
-                            smp_processor_id(), i));
-                err_nodepda->bte_if[i].cleanup_active = 1;
-        }
 
         /* Determine information about our hub */
         nasid = cnodeid_to_nasid(err_nodepda->bte_if[0].bte_cnode);
@@ -101,7 +81,6 @@ void bte_error_handler(unsigned long _nodepda)
                 mod_timer(recovery_timer, HZ * 5);
                 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
                             smp_processor_id()));
-                spin_unlock_irqrestore(recovery_lock, irq_flags);
                 return;
         }
         if (icmr.ii_icmr_fld_s.i_crb_vld != 0) {
@@ -120,8 +99,6 @@ void bte_error_handler(unsigned long _nodepda)
                                 BTE_PRINTK(("eh:%p:%d Valid %d, Giving up\n",
                                             err_nodepda, smp_processor_id(),
                                             i));
-                                spin_unlock_irqrestore(recovery_lock,
-                                                       irq_flags);
                                 return;
                         }
                 }
@@ -146,6 +123,51 @@ void bte_error_handler(unsigned long _nodepda)
         ibcr.ii_ibcr_fld_s.i_soft_reset = 1;
         REMOTE_HUB_S(nasid, IIO_IBCR, ibcr.ii_ibcr_regval);
 
+        del_timer(recovery_timer);
+}
+
+/*
+ * Wait until all BTE related CRBs are completed
+ * and then reset the interfaces.
+ */
+void bte_error_handler(unsigned long _nodepda)
+{
+        struct nodepda_s *err_nodepda = (struct nodepda_s *)_nodepda;
+        spinlock_t *recovery_lock = &err_nodepda->bte_recovery_lock;
+        int i;
+        nasid_t nasid;
+        unsigned long irq_flags;
+        volatile u64 *notify;
+        bte_result_t bh_error;
+
+        BTE_PRINTK(("bte_error_handler(%p) - %d\n", err_nodepda,
+                    smp_processor_id()));
+
+        spin_lock_irqsave(recovery_lock, irq_flags);
+
+        /*
+         * Lock all interfaces on this node to prevent new transfers
+         * from being queued.
+         */
+        for (i = 0; i < BTES_PER_NODE; i++) {
+                if (err_nodepda->bte_if[i].cleanup_active) {
+                        continue;
+                }
+                spin_lock(&err_nodepda->bte_if[i].spinlock);
+                BTE_PRINTK(("eh:%p:%d locked %d\n", err_nodepda,
+                            smp_processor_id(), i));
+                err_nodepda->bte_if[i].cleanup_active = 1;
+        }
+
+        if (is_shub1()) {
+                shub1_bte_error_handler(_nodepda);
+        } else {
+                nasid = cnodeid_to_nasid(err_nodepda->bte_if[0].bte_cnode);
+
+                if (ia64_sn_bte_recovery(nasid))
+                        panic("bte_error_handler(): Fatal BTE Error");
+        }
+
         for (i = 0; i < BTES_PER_NODE; i++) {
                 bh_error = err_nodepda->bte_if[i].bh_error;
                 if (bh_error != BTE_SUCCESS) {
@@ -165,8 +187,6 @@ void bte_error_handler(unsigned long _nodepda)
                 spin_unlock(&err_nodepda->bte_if[i].spinlock);
         }
 
-        del_timer(recovery_timer);
-
         spin_unlock_irqrestore(recovery_lock, irq_flags);
 }
 
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c
index 2bdf684c5066..5c39b43ba3c0 100644
--- a/arch/ia64/sn/kernel/huberror.c
+++ b/arch/ia64/sn/kernel/huberror.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1992 - 1997, 2000,2002-2004 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000,2002-2005 Silicon Graphics, Inc. All rights reserved.
  */
 
 #include <linux/types.h>
@@ -38,8 +38,11 @@ static irqreturn_t hub_eint_handler(int irq, void *arg, struct pt_regs *ep)
         if ((int)ret_stuff.v0)
                 panic("hubii_eint_handler(): Fatal TIO Error");
 
-        if (!(nasid & 1)) /* Not a TIO, handle CRB errors */
-                (void)hubiio_crb_error_handler(hubdev_info);
+        if (is_shub1()) {
+                if (!(nasid & 1)) /* Not a TIO, handle CRB errors */
+                        (void)hubiio_crb_error_handler(hubdev_info);
+        } else 
+                bte_error_handler((unsigned long)NODEPDA(nasid_to_cnodeid(nasid)));
 
         return IRQ_HANDLED;
 }
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 001880812b7c..18160a06a8c9 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -11,14 +11,15 @@
 #include <asm/sn/types.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/addrs.h>
-#include "pci/pcibus_provider_defs.h"
-#include "pci/pcidev.h"
+#include <asm/sn/pcibus_provider_defs.h>
+#include <asm/sn/pcidev.h>
 #include "pci/pcibr_provider.h"
 #include "xtalk/xwidgetdev.h"
 #include <asm/sn/geo.h>
 #include "xtalk/hubdev.h"
 #include <asm/sn/io.h>
 #include <asm/sn/simulator.h>
+#include <asm/sn/tioca_provider.h>
 
 char master_baseio_wid;
 nasid_t master_nasid = INVALID_NASID;   /* Partition Master */
@@ -34,6 +35,37 @@ struct brick {
 
 int sn_ioif_inited = 0;         /* SN I/O infrastructure initialized? */
 
+struct sn_pcibus_provider *sn_pci_provider[PCIIO_ASIC_MAX_TYPES];       /* indexed by asic type */
+
+/*
+ * Hooks and struct for unsupported pci providers
+ */
+
+static dma_addr_t
+sn_default_pci_map(struct pci_dev *pdev, unsigned long paddr, size_t size)
+{
+        return 0;
+}
+
+static void
+sn_default_pci_unmap(struct pci_dev *pdev, dma_addr_t addr, int direction)
+{
+        return;
+}
+
+static void *
+sn_default_pci_bus_fixup(struct pcibus_bussoft *soft)
+{
+        return NULL;
+}
+
+static struct sn_pcibus_provider sn_pci_default_provider = {
+        .dma_map = sn_default_pci_map,
+        .dma_map_consistent = sn_default_pci_map,
+        .dma_unmap = sn_default_pci_unmap,
+        .bus_fixup = sn_default_pci_bus_fixup,
+};
+
 /*
  * Retrieve the DMA Flush List given nasid.  This list is needed 
  * to implement the WAR - Flush DMA data on PIO Reads.
@@ -201,6 +233,7 @@ static void sn_pci_fixup_slot(struct pci_dev *dev)
         struct sn_irq_info *sn_irq_info;
         struct pci_dev *host_pci_dev;
         int status = 0;
+        struct pcibus_bussoft *bs;
 
         dev->sysdata = kmalloc(sizeof(struct pcidev_info), GFP_KERNEL);
         if (SN_PCIDEV_INFO(dev) <= 0)
@@ -241,6 +274,7 @@ static void sn_pci_fixup_slot(struct pci_dev *dev)
         }
 
         /* set up host bus linkages */
+        bs = SN_PCIBUS_BUSSOFT(dev->bus);
         host_pci_dev =
             pci_find_slot(SN_PCIDEV_INFO(dev)->pdi_slot_host_handle >> 32,
                           SN_PCIDEV_INFO(dev)->
@@ -248,10 +282,16 @@ static void sn_pci_fixup_slot(struct pci_dev *dev)
         SN_PCIDEV_INFO(dev)->pdi_host_pcidev_info =
             SN_PCIDEV_INFO(host_pci_dev);
         SN_PCIDEV_INFO(dev)->pdi_linux_pcidev = dev;
-        SN_PCIDEV_INFO(dev)->pdi_pcibus_info = SN_PCIBUS_BUSSOFT(dev->bus);
+        SN_PCIDEV_INFO(dev)->pdi_pcibus_info = bs;
+
+        if (bs && bs->bs_asic_type < PCIIO_ASIC_MAX_TYPES) {
+                SN_PCIDEV_BUSPROVIDER(dev) = sn_pci_provider[bs->bs_asic_type];
+        } else {
+                SN_PCIDEV_BUSPROVIDER(dev) = &sn_pci_default_provider;
+        }
 
         /* Only set up IRQ stuff if this device has a host bus context */
-        if (SN_PCIDEV_BUSSOFT(dev) && sn_irq_info->irq_irq) {
+        if (bs && sn_irq_info->irq_irq) {
                 SN_PCIDEV_INFO(dev)->pdi_sn_irq_info = sn_irq_info;
                 dev->irq = SN_PCIDEV_INFO(dev)->pdi_sn_irq_info->irq_irq;
                 sn_irq_fixup(dev, sn_irq_info);
@@ -271,6 +311,7 @@ static void sn_pci_controller_fixup(int segment, int busnum)
         struct pcibus_bussoft *prom_bussoft_ptr;
         struct hubdev_info *hubdev_info;
         void *provider_soft;
+        struct sn_pcibus_provider *provider;
 
         status =
             sal_get_pcibus_info((u64) segment, (u64) busnum,
@@ -291,16 +332,22 @@ static void sn_pci_controller_fixup(int segment, int busnum)
         /*
          * Per-provider fixup.  Copies the contents from prom to local
          * area and links SN_PCIBUS_BUSSOFT().
-         *
-         * Note:  Provider is responsible for ensuring that prom_bussoft_ptr
-         * represents an asic-type that it can handle.
          */
 
-        if (prom_bussoft_ptr->bs_asic_type == PCIIO_ASIC_TYPE_PPB) {
-                return;         /* no further fixup necessary */
+        if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES) {
+                return;         /* unsupported asic type */
+        }
+
+        provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
+        if (provider == NULL) {
+                return;         /* no provider registerd for this asic */
+        }
+
+        provider_soft = NULL;
+        if (provider->bus_fixup) {
+                provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr);
         }
 
-        provider_soft = pcibr_bus_fixup(prom_bussoft_ptr);
         if (provider_soft == NULL) {
                 return;         /* fixup failed or not applicable */
         }
@@ -339,6 +386,17 @@ static int __init sn_pci_init(void)
                 return 0;
 
         /*
+         * prime sn_pci_provider[].  Individial provider init routines will
+         * override their respective default entries.
+         */
+
+        for (i = 0; i < PCIIO_ASIC_MAX_TYPES; i++)
+                sn_pci_provider[i] = &sn_pci_default_provider;
+
+        pcibr_init_provider();
+        tioca_init_provider();
+
+        /*
          * This is needed to avoid bounce limit checks in the blk layer
          */
         ia64_max_iommu_merge_mask = ~PAGE_MASK;
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 3be44724f6c8..0f4e8138658f 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -13,8 +13,8 @@
 #include <asm/sn/addrs.h>
 #include <asm/sn/arch.h>
 #include "xtalk/xwidgetdev.h"
-#include "pci/pcibus_provider_defs.h"
-#include "pci/pcidev.h"
+#include <asm/sn/pcibus_provider_defs.h>
+#include <asm/sn/pcidev.h>
 #include "pci/pcibr_provider.h"
 #include <asm/sn/shub_mmr.h>
 #include <asm/sn/sn_sal.h>
@@ -82,20 +82,9 @@ static void sn_ack_irq(unsigned int irq)
         nasid = get_nasid();
         event_occurred =
             HUB_L((uint64_t *) GLOBAL_MMR_ADDR(nasid, SH_EVENT_OCCURRED));
-        if (event_occurred & SH_EVENT_OCCURRED_UART_INT_MASK) {
-                mask |= (1 << SH_EVENT_OCCURRED_UART_INT_SHFT);
-        }
-        if (event_occurred & SH_EVENT_OCCURRED_IPI_INT_MASK) {
-                mask |= (1 << SH_EVENT_OCCURRED_IPI_INT_SHFT);
-        }
-        if (event_occurred & SH_EVENT_OCCURRED_II_INT0_MASK) {
-                mask |= (1 << SH_EVENT_OCCURRED_II_INT0_SHFT);
-        }
-        if (event_occurred & SH_EVENT_OCCURRED_II_INT1_MASK) {
-                mask |= (1 << SH_EVENT_OCCURRED_II_INT1_SHFT);
-        }
+        mask = event_occurred & SH_ALL_INT_MASK;
         HUB_S((uint64_t *) GLOBAL_MMR_ADDR(nasid, SH_EVENT_OCCURRED_ALIAS),
-              mask);
+                 mask);
         __set_bit(irq, (volatile void *)pda->sn_in_service_ivecs);
 
         move_irq(irq);
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index f0306b516afb..d35f2a6f9c94 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -29,6 +29,7 @@
 #include <linux/sched.h>
 #include <linux/root_dev.h>
 #include <linux/nodemask.h>
+#include <linux/pm.h>
 
 #include <asm/io.h>
 #include <asm/sal.h>
@@ -353,6 +354,14 @@ void __init sn_setup(char **cmdline_p)
         screen_info = sn_screen_info;
 
         sn_timer_init();
+
+        /*
+         * set pm_power_off to a SAL call to allow
+         * sn machines to power off. The SAL call can be replaced
+         * by an ACPI interface call when ACPI is fully implemented
+         * for sn.
+         */
+        pm_power_off = ia64_sn_power_down;
 }
 
 /**
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 197356460ee1..833e700fdac9 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -28,6 +28,7 @@
 #include <linux/vmalloc.h>
 #include <linux/seq_file.h>
 #include <linux/miscdevice.h>
+#include <linux/utsname.h>
 #include <linux/cpumask.h>
 #include <linux/smp_lock.h>
 #include <linux/nodemask.h>
@@ -43,6 +44,7 @@
 #include <asm/sn/module.h>
 #include <asm/sn/geo.h>
 #include <asm/sn/sn2/sn_hwperf.h>
+#include <asm/sn/addrs.h>
 
 static void *sn_hwperf_salheap = NULL;
 static int sn_hwperf_obj_cnt = 0;
@@ -81,26 +83,45 @@ out:
         return e;
 }
 
+static int sn_hwperf_location_to_bpos(char *location,
+        int *rack, int *bay, int *slot, int *slab)
+{
+        char type;
+
+        /* first scan for an old style geoid string */
+        if (sscanf(location, "%03d%c%02d#%d",
+                rack, &type, bay, slab) == 4)
+                *slot = 0; 
+        else /* scan for a new bladed geoid string */
+        if (sscanf(location, "%03d%c%02d^%02d#%d",
+                rack, &type, bay, slot, slab) != 5)
+                return -1; 
+        /* success */
+        return 0;
+}
+
 static int sn_hwperf_geoid_to_cnode(char *location)
 {
         int cnode;
         geoid_t geoid;
         moduleid_t module_id;
-        char type;
-        int rack, slot, slab;
-        int this_rack, this_slot, this_slab;
+        int rack, bay, slot, slab;
+        int this_rack, this_bay, this_slot, this_slab;
 
-        if (sscanf(location, "%03d%c%02d#%d", &rack, &type, &slot, &slab) != 4)
+        if (sn_hwperf_location_to_bpos(location, &rack, &bay, &slot, &slab))
                 return -1;
 
         for (cnode = 0; cnode < numionodes; cnode++) {
                 geoid = cnodeid_get_geoid(cnode);
                 module_id = geo_module(geoid);
                 this_rack = MODULE_GET_RACK(module_id);
-                this_slot = MODULE_GET_BPOS(module_id);
+                this_bay = MODULE_GET_BPOS(module_id);
+                this_slot = geo_slot(geoid);
                 this_slab = geo_slab(geoid);
-                if (rack == this_rack && slot == this_slot && slab == this_slab)
+                if (rack == this_rack && bay == this_bay &&
+                        slot == this_slot && slab == this_slab) {
                         break;
+                }
         }
 
         return cnode < numionodes ? cnode : -1;
@@ -153,11 +174,36 @@ static const char *sn_hwperf_get_slabname(struct sn_hwperf_object_info *obj,
         return slabname;
 }
 
+static void print_pci_topology(struct seq_file *s,
+        struct sn_hwperf_object_info *obj, int *ordinal,
+        u64 rack, u64 bay, u64 slot, u64 slab)
+{
+        char *p1;
+        char *p2;
+        char *pg;
+
+        if (!(pg = (char *)get_zeroed_page(GFP_KERNEL)))
+                return; /* ignore */
+        if (ia64_sn_ioif_get_pci_topology(rack, bay, slot, slab,
+                __pa(pg), PAGE_SIZE) == SN_HWPERF_OP_OK) {
+                for (p1=pg; *p1 && p1 < pg + PAGE_SIZE;) {
+                        if (!(p2 = strchr(p1, '\n')))
+                                break;
+                        *p2 = '\0';
+                        seq_printf(s, "pcibus %d %s-%s\n",
+                                *ordinal, obj->location, p1);
+                        (*ordinal)++;
+                        p1 = p2 + 1;
+                }
+        }
+        free_page((unsigned long)pg);
+}
+
 static int sn_topology_show(struct seq_file *s, void *d)
 {
         int sz;
         int pt;
-        int e;
+        int e = 0;
         int i;
         int j;
         const char *slabname;
@@ -169,11 +215,44 @@ static int sn_topology_show(struct seq_file *s, void *d)
         struct sn_hwperf_object_info *p;
         struct sn_hwperf_object_info *obj = d;  /* this object */
         struct sn_hwperf_object_info *objs = s->private; /* all objects */
+        int rack, bay, slot, slab;
+        u8 shubtype;
+        u8 system_size;
+        u8 sharing_size;
+        u8 partid;
+        u8 coher;
+        u8 nasid_shift;
+        u8 region_size;
+        u16 nasid_mask;
+        int nasid_msb;
+        int pci_bus_ordinal = 0;
 
         if (obj == objs) {
-                seq_printf(s, "# sn_topology version 1\n");
+                seq_printf(s, "# sn_topology version 2\n");
                 seq_printf(s, "# objtype ordinal location partition"
                         " [attribute value [, ...]]\n");
+
+                if (ia64_sn_get_sn_info(0,
+                        &shubtype, &nasid_mask, &nasid_shift, &system_size,
+                        &sharing_size, &partid, &coher, &region_size))
+                        BUG();
+                for (nasid_msb=63; nasid_msb > 0; nasid_msb--) {
+                        if (((u64)nasid_mask << nasid_shift) & (1ULL << nasid_msb))
+                                break;
+                }
+                seq_printf(s, "partition %u %s local "
+                        "shubtype %s, "
+                        "nasid_mask 0x%016lx, "
+                        "nasid_bits %d:%d, "
+                        "system_size %d, "
+                        "sharing_size %d, "
+                        "coherency_domain %d, "
+                        "region_size %d\n",
+
+                        partid, system_utsname.nodename,
+                        shubtype ? "shub2" : "shub1", 
+                        (u64)nasid_mask << nasid_shift, nasid_msb, nasid_shift,
+                        system_size, sharing_size, coher, region_size);
         }
 
         if (SN_HWPERF_FOREIGN(obj)) {
@@ -181,7 +260,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
                 return 0;
         }
 
-        for (i = 0; obj->name[i]; i++) {
+        for (i = 0; i < SN_HWPERF_MAXSTRING && obj->name[i]; i++) {
                 if (obj->name[i] == ' ')
                         obj->name[i] = '_';
         }
@@ -221,6 +300,17 @@ static int sn_topology_show(struct seq_file *s, void *d)
                                 seq_putc(s, '\n');
                         }
                 }
+
+                /*
+                 * PCI busses attached to this node, if any
+                 */
+                if (sn_hwperf_location_to_bpos(obj->location,
+                        &rack, &bay, &slot, &slab)) {
+                        /* export pci bus info */
+                        print_pci_topology(s, obj, &pci_bus_ordinal,
+                                rack, bay, slot, slab);
+
+                }
         }
 
         if (obj->ports) {
@@ -397,6 +487,9 @@ static int sn_hwperf_map_err(int hwperf_err)
                 break;
 
         case SN_HWPERF_OP_BUSY:
+                e = -EBUSY;
+                break;
+
         case SN_HWPERF_OP_RECONFIGURE:
                 e = -EAGAIN;
                 break;
@@ -549,6 +642,7 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
                 r = sn_hwperf_op_cpu(&op_info);
                 if (r) {
                         r = sn_hwperf_map_err(r);
+                        a.v0 = v0;
                         goto error;
                 }
                 break;
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
new file mode 100644
index 000000000000..66190d7e492d
--- /dev/null
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -0,0 +1,548 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (c) 2005 Silicon Graphics, Inc.  All rights reserved.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/proc_fs.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <asm/uaccess.h>
+#include <asm/sn/sn_sal.h>
+#include <asm/sn/addrs.h>
+#include <asm/sn/io.h>
+#include <asm/sn/types.h>
+#include <asm/sn/shubio.h>
+#include <asm/sn/tiocx.h>
+#include "tio.h"
+#include "xtalk/xwidgetdev.h"
+#include "xtalk/hubdev.h"
+
+#define CX_DEV_NONE 0
+#define DEVICE_NAME "tiocx"
+#define WIDGET_ID 0
+#define TIOCX_DEBUG 0
+
+#if TIOCX_DEBUG
+#define DBG(fmt...)    printk(KERN_ALERT fmt)
+#else
+#define DBG(fmt...)
+#endif
+
+struct device_attribute dev_attr_cxdev_control;
+
+/**
+ * tiocx_match - Try to match driver id list with device.
+ * @dev: device pointer
+ * @drv: driver pointer
+ *
+ * Returns 1 if match, 0 otherwise.
+ */
+static int tiocx_match(struct device *dev, struct device_driver *drv)
+{
+        struct cx_dev *cx_dev = to_cx_dev(dev);
+        struct cx_drv *cx_drv = to_cx_driver(drv);
+        const struct cx_device_id *ids = cx_drv->id_table;
+
+        if (!ids)
+                return 0;
+
+        while (ids->part_num) {
+                if (ids->part_num == cx_dev->cx_id.part_num)
+                        return 1;
+                ids++;
+        }
+        return 0;
+
+}
+
+static int tiocx_hotplug(struct device *dev, char **envp, int num_envp,
+                         char *buffer, int buffer_size)
+{
+        return -ENODEV;
+}
+
+static void tiocx_bus_release(struct device *dev)
+{
+        kfree(to_cx_dev(dev));
+}
+
+struct bus_type tiocx_bus_type = {
+        .name = "tiocx",
+        .match = tiocx_match,
+        .hotplug = tiocx_hotplug,
+};
+
+/**
+ * cx_device_match - Find cx_device in the id table.
+ * @ids: id table from driver
+ * @cx_device: part/mfg id for the device
+ *
+ */
+static const struct cx_device_id *cx_device_match(const struct cx_device_id
+                                                  *ids,
+                                                  struct cx_dev *cx_device)
+{
+        /*
+         * NOTES: We may want to check for CX_ANY_ID too.
+         *        Do we want to match against nasid too?
+         *        CX_DEV_NONE == 0, if the driver tries to register for
+         *        part/mfg == 0 we should return no-match (NULL) here.
+         */
+        while (ids->part_num && ids->mfg_num) {
+                if (ids->part_num == cx_device->cx_id.part_num &&
+                    ids->mfg_num == cx_device->cx_id.mfg_num)
+                        return ids;
+                ids++;
+        }
+
+        return NULL;
+}
+
+/**
+ * cx_device_probe - Look for matching device.
+ *                      Call driver probe routine if found.
+ * @cx_driver: driver table (cx_drv struct) from driver
+ * @cx_device: part/mfg id for the device
+ */
+static int cx_device_probe(struct device *dev)
+{
+        const struct cx_device_id *id;
+        struct cx_drv *cx_drv = to_cx_driver(dev->driver);
+        struct cx_dev *cx_dev = to_cx_dev(dev);
+        int error = 0;
+
+        if (!cx_dev->driver && cx_drv->probe) {
+                id = cx_device_match(cx_drv->id_table, cx_dev);
+                if (id) {
+                        if ((error = cx_drv->probe(cx_dev, id)) < 0)
+                                return error;
+                        else
+                                cx_dev->driver = cx_drv;
+                }
+        }
+
+        return error;
+}
+
+/**
+ * cx_driver_remove - Remove driver from device struct.
+ * @dev: device
+ */
+static int cx_driver_remove(struct device *dev)
+{
+        struct cx_dev *cx_dev = to_cx_dev(dev);
+        struct cx_drv *cx_drv = cx_dev->driver;
+        if (cx_drv->remove)
+                cx_drv->remove(cx_dev);
+        cx_dev->driver = NULL;
+        return 0;
+}
+
+/**
+ * cx_driver_register - Register the driver.
+ * @cx_driver: driver table (cx_drv struct) from driver
+ * 
+ * Called from the driver init routine to register a driver.
+ * The cx_drv struct contains the driver name, a pointer to
+ * a table of part/mfg numbers and a pointer to the driver's
+ * probe/attach routine.
+ */
+int cx_driver_register(struct cx_drv *cx_driver)
+{
+        cx_driver->driver.name = cx_driver->name;
+        cx_driver->driver.bus = &tiocx_bus_type;
+        cx_driver->driver.probe = cx_device_probe;
+        cx_driver->driver.remove = cx_driver_remove;
+
+        return driver_register(&cx_driver->driver);
+}
+
+/**
+ * cx_driver_unregister - Unregister the driver.
+ * @cx_driver: driver table (cx_drv struct) from driver
+ */
+int cx_driver_unregister(struct cx_drv *cx_driver)
+{
+        driver_unregister(&cx_driver->driver);
+        return 0;
+}
+
+/**
+ * cx_device_register - Register a device.
+ * @nasid: device's nasid
+ * @part_num: device's part number
+ * @mfg_num: device's manufacturer number
+ * @hubdev: hub info associated with this device
+ *
+ */
+int
+cx_device_register(nasid_t nasid, int part_num, int mfg_num,
+                   struct hubdev_info *hubdev)
+{
+        struct cx_dev *cx_dev;
+
+        cx_dev = kcalloc(1, sizeof(struct cx_dev), GFP_KERNEL);
+        DBG("cx_dev= 0x%p\n", cx_dev);
+        if (cx_dev == NULL)
+                return -ENOMEM;
+
+        cx_dev->cx_id.part_num = part_num;
+        cx_dev->cx_id.mfg_num = mfg_num;
+        cx_dev->cx_id.nasid = nasid;
+        cx_dev->hubdev = hubdev;
+
+        cx_dev->dev.parent = NULL;
+        cx_dev->dev.bus = &tiocx_bus_type;
+        cx_dev->dev.release = tiocx_bus_release;
+        snprintf(cx_dev->dev.bus_id, BUS_ID_SIZE, "%d.0x%x",
+                 cx_dev->cx_id.nasid, cx_dev->cx_id.part_num);
+        device_register(&cx_dev->dev);
+        get_device(&cx_dev->dev);
+
+        device_create_file(&cx_dev->dev, &dev_attr_cxdev_control);
+
+        return 0;
+}
+
+/**
+ * cx_device_unregister - Unregister a device.
+ * @cx_dev: part/mfg id for the device
+ */
+int cx_device_unregister(struct cx_dev *cx_dev)
+{
+        put_device(&cx_dev->dev);
+        device_unregister(&cx_dev->dev);
+        return 0;
+}
+
+/**
+ * cx_device_reload - Reload the device.
+ * @nasid: device's nasid
+ * @part_num: device's part number
+ * @mfg_num: device's manufacturer number
+ *
+ * Remove the device associated with 'nasid' from device list and then
+ * call device-register with the given part/mfg numbers.
+ */
+static int cx_device_reload(struct cx_dev *cx_dev)
+{
+        device_remove_file(&cx_dev->dev, &dev_attr_cxdev_control);
+        cx_device_unregister(cx_dev);
+        return cx_device_register(cx_dev->cx_id.nasid, cx_dev->cx_id.part_num,
+                                  cx_dev->cx_id.mfg_num, cx_dev->hubdev);
+}
+
+static inline uint64_t tiocx_intr_alloc(nasid_t nasid, int widget,
+                                        u64 sn_irq_info,
+                                        int req_irq, nasid_t req_nasid,
+                                        int req_slice)
+{
+        struct ia64_sal_retval rv;
+        rv.status = 0;
+        rv.v0 = 0;
+
+        ia64_sal_oemcall_nolock(&rv, SN_SAL_IOIF_INTERRUPT,
+                                SAL_INTR_ALLOC, nasid,
+                                widget, sn_irq_info, req_irq,
+                                req_nasid, req_slice);
+        return rv.status;
+}
+
+static inline void tiocx_intr_free(nasid_t nasid, int widget,
+                                   struct sn_irq_info *sn_irq_info)
+{
+        struct ia64_sal_retval rv;
+        rv.status = 0;
+        rv.v0 = 0;
+
+        ia64_sal_oemcall_nolock(&rv, SN_SAL_IOIF_INTERRUPT,
+                                SAL_INTR_FREE, nasid,
+                                widget, sn_irq_info->irq_irq,
+                                sn_irq_info->irq_cookie, 0, 0);
+}
+
+struct sn_irq_info *tiocx_irq_alloc(nasid_t nasid, int widget, int irq,
+                                    nasid_t req_nasid, int slice)
+{
+        struct sn_irq_info *sn_irq_info;
+        int status;
+        int sn_irq_size = sizeof(struct sn_irq_info);
+
+        if ((nasid & 1) == 0)
+                return NULL;
+
+        sn_irq_info = kmalloc(sn_irq_size, GFP_KERNEL);
+        if (sn_irq_info == NULL)
+                return NULL;
+
+        memset(sn_irq_info, 0x0, sn_irq_size);
+
+        status = tiocx_intr_alloc(nasid, widget, __pa(sn_irq_info), irq,
+                                  req_nasid, slice);
+        if (status) {
+                kfree(sn_irq_info);
+                return NULL;
+        } else {
+                return sn_irq_info;
+        }
+}
+
+void tiocx_irq_free(struct sn_irq_info *sn_irq_info)
+{
+        uint64_t bridge = (uint64_t) sn_irq_info->irq_bridge;
+        nasid_t nasid = NASID_GET(bridge);
+        int widget;
+
+        if (nasid & 1) {
+                widget = TIO_SWIN_WIDGETNUM(bridge);
+                tiocx_intr_free(nasid, widget, sn_irq_info);
+                kfree(sn_irq_info);
+        }
+}
+
+uint64_t
+tiocx_dma_addr(uint64_t addr)
+{
+        return PHYS_TO_TIODMA(addr);
+}
+
+uint64_t
+tiocx_swin_base(int nasid)
+{
+        return TIO_SWIN_BASE(nasid, TIOCX_CORELET);
+}
+
+EXPORT_SYMBOL(cx_driver_register);
+EXPORT_SYMBOL(cx_driver_unregister);
+EXPORT_SYMBOL(cx_device_register);
+EXPORT_SYMBOL(cx_device_unregister);
+EXPORT_SYMBOL(tiocx_irq_alloc);
+EXPORT_SYMBOL(tiocx_irq_free);
+EXPORT_SYMBOL(tiocx_bus_type);
+EXPORT_SYMBOL(tiocx_dma_addr);
+EXPORT_SYMBOL(tiocx_swin_base);
+
+static uint64_t tiocx_get_hubdev_info(u64 handle, u64 address)
+{
+
+        struct ia64_sal_retval ret_stuff;
+        ret_stuff.status = 0;
+        ret_stuff.v0 = 0;
+
+        ia64_sal_oemcall_nolock(&ret_stuff,
+                                SN_SAL_IOIF_GET_HUBDEV_INFO,
+                                handle, address, 0, 0, 0, 0, 0);
+        return ret_stuff.v0;
+}
+
+static void tio_conveyor_set(nasid_t nasid, int enable_flag)
+{
+        uint64_t ice_frz;
+        uint64_t disable_cb = (1ull << 61);
+
+        if (!(nasid & 1))
+                return;
+
+        ice_frz = REMOTE_HUB_L(nasid, TIO_ICE_FRZ_CFG);
+        if (enable_flag) {
+                if (!(ice_frz & disable_cb))    /* already enabled */
+                        return;
+                ice_frz &= ~disable_cb;
+        } else {
+                if (ice_frz & disable_cb)       /* already disabled */
+                        return;
+                ice_frz |= disable_cb;
+        }
+        DBG(KERN_ALERT "TIO_ICE_FRZ_CFG= 0x%lx\n", ice_frz);
+        REMOTE_HUB_S(nasid, TIO_ICE_FRZ_CFG, ice_frz);
+}
+
+#define tio_conveyor_enable(nasid) tio_conveyor_set(nasid, 1)
+#define tio_conveyor_disable(nasid) tio_conveyor_set(nasid, 0)
+
+static void tio_corelet_reset(nasid_t nasid, int corelet)
+{
+        if (!(nasid & 1))
+                return;
+
+        REMOTE_HUB_S(nasid, TIO_ICE_PMI_TX_CFG, 1 << corelet);
+        udelay(2000);
+        REMOTE_HUB_S(nasid, TIO_ICE_PMI_TX_CFG, 0);
+        udelay(2000);
+}
+
+static int fpga_attached(nasid_t nasid)
+{
+        uint64_t cx_credits;
+
+        cx_credits = REMOTE_HUB_L(nasid, TIO_ICE_PMI_TX_DYN_CREDIT_STAT_CB3);
+        cx_credits &= TIO_ICE_PMI_TX_DYN_CREDIT_STAT_CB3_CREDIT_CNT_MASK;
+        DBG("cx_credits= 0x%lx\n", cx_credits);
+
+        return (cx_credits == 0xf) ? 1 : 0;
+}
+
+static int tiocx_reload(struct cx_dev *cx_dev)
+{
+        int part_num = CX_DEV_NONE;
+        int mfg_num = CX_DEV_NONE;
+        nasid_t nasid = cx_dev->cx_id.nasid;
+
+        if (fpga_attached(nasid)) {
+                uint64_t cx_id;
+
+                cx_id =
+                    *(volatile int32_t *)(TIO_SWIN_BASE(nasid, TIOCX_CORELET) +
+                                          WIDGET_ID);
+                part_num = XWIDGET_PART_NUM(cx_id);
+                mfg_num = XWIDGET_MFG_NUM(cx_id);
+                DBG("part= 0x%x, mfg= 0x%x\n", part_num, mfg_num);
+                /* just ignore it if it's a CE */
+                if (part_num == TIO_CE_ASIC_PARTNUM)
+                        return 0;
+        }
+
+        cx_dev->cx_id.part_num = part_num;
+        cx_dev->cx_id.mfg_num = mfg_num;
+
+        /*
+         * Delete old device and register the new one.  It's ok if
+         * part_num/mfg_num == CX_DEV_NONE.  We want to register
+         * devices in the table even if a bitstream isn't loaded.
+         * That allows use to see that a bitstream isn't loaded via
+         * TIOCX_IOCTL_DEV_LIST.
+         */
+        return cx_device_reload(cx_dev);
+}
+
+static ssize_t show_cxdev_control(struct device *dev, char *buf)
+{
+        struct cx_dev *cx_dev = to_cx_dev(dev);
+
+        return sprintf(buf, "0x%x 0x%x 0x%x\n",
+                       cx_dev->cx_id.nasid,
+                       cx_dev->cx_id.part_num, cx_dev->cx_id.mfg_num);
+}
+
+static ssize_t store_cxdev_control(struct device *dev, const char *buf,
+                                   size_t count)
+{
+        int n;
+        struct cx_dev *cx_dev = to_cx_dev(dev);
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        if (count <= 0)
+                return 0;
+
+        n = simple_strtoul(buf, NULL, 0);
+
+        switch (n) {
+        case 1:
+                tiocx_reload(cx_dev);
+                break;
+        case 3:
+                tio_corelet_reset(cx_dev->cx_id.nasid, TIOCX_CORELET);
+                break;
+        default:
+                break;
+        }
+
+        return count;
+}
+
+DEVICE_ATTR(cxdev_control, 0644, show_cxdev_control, store_cxdev_control);
+
+static int __init tiocx_init(void)
+{
+        cnodeid_t cnodeid;
+        int found_tiocx_device = 0;
+
+        bus_register(&tiocx_bus_type);
+
+        for (cnodeid = 0; cnodeid < MAX_COMPACT_NODES; cnodeid++) {
+                nasid_t nasid;
+
+                if ((nasid = cnodeid_to_nasid(cnodeid)) < 0)
+                        break;  /* No more nasids .. bail out of loop */
+
+                if (nasid & 0x1) {      /* TIO's are always odd */
+                        struct hubdev_info *hubdev;
+                        uint64_t status;
+                        struct xwidget_info *widgetp;
+
+                        DBG("Found TIO at nasid 0x%x\n", nasid);
+
+                        hubdev =
+                            (struct hubdev_info *)(NODEPDA(cnodeid)->pdinfo);
+                        status =
+                            tiocx_get_hubdev_info(nasid,
+                                                  (uint64_t) __pa(hubdev));
+                        if (status)
+                                continue;
+
+                        widgetp = &hubdev->hdi_xwidget_info[TIOCX_CORELET];
+
+                        /* The CE hangs off of the CX port but is not an FPGA */
+                        if (widgetp->xwi_hwid.part_num == TIO_CE_ASIC_PARTNUM)
+                                continue;
+
+                        tio_corelet_reset(nasid, TIOCX_CORELET);
+                        tio_conveyor_enable(nasid);
+
+                        if (cx_device_register
+                            (nasid, widgetp->xwi_hwid.part_num,
+                             widgetp->xwi_hwid.mfg_num, hubdev) < 0)
+                                return -ENXIO;
+                        else
+                                found_tiocx_device++;
+                }
+        }
+
+        /* It's ok if we find zero devices. */
+        DBG("found_tiocx_device= %d\n", found_tiocx_device);
+
+        return 0;
+}
+
+static void __exit tiocx_exit(void)
+{
+        struct device *dev;
+        struct device *tdev;
+
+        DBG("tiocx_exit\n");
+
+        /*
+         * Unregister devices.
+         */
+        list_for_each_entry_safe(dev, tdev, &tiocx_bus_type.devices.list,
+                                 bus_list) {
+                if (dev) {
+                        struct cx_dev *cx_dev = to_cx_dev(dev);
+                        device_remove_file(dev, &dev_attr_cxdev_control);
+                        cx_device_unregister(cx_dev);
+                }
+        }
+
+        bus_unregister(&tiocx_bus_type);
+}
+
+module_init(tiocx_init);
+module_exit(tiocx_exit);
+
+/************************************************************************
+ * Module licensing and description
+ ************************************************************************/
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Bruce Losure <blosure@sgi.com>");
+MODULE_DESCRIPTION("TIOCX module");
+MODULE_SUPPORTED_DEVICE(DEVICE_NAME);