Merge /spare/repo/linux-2.6/

5 files changed, 516 insertions, 92 deletions

diff --git a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S
index 96cb71d15682..3fa95065a446 100644
--- a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S
+++ b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S
@@ -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 <asm/types.h>
@@ -11,7 +11,7 @@
 
 #define DEADLOCKBIT     SH_PIO_WRITE_STATUS_WRITE_DEADLOCK_SHFT
 #define WRITECOUNTMASK  SH_PIO_WRITE_STATUS_PENDING_WRITE_COUNT_MASK
-#define ALIAS_OFFSET    (SH1_PIO_WRITE_STATUS_0_ALIAS-SH1_PIO_WRITE_STATUS_0)
+#define ALIAS_OFFSET    8
 
 
         .global sn2_ptc_deadlock_recovery_core
@@ -36,13 +36,15 @@ sn2_ptc_deadlock_recovery_core:
         extr.u  piowcphy=piowc,0,61;;   // Convert piowc to uncached physical address
         dep     piowcphy=-1,piowcphy,63,1
         movl    mask=WRITECOUNTMASK
+        mov     r8=r0
 
 1:
         add     scr2=ALIAS_OFFSET,piowc // Address of WRITE_STATUS alias register 
-        mov     scr1=7;;                // Clear DEADLOCK, WRITE_ERROR, MULTI_WRITE_ERROR
-        st8.rel [scr2]=scr1;;
+        ;;
+        ld8.acq scr1=[scr2];;
 
 5:      ld8.acq scr1=[piowc];;          // Wait for PIOs to complete.
+        hint    @pause
         and     scr2=scr1,mask;;        // mask of writecount bits
         cmp.ne  p6,p0=zeroval,scr2
 (p6)    br.cond.sptk 5b
@@ -57,6 +59,7 @@ sn2_ptc_deadlock_recovery_core:
         st8.rel [ptc0]=data0            // Write PTC0 & wait for completion.
 
 5:      ld8.acq scr1=[piowcphy];;       // Wait for PIOs to complete.
+        hint    @pause
         and     scr2=scr1,mask;;        // mask of writecount bits
         cmp.ne  p6,p0=zeroval,scr2
 (p6)    br.cond.sptk 5b;;
@@ -67,6 +70,7 @@ sn2_ptc_deadlock_recovery_core:
 (p7)    st8.rel [ptc1]=data1;;          // Now write PTC1.
 
 5:      ld8.acq scr1=[piowcphy];;       // Wait for PIOs to complete.
+        hint    @pause
         and     scr2=scr1,mask;;        // mask of writecount bits
         cmp.ne  p6,p0=zeroval,scr2
 (p6)    br.cond.sptk 5b
@@ -77,6 +81,7 @@ sn2_ptc_deadlock_recovery_core:
         srlz.i;;
         ////////////// END   PHYSICAL MODE ////////////////////
 
+(p8)    add     r8=1,r8
 (p8)    br.cond.spnt 1b;;               // Repeat if DEADLOCK occurred.
 
         br.ret.sptk     rp
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 7af05a7ac743..0a4ee50c302f 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -5,7 +5,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/init.h>
@@ -20,6 +20,8 @@
 #include <linux/module.h>
 #include <linux/bitops.h>
 #include <linux/nodemask.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 
 #include <asm/processor.h>
 #include <asm/irq.h>
@@ -39,12 +41,120 @@
 #include <asm/sn/nodepda.h>
 #include <asm/sn/rw_mmr.h>
 
-void sn2_ptc_deadlock_recovery(volatile unsigned long *, unsigned long data0, 
-        volatile unsigned long *, unsigned long data1);
+DEFINE_PER_CPU(struct ptc_stats, ptcstats);
+DECLARE_PER_CPU(struct ptc_stats, ptcstats);
 
 static  __cacheline_aligned DEFINE_SPINLOCK(sn2_global_ptc_lock);
 
-static unsigned long sn2_ptc_deadlock_count;
+void sn2_ptc_deadlock_recovery(short *, short, int, volatile unsigned long *, unsigned long data0,
+        volatile unsigned long *, unsigned long data1);
+
+#ifdef DEBUG_PTC
+/*
+ * ptctest:
+ *
+ *      xyz - 3 digit hex number:
+ *              x - Force PTC purges to use shub:
+ *                      0 - no force
+ *                      1 - force
+ *              y - interupt enable
+ *                      0 - disable interrupts
+ *                      1 - leave interuupts enabled
+ *              z - type of lock:
+ *                      0 - global lock
+ *                      1 - node local lock
+ *                      2 - no lock
+ *
+ *      Note: on shub1, only ptctest == 0 is supported. Don't try other values!
+ */
+
+static unsigned int sn2_ptctest = 0;
+
+static int __init ptc_test(char *str)
+{
+        get_option(&str, &sn2_ptctest);
+        return 1;
+}
+__setup("ptctest=", ptc_test);
+
+static inline int ptc_lock(unsigned long *flagp)
+{
+        unsigned long opt = sn2_ptctest & 255;
+
+        switch (opt) {
+        case 0x00:
+                spin_lock_irqsave(&sn2_global_ptc_lock, *flagp);
+                break;
+        case 0x01:
+                spin_lock_irqsave(&sn_nodepda->ptc_lock, *flagp);
+                break;
+        case 0x02:
+                local_irq_save(*flagp);
+                break;
+        case 0x10:
+                spin_lock(&sn2_global_ptc_lock);
+                break;
+        case 0x11:
+                spin_lock(&sn_nodepda->ptc_lock);
+                break;
+        case 0x12:
+                break;
+        default:
+                BUG();
+        }
+        return opt;
+}
+
+static inline void ptc_unlock(unsigned long flags, int opt)
+{
+        switch (opt) {
+        case 0x00:
+                spin_unlock_irqrestore(&sn2_global_ptc_lock, flags);
+                break;
+        case 0x01:
+                spin_unlock_irqrestore(&sn_nodepda->ptc_lock, flags);
+                break;
+        case 0x02:
+                local_irq_restore(flags);
+                break;
+        case 0x10:
+                spin_unlock(&sn2_global_ptc_lock);
+                break;
+        case 0x11:
+                spin_unlock(&sn_nodepda->ptc_lock);
+                break;
+        case 0x12:
+                break;
+        default:
+                BUG();
+        }
+}
+#else
+
+#define sn2_ptctest     0
+
+static inline int ptc_lock(unsigned long *flagp)
+{
+        spin_lock_irqsave(&sn2_global_ptc_lock, *flagp);
+        return 0;
+}
+
+static inline void ptc_unlock(unsigned long flags, int opt)
+{
+        spin_unlock_irqrestore(&sn2_global_ptc_lock, flags);
+}
+#endif
+
+struct ptc_stats {
+        unsigned long ptc_l;
+        unsigned long change_rid;
+        unsigned long shub_ptc_flushes;
+        unsigned long nodes_flushed;
+        unsigned long deadlocks;
+        unsigned long lock_itc_clocks;
+        unsigned long shub_itc_clocks;
+        unsigned long shub_itc_clocks_max;
+};
 
 static inline unsigned long wait_piowc(void)
 {
@@ -89,9 +199,9 @@ void
 sn2_global_tlb_purge(unsigned long start, unsigned long end,
                      unsigned long nbits)
 {
-        int i, shub1, cnode, mynasid, cpu, lcpu = 0, nasid, flushed = 0;
+        int i, opt, shub1, cnode, mynasid, cpu, lcpu = 0, nasid, flushed = 0;
         volatile unsigned long *ptc0, *ptc1;
-        unsigned long flags = 0, data0 = 0, data1 = 0;
+        unsigned long itc, itc2, flags, data0 = 0, data1 = 0;
         struct mm_struct *mm = current->active_mm;
         short nasids[MAX_NUMNODES], nix;
         nodemask_t nodes_flushed;
@@ -114,16 +224,19 @@ sn2_global_tlb_purge(unsigned long start, unsigned long end,
                         start += (1UL << nbits);
                 } while (start < end);
                 ia64_srlz_i();
+                __get_cpu_var(ptcstats).ptc_l++;
                 preempt_enable();
                 return;
         }
 
         if (atomic_read(&mm->mm_users) == 1) {
                 flush_tlb_mm(mm);
+                __get_cpu_var(ptcstats).change_rid++;
                 preempt_enable();
                 return;
         }
 
+        itc = ia64_get_itc();
         nix = 0;
         for_each_node_mask(cnode, nodes_flushed)
                 nasids[nix++] = cnodeid_to_nasid(cnode);
@@ -148,7 +261,12 @@ sn2_global_tlb_purge(unsigned long start, unsigned long end,
 
         mynasid = get_nasid();
 
-        spin_lock_irqsave(&sn2_global_ptc_lock, flags);
+        itc = ia64_get_itc();
+        opt = ptc_lock(&flags);
+        itc2 = ia64_get_itc();
+        __get_cpu_var(ptcstats).lock_itc_clocks += itc2 - itc;
+        __get_cpu_var(ptcstats).shub_ptc_flushes++;
+        __get_cpu_var(ptcstats).nodes_flushed += nix;
 
         do {
                 if (shub1)
@@ -157,7 +275,7 @@ sn2_global_tlb_purge(unsigned long start, unsigned long end,
                         data0 = (data0 & ~SH2_PTC_ADDR_MASK) | (start & SH2_PTC_ADDR_MASK);
                 for (i = 0; i < nix; i++) {
                         nasid = nasids[i];
-                        if (unlikely(nasid == mynasid)) {
+                        if ((!(sn2_ptctest & 3)) && unlikely(nasid == mynasid)) {
                                 ia64_ptcga(start, nbits << 2);
                                 ia64_srlz_i();
                         } else {
@@ -169,18 +287,22 @@ sn2_global_tlb_purge(unsigned long start, unsigned long end,
                                 flushed = 1;
                         }
                 }
-
                 if (flushed
                     && (wait_piowc() &
-                        SH_PIO_WRITE_STATUS_WRITE_DEADLOCK_MASK)) {
-                        sn2_ptc_deadlock_recovery(ptc0, data0, ptc1, data1);
+                                (SH_PIO_WRITE_STATUS_WRITE_DEADLOCK_MASK))) {
+                        sn2_ptc_deadlock_recovery(nasids, nix, mynasid, ptc0, data0, ptc1, data1);
                 }
 
                 start += (1UL << nbits);
 
         } while (start < end);
 
-        spin_unlock_irqrestore(&sn2_global_ptc_lock, flags);
+        itc2 = ia64_get_itc() - itc2;
+        __get_cpu_var(ptcstats).shub_itc_clocks += itc2;
+        if (itc2 > __get_cpu_var(ptcstats).shub_itc_clocks_max)
+                __get_cpu_var(ptcstats).shub_itc_clocks_max = itc2;
+
+        ptc_unlock(flags, opt);
 
         preempt_enable();
 }
@@ -192,31 +314,29 @@ sn2_global_tlb_purge(unsigned long start, unsigned long end,
  * TLB flush transaction.  The recovery sequence is somewhat tricky & is
  * coded in assembly language.
  */
-void sn2_ptc_deadlock_recovery(volatile unsigned long *ptc0, unsigned long data0,
+void sn2_ptc_deadlock_recovery(short *nasids, short nix, int mynasid, volatile unsigned long *ptc0, unsigned long data0,
         volatile unsigned long *ptc1, unsigned long data1)
 {
         extern void sn2_ptc_deadlock_recovery_core(volatile unsigned long *, unsigned long,
                 volatile unsigned long *, unsigned long, volatile unsigned long *, unsigned long);
-        int cnode, mycnode, nasid;
-        volatile unsigned long *piows;
-        volatile unsigned long zeroval;
+        short nasid, i;
+        unsigned long *piows, zeroval;
 
-        sn2_ptc_deadlock_count++;
+        __get_cpu_var(ptcstats).deadlocks++;
 
-        piows = pda->pio_write_status_addr;
+        piows = (unsigned long *) pda->pio_write_status_addr;
         zeroval = pda->pio_write_status_val;
 
-        mycnode = numa_node_id();
-
-        for_each_online_node(cnode) {
-                if (is_headless_node(cnode) || cnode == mycnode)
+        for (i=0; i < nix; i++) {
+                nasid = nasids[i];
+                if (!(sn2_ptctest & 3) && nasid == mynasid)
                         continue;
-                nasid = cnodeid_to_nasid(cnode);
                 ptc0 = CHANGE_NASID(nasid, ptc0);
                 if (ptc1)
                         ptc1 = CHANGE_NASID(nasid, ptc1);
                 sn2_ptc_deadlock_recovery_core(ptc0, data0, ptc1, data1, piows, zeroval);
         }
+
 }
 
 /**
@@ -293,3 +413,93 @@ void sn2_send_IPI(int cpuid, int vector, int delivery_mode, int redirect)
 
         sn_send_IPI_phys(nasid, physid, vector, delivery_mode);
 }
+
+#ifdef CONFIG_PROC_FS
+
+#define PTC_BASENAME    "sgi_sn/ptc_statistics"
+
+static void *sn2_ptc_seq_start(struct seq_file *file, loff_t * offset)
+{
+        if (*offset < NR_CPUS)
+                return offset;
+        return NULL;
+}
+
+static void *sn2_ptc_seq_next(struct seq_file *file, void *data, loff_t * offset)
+{
+        (*offset)++;
+        if (*offset < NR_CPUS)
+                return offset;
+        return NULL;
+}
+
+static void sn2_ptc_seq_stop(struct seq_file *file, void *data)
+{
+}
+
+static int sn2_ptc_seq_show(struct seq_file *file, void *data)
+{
+        struct ptc_stats *stat;
+        int cpu;
+
+        cpu = *(loff_t *) data;
+
+        if (!cpu) {
+                seq_printf(file, "# ptc_l change_rid shub_ptc_flushes shub_nodes_flushed deadlocks lock_nsec shub_nsec shub_nsec_max\n");
+                seq_printf(file, "# ptctest %d\n", sn2_ptctest);
+        }
+
+        if (cpu < NR_CPUS && cpu_online(cpu)) {
+                stat = &per_cpu(ptcstats, cpu);
+                seq_printf(file, "cpu %d %ld %ld %ld %ld %ld %ld %ld %ld\n", cpu, stat->ptc_l,
+                                stat->change_rid, stat->shub_ptc_flushes, stat->nodes_flushed,
+                                stat->deadlocks,
+                                1000 * stat->lock_itc_clocks / per_cpu(cpu_info, cpu).cyc_per_usec,
+                                1000 * stat->shub_itc_clocks / per_cpu(cpu_info, cpu).cyc_per_usec,
+                                1000 * stat->shub_itc_clocks_max / per_cpu(cpu_info, cpu).cyc_per_usec);
+        }
+
+        return 0;
+}
+
+static struct seq_operations sn2_ptc_seq_ops = {
+        .start = sn2_ptc_seq_start,
+        .next = sn2_ptc_seq_next,
+        .stop = sn2_ptc_seq_stop,
+        .show = sn2_ptc_seq_show
+};
+
+int sn2_ptc_proc_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &sn2_ptc_seq_ops);
+}
+
+static struct file_operations proc_sn2_ptc_operations = {
+        .open = sn2_ptc_proc_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = seq_release,
+};
+
+static struct proc_dir_entry *proc_sn2_ptc;
+
+static int __init sn2_ptc_init(void)
+{
+        if (!(proc_sn2_ptc = create_proc_entry(PTC_BASENAME, 0444, NULL))) {
+                printk(KERN_ERR "unable to create %s proc entry", PTC_BASENAME);
+                return -EINVAL;
+        }
+        proc_sn2_ptc->proc_fops = &proc_sn2_ptc_operations;
+        spin_lock_init(&sn2_global_ptc_lock);
+        return 0;
+}
+
+static void __exit sn2_ptc_exit(void)
+{
+        remove_proc_entry(PTC_BASENAME, NULL);
+}
+
+module_init(sn2_ptc_init);
+module_exit(sn2_ptc_exit);
+#endif /* CONFIG_PROC_FS */
+
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 833e700fdac9..0513aacac8c1 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -36,7 +36,6 @@
 #include <asm/topology.h>
 #include <asm/smp.h>
 #include <asm/semaphore.h>
-#include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <asm/sal.h>
 #include <asm/sn/io.h>
@@ -59,7 +58,7 @@ static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret)
         struct sn_hwperf_object_info *objbuf = NULL;
 
         if ((e = sn_hwperf_init()) < 0) {
-                printk("sn_hwperf_init failed: err %d\n", e);
+                printk(KERN_ERR "sn_hwperf_init failed: err %d\n", e);
                 goto out;
         }
 
@@ -111,7 +110,7 @@ static int sn_hwperf_geoid_to_cnode(char *location)
         if (sn_hwperf_location_to_bpos(location, &rack, &bay, &slot, &slab))
                 return -1;
 
-        for (cnode = 0; cnode < numionodes; cnode++) {
+        for_each_node(cnode) {
                 geoid = cnodeid_get_geoid(cnode);
                 module_id = geo_module(geoid);
                 this_rack = MODULE_GET_RACK(module_id);
@@ -124,11 +123,13 @@ static int sn_hwperf_geoid_to_cnode(char *location)
                 }
         }
 
-        return cnode < numionodes ? cnode : -1;
+        return node_possible(cnode) ? cnode : -1;
 }
 
 static int sn_hwperf_obj_to_cnode(struct sn_hwperf_object_info * obj)
 {
+        if (!SN_HWPERF_IS_NODE(obj) && !SN_HWPERF_IS_IONODE(obj))
+                BUG();
         if (!obj->sn_hwp_this_part)
                 return -1;
         return sn_hwperf_geoid_to_cnode(obj->location);
@@ -174,31 +175,199 @@ 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)
+static void print_pci_topology(struct seq_file *s)
+{
+        char *p;
+        size_t sz;
+        int e;
+
+        for (sz = PAGE_SIZE; sz < 16 * PAGE_SIZE; sz += PAGE_SIZE) {
+                if (!(p = (char *)kmalloc(sz, GFP_KERNEL)))
+                        break;
+                e = ia64_sn_ioif_get_pci_topology(__pa(p), sz);
+                if (e == SALRET_OK)
+                        seq_puts(s, p);
+                kfree(p);
+                if (e == SALRET_OK || e == SALRET_NOT_IMPLEMENTED)
+                        break;
+        }
+}
+
+static inline int sn_hwperf_has_cpus(cnodeid_t node)
+{
+        return node_online(node) && nr_cpus_node(node);
+}
+
+static inline int sn_hwperf_has_mem(cnodeid_t node)
+{
+        return node_online(node) && NODE_DATA(node)->node_present_pages;
+}
+
+static struct sn_hwperf_object_info *
+sn_hwperf_findobj_id(struct sn_hwperf_object_info *objbuf,
+        int nobj, int id)
 {
-        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')))
+        int i;
+        struct sn_hwperf_object_info *p = objbuf;
+
+        for (i=0; i < nobj; i++, p++) {
+                if (p->id == id)
+                        return p;
+        }
+
+        return NULL;
+
+}
+
+static int sn_hwperf_get_nearest_node_objdata(struct sn_hwperf_object_info *objbuf,
+        int nobj, cnodeid_t node, cnodeid_t *near_mem_node, cnodeid_t *near_cpu_node)
+{
+        int e;
+        struct sn_hwperf_object_info *nodeobj = NULL;
+        struct sn_hwperf_object_info *op;
+        struct sn_hwperf_object_info *dest;
+        struct sn_hwperf_object_info *router;
+        struct sn_hwperf_port_info ptdata[16];
+        int sz, i, j;
+        cnodeid_t c;
+        int found_mem = 0;
+        int found_cpu = 0;
+
+        if (!node_possible(node))
+                return -EINVAL;
+
+        if (sn_hwperf_has_cpus(node)) {
+                if (near_cpu_node)
+                        *near_cpu_node = node;
+                found_cpu++;
+        }
+
+        if (sn_hwperf_has_mem(node)) {
+                if (near_mem_node)
+                        *near_mem_node = node;
+                found_mem++;
+        }
+
+        if (found_cpu && found_mem)
+                return 0; /* trivially successful */
+
+        /* find the argument node object */
+        for (i=0, op=objbuf; i < nobj; i++, op++) {
+                if (!SN_HWPERF_IS_NODE(op) && !SN_HWPERF_IS_IONODE(op))
+                        continue;
+                if (node == sn_hwperf_obj_to_cnode(op)) {
+                        nodeobj = op;
+                        break;
+                }
+        }
+        if (!nodeobj) {
+                e = -ENOENT;
+                goto err;
+        }
+
+        /* get it's interconnect topology */
+        sz = op->ports * sizeof(struct sn_hwperf_port_info);
+        if (sz > sizeof(ptdata))
+                BUG();
+        e = ia64_sn_hwperf_op(sn_hwperf_master_nasid,
+                              SN_HWPERF_ENUM_PORTS, nodeobj->id, sz,
+                              (u64)&ptdata, 0, 0, NULL);
+        if (e != SN_HWPERF_OP_OK) {
+                e = -EINVAL;
+                goto err;
+        }
+
+        /* find nearest node with cpus and nearest memory */
+        for (router=NULL, j=0; j < op->ports; j++) {
+                dest = sn_hwperf_findobj_id(objbuf, nobj, ptdata[j].conn_id);
+                if (!dest || SN_HWPERF_FOREIGN(dest) ||
+                    !SN_HWPERF_IS_NODE(dest) || SN_HWPERF_IS_IONODE(dest)) {
+                        continue;
+                }
+                c = sn_hwperf_obj_to_cnode(dest);
+                if (!found_cpu && sn_hwperf_has_cpus(c)) {
+                        if (near_cpu_node)
+                                *near_cpu_node = c;
+                        found_cpu++;
+                }
+                if (!found_mem && sn_hwperf_has_mem(c)) {
+                        if (near_mem_node)
+                                *near_mem_node = c;
+                        found_mem++;
+                }
+                if (SN_HWPERF_IS_ROUTER(dest))
+                        router = dest;
+        }
+
+        if (router && (!found_cpu || !found_mem)) {
+                /* search for a node connected to the same router */
+                sz = router->ports * sizeof(struct sn_hwperf_port_info);
+                if (sz > sizeof(ptdata))
+                        BUG();
+                e = ia64_sn_hwperf_op(sn_hwperf_master_nasid,
+                                      SN_HWPERF_ENUM_PORTS, router->id, sz,
+                                      (u64)&ptdata, 0, 0, NULL);
+                if (e != SN_HWPERF_OP_OK) {
+                        e = -EINVAL;
+                        goto err;
+                }
+                for (j=0; j < router->ports; j++) {
+                        dest = sn_hwperf_findobj_id(objbuf, nobj,
+                                ptdata[j].conn_id);
+                        if (!dest || dest->id == node ||
+                            SN_HWPERF_FOREIGN(dest) ||
+                            !SN_HWPERF_IS_NODE(dest) ||
+                            SN_HWPERF_IS_IONODE(dest)) {
+                                continue;
+                        }
+                        c = sn_hwperf_obj_to_cnode(dest);
+                        if (!found_cpu && sn_hwperf_has_cpus(c)) {
+                                if (near_cpu_node)
+                                        *near_cpu_node = c;
+                                found_cpu++;
+                        }
+                        if (!found_mem && sn_hwperf_has_mem(c)) {
+                                if (near_mem_node)
+                                        *near_mem_node = c;
+                                found_mem++;
+                        }
+                        if (found_cpu && found_mem)
+                                break;
+                }
+        }
+
+        if (!found_cpu || !found_mem) {
+                /* resort to _any_ node with CPUs and memory */
+                for (i=0, op=objbuf; i < nobj; i++, op++) {
+                        if (SN_HWPERF_FOREIGN(op) ||
+                            SN_HWPERF_IS_IONODE(op) ||
+                            !SN_HWPERF_IS_NODE(op)) {
+                                continue;
+                        }
+                        c = sn_hwperf_obj_to_cnode(op);
+                        if (!found_cpu && sn_hwperf_has_cpus(c)) {
+                                if (near_cpu_node)
+                                        *near_cpu_node = c;
+                                found_cpu++;
+                        }
+                        if (!found_mem && sn_hwperf_has_mem(c)) {
+                                if (near_mem_node)
+                                        *near_mem_node = c;
+                                found_mem++;
+                        }
+                        if (found_cpu && found_mem)
                                 break;
-                        *p2 = '\0';
-                        seq_printf(s, "pcibus %d %s-%s\n",
-                                *ordinal, obj->location, p1);
-                        (*ordinal)++;
-                        p1 = p2 + 1;
                 }
         }
-        free_page((unsigned long)pg);
+
+        if (!found_cpu || !found_mem)
+                e = -ENODATA;
+
+err:
+        return e;
 }
 
+
 static int sn_topology_show(struct seq_file *s, void *d)
 {
         int sz;
@@ -215,7 +384,6 @@ 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;
@@ -225,7 +393,6 @@ static int sn_topology_show(struct seq_file *s, void *d)
         u8 region_size;
         u16 nasid_mask;
         int nasid_msb;
-        int pci_bus_ordinal = 0;
 
         if (obj == objs) {
                 seq_printf(s, "# sn_topology version 2\n");
@@ -253,6 +420,8 @@ static int sn_topology_show(struct seq_file *s, void *d)
                         shubtype ? "shub2" : "shub1", 
                         (u64)nasid_mask << nasid_shift, nasid_msb, nasid_shift,
                         system_size, sharing_size, coher, region_size);
+
+                print_pci_topology(s);
         }
 
         if (SN_HWPERF_FOREIGN(obj)) {
@@ -272,11 +441,24 @@ static int sn_topology_show(struct seq_file *s, void *d)
         if (!SN_HWPERF_IS_NODE(obj) && !SN_HWPERF_IS_IONODE(obj))
                 seq_putc(s, '\n');
         else {
+                cnodeid_t near_mem = -1;
+                cnodeid_t near_cpu = -1;
+
                 seq_printf(s, ", nasid 0x%x", cnodeid_to_nasid(ordinal));
-                for (i=0; i < numionodes; i++) {
-                        seq_printf(s, i ? ":%d" : ", dist %d",
-                                node_distance(ordinal, i));
+
+                if (sn_hwperf_get_nearest_node_objdata(objs, sn_hwperf_obj_cnt,
+                        ordinal, &near_mem, &near_cpu) == 0) {
+                        seq_printf(s, ", near_mem_nodeid %d, near_cpu_nodeid %d",
+                                near_mem, near_cpu);
+                }
+
+                if (!SN_HWPERF_IS_IONODE(obj)) {
+                        for_each_online_node(i) {
+                                seq_printf(s, i ? ":%d" : ", dist %d",
+                                        node_distance(ordinal, i));
+                        }
                 }
+
                 seq_putc(s, '\n');
 
                 /*
@@ -300,17 +482,6 @@ 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) {
@@ -572,6 +743,8 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
                 if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 0) {
                         memset(p, 0, a.sz);
                         for (i = 0; i < nobj; i++) {
+                                if (!SN_HWPERF_IS_NODE(objs + i))
+                                        continue;
                                 node = sn_hwperf_obj_to_cnode(objs + i);
                                 for_each_online_cpu(j) {
                                         if (node != cpu_to_node(j))
@@ -598,7 +771,7 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
 
         case SN_HWPERF_GET_NODE_NASID:
                 if (a.sz != sizeof(u64) ||
-                   (node = a.arg) < 0 || node >= numionodes) {
+                   (node = a.arg) < 0 || !node_possible(node)) {
                         r = -EINVAL;
                         goto error;
                 }
@@ -627,6 +800,14 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
                                 vfree(objs);
                                 goto error;
                         }
+
+                        if (!SN_HWPERF_IS_NODE(objs + i) &&
+                            !SN_HWPERF_IS_IONODE(objs + i)) {
+                                r = -ENOENT;
+                                vfree(objs);
+                                goto error;
+                        }
+
                         *(u64 *)p = (u64)sn_hwperf_obj_to_cnode(objs + i);
                         vfree(objs);
                 }
@@ -692,6 +873,7 @@ static int sn_hwperf_init(void)
 
         /* single threaded, once-only initialization */
         down(&sn_hwperf_init_mutex);
+
         if (sn_hwperf_salheap) {
                 up(&sn_hwperf_init_mutex);
                 return e;
@@ -742,19 +924,6 @@ out:
                 sn_hwperf_salheap = NULL;
                 sn_hwperf_obj_cnt = 0;
         }
-
-        if (!e) {
-                /*
-                 * Register a dynamic misc device for ioctl. Platforms
-                 * supporting hotplug will create /dev/sn_hwperf, else
-                 * user can to look up the minor number in /proc/misc.
-                 */
-                if ((e = misc_register(&sn_hwperf_dev)) != 0) {
-                        printk(KERN_ERR "sn_hwperf_init: misc register "
-                               "for \"sn_hwperf\" failed, err %d\n", e);
-                }
-        }
-
         up(&sn_hwperf_init_mutex);
         return e;
 }
@@ -782,3 +951,41 @@ int sn_topology_release(struct inode *inode, struct file *file)
         vfree(seq->private);
         return seq_release(inode, file);
 }
+
+int sn_hwperf_get_nearest_node(cnodeid_t node,
+        cnodeid_t *near_mem_node, cnodeid_t *near_cpu_node)
+{
+        int e;
+        int nobj;
+        struct sn_hwperf_object_info *objbuf;
+
+        if ((e = sn_hwperf_enum_objects(&nobj, &objbuf)) == 0) {
+                e = sn_hwperf_get_nearest_node_objdata(objbuf, nobj,
+                        node, near_mem_node, near_cpu_node);
+                vfree(objbuf);
+        }
+
+        return e;
+}
+
+static int __devinit sn_hwperf_misc_register_init(void)
+{
+        int e;
+
+        sn_hwperf_init();
+
+        /*
+         * Register a dynamic misc device for hwperf ioctls. Platforms
+         * supporting hotplug will create /dev/sn_hwperf, else user
+         * can to look up the minor number in /proc/misc.
+         */
+        if ((e = misc_register(&sn_hwperf_dev)) != 0) {
+                printk(KERN_ERR "sn_hwperf_misc_register_init: failed to "
+                "register misc device for \"%s\"\n", sn_hwperf_dev.name);
+        }
+
+        return e;
+}
+
+device_initcall(sn_hwperf_misc_register_init); /* after misc_init() */
+EXPORT_SYMBOL(sn_hwperf_get_nearest_node);
diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
index 6a80fca807b9..51bf82720d99 100644
--- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.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/config.h>
 #include <asm/uaccess.h>
@@ -15,7 +15,7 @@
 
 static int partition_id_show(struct seq_file *s, void *p)
 {
-        seq_printf(s, "%d\n", sn_local_partid());
+        seq_printf(s, "%d\n", sn_partition_id);
         return 0;
 }
 
diff --git a/arch/ia64/sn/kernel/sn2/timer_interrupt.c b/arch/ia64/sn/kernel/sn2/timer_interrupt.c
index cde7375390b0..adf5db2e2afe 100644
--- a/arch/ia64/sn/kernel/sn2/timer_interrupt.c
+++ b/arch/ia64/sn/kernel/sn2/timer_interrupt.c
@@ -1,7 +1,7 @@
 /*
  *
  *
- * Copyright (c) 2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2005 Silicon Graphics, Inc.  All Rights Reserved.
  * 
  * This program is free software; you can redistribute it and/or modify it 
  * under the terms of version 2 of the GNU General Public License 
@@ -50,14 +50,16 @@ void sn_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                              LED_CPU_HEARTBEAT, LED_CPU_HEARTBEAT);
         }
 
-        if (enable_shub_wars_1_1()) {
-                /* Bugfix code for SHUB 1.1 */
-                if (pda->pio_shub_war_cam_addr)
-                        *pda->pio_shub_war_cam_addr = 0x8000000000000010UL;
+        if (is_shub1()) {
+                if (enable_shub_wars_1_1()) {
+                        /* Bugfix code for SHUB 1.1 */
+                        if (pda->pio_shub_war_cam_addr)
+                                *pda->pio_shub_war_cam_addr = 0x8000000000000010UL;
+                }
+                if (pda->sn_lb_int_war_ticks == 0)
+                        sn_lb_int_war_check();
+                pda->sn_lb_int_war_ticks++;
+                if (pda->sn_lb_int_war_ticks >= SN_LB_INT_WAR_INTERVAL)
+                        pda->sn_lb_int_war_ticks = 0;
         }
-        if (pda->sn_lb_int_war_ticks == 0)
-                sn_lb_int_war_check();
-        pda->sn_lb_int_war_ticks++;
-        if (pda->sn_lb_int_war_ticks >= SN_LB_INT_WAR_INTERVAL)
-                pda->sn_lb_int_war_ticks = 0;
 }