[IA64-SGI] Altix SN add support for slots in geoid_t locator

This patch against ia64-test-2.6.12 is needed for forthcoming
Altix chipsets. It renames geoid_any_t to geoid_common_t and
splits the 8bit 'slab' field into two 4bit fields for 'slab'
and 'slot'. Similar changes in the Altix SAL will retain backward
compatibility for old kernels.

Signed-off-by: Mark Goodwin <markgw@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

4 files changed, 55 insertions, 68 deletions

diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index e731fcb95f90..833e700fdac9 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -116,7 +116,7 @@ static int sn_hwperf_geoid_to_cnode(char *location)
                 module_id = geo_module(geoid);
                 this_rack = MODULE_GET_RACK(module_id);
                 this_bay = MODULE_GET_BPOS(module_id);
-                this_slot = 0; /* XXX */
+                this_slot = geo_slot(geoid);
                 this_slab = geo_slab(geoid);
                 if (rack == this_rack && bay == this_bay &&
                         slot == this_slot && slab == this_slab) {
@@ -176,20 +176,27 @@ static const char *sn_hwperf_get_slabname(struct sn_hwperf_object_info *obj,
 
 static void print_pci_topology(struct seq_file *s,
         struct sn_hwperf_object_info *obj, int *ordinal,
-        char *pci_topo_buf, int len)
+        u64 rack, u64 bay, u64 slot, u64 slab)
 {
         char *p1;
         char *p2;
-
-        for (p1=pci_topo_buf; *p1 && p1 < pci_topo_buf + len;) {
-                if (!(p2 = strchr(p1, '\n')))
-                        break;
-                *p2 = '\0';
-                seq_printf(s, "pcibus %d %s-%s\n",
-                        *ordinal, obj->location, p1);
-                (*ordinal)++;
-                p1 = p2 + 1;
+        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)
@@ -218,9 +225,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
         u8 region_size;
         u16 nasid_mask;
         int nasid_msb;
-        char *pci_topo_buf;
         int pci_bus_ordinal = 0;
-        static int pci_topo_buf_len = 256;
 
         if (obj == objs) {
                 seq_printf(s, "# sn_topology version 2\n");
@@ -299,41 +304,13 @@ static int sn_topology_show(struct seq_file *s, void *d)
                 /*
                  * PCI busses attached to this node, if any
                  */
-                do {
-                        if (sn_hwperf_location_to_bpos(obj->location,
-                                &rack, &bay, &slot, &slab)) {
-                                break;
-                        }
-
-                        if (!(pci_topo_buf = vmalloc(pci_topo_buf_len))) {
-                                printk("sn_topology_show: vmalloc failed\n");
-                                break;
-                        }
+                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);
 
-                        e = ia64_sn_ioif_get_pci_topology(rack, bay, slot, slab,
-                                pci_topo_buf, pci_topo_buf_len);
-
-                        switch (e) {
-                        case SALRET_NOT_IMPLEMENTED:
-                        case SALRET_INVALID_ARG:
-                                /* ignore, don't print anything */
-                                e = SN_HWPERF_OP_OK;
-                                break;
-
-                        case SALRET_ERROR:
-                                /* retry with a bigger buffer */ 
-                                pci_topo_buf_len += 256;
-                                break;
-
-                        case SN_HWPERF_OP_OK:
-                        default:
-                                /* export pci bus info */
-                                print_pci_topology(s, obj, &pci_bus_ordinal,
-                                        pci_topo_buf, pci_topo_buf_len);
-                                break;
-                        }
-                        vfree(pci_topo_buf);
-                } while (e != SN_HWPERF_OP_OK && pci_topo_buf_len < 0x200000);
+                }
         }
 
         if (obj->ports) {
diff --git a/include/asm-ia64/sn/geo.h b/include/asm-ia64/sn/geo.h
index f566343d25f8..84b254603b8d 100644
--- a/include/asm-ia64/sn/geo.h
+++ b/include/asm-ia64/sn/geo.h
@@ -18,32 +18,34 @@
 #define GEOID_SIZE      8       /* Would 16 be better?  The size can
                                    be different on different platforms. */
 
-#define MAX_SLABS       0xe     /* slabs per module */
+#define MAX_SLOTS       0xf     /* slots per module */
+#define MAX_SLABS       0xf     /* slabs per slot */
 
 typedef unsigned char   geo_type_t;
 
 /* Fields common to all substructures */
-typedef struct geo_any_s {
+typedef struct geo_common_s {
     moduleid_t  module;         /* The module (box) this h/w lives in */
     geo_type_t  type;           /* What type of h/w is named by this geoid_t */
-    slabid_t    slab;           /* The logical assembly within the module */
-} geo_any_t;
+    slabid_t    slab:4;         /* slab (ASIC), 0 .. 15 within slot */
+    slotid_t    slot:4;         /* slot (Blade), 0 .. 15 within module */
+} geo_common_t;
 
 /* Additional fields for particular types of hardware */
 typedef struct geo_node_s {
-    geo_any_t   any;            /* No additional fields needed */
+    geo_common_t        common;         /* No additional fields needed */
 } geo_node_t;
 
 typedef struct geo_rtr_s {
-    geo_any_t   any;            /* No additional fields needed */
+    geo_common_t        common;         /* No additional fields needed */
 } geo_rtr_t;
 
 typedef struct geo_iocntl_s {
-    geo_any_t   any;            /* No additional fields needed */
+    geo_common_t        common;         /* No additional fields needed */
 } geo_iocntl_t;
 
 typedef struct geo_pcicard_s {
-    geo_iocntl_t        any;
+    geo_iocntl_t        common;
     char                bus;    /* Bus/widget number */
     char                slot;   /* PCI slot number */
 } geo_pcicard_t;
@@ -62,14 +64,14 @@ typedef struct geo_mem_s {
 
 
 typedef union geoid_u {
-    geo_any_t   any;
-    geo_node_t  node;
+    geo_common_t        common;
+    geo_node_t          node;
     geo_iocntl_t        iocntl;
     geo_pcicard_t       pcicard;
-    geo_rtr_t   rtr;
-    geo_cpu_t   cpu;
-    geo_mem_t   mem;
-    char        padsize[GEOID_SIZE];
+    geo_rtr_t           rtr;
+    geo_cpu_t           cpu;
+    geo_mem_t           mem;
+    char                padsize[GEOID_SIZE];
 } geoid_t;
 
 
@@ -104,19 +106,26 @@ typedef union geoid_u {
 #define INVALID_CNODEID         ((cnodeid_t)-1)
 #define INVALID_PNODEID         ((pnodeid_t)-1)
 #define INVALID_SLAB            (slabid_t)-1
+#define INVALID_SLOT            (slotid_t)-1
 #define INVALID_MODULE          ((moduleid_t)-1)
 #define INVALID_PARTID          ((partid_t)-1)
 
 static inline slabid_t geo_slab(geoid_t g)
 {
-        return (g.any.type == GEO_TYPE_INVALID) ?
-                INVALID_SLAB : g.any.slab;
+        return (g.common.type == GEO_TYPE_INVALID) ?
+                INVALID_SLAB : g.common.slab;
+}
+
+static inline slotid_t geo_slot(geoid_t g)
+{
+        return (g.common.type == GEO_TYPE_INVALID) ?
+                INVALID_SLOT : g.common.slot;
 }
 
 static inline moduleid_t geo_module(geoid_t g)
 {
-        return (g.any.type == GEO_TYPE_INVALID) ?
-                INVALID_MODULE : g.any.module;
+        return (g.common.type == GEO_TYPE_INVALID) ?
+                INVALID_MODULE : g.common.module;
 }
 
 extern geoid_t cnodeid_get_geoid(cnodeid_t cnode);
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index 581f9a783045..123c1a50a9dc 100644
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -74,10 +74,10 @@
 #define  SN_SAL_IOIF_GET_PCIBUS_INFO               0x02000056
 #define  SN_SAL_IOIF_GET_PCIDEV_INFO               0x02000057
 #define  SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST      0x02000058
-#define  SN_SAL_IOIF_GET_PCI_TOPOLOGY              0x02000059
 
 #define SN_SAL_HUB_ERROR_INTERRUPT                 0x02000060
 #define SN_SAL_BTE_RECOVER                         0x02000061
+#define SN_SAL_IOIF_GET_PCI_TOPOLOGY               0x02000062
 
 /*
  * Service-specific constants
@@ -1015,7 +1015,7 @@ ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2,
 
 static inline int
 ia64_sn_ioif_get_pci_topology(u64 rack, u64 bay, u64 slot, u64 slab,
-                              char *buf, u64 len)
+                              u64 buf, u64 len)
 {
         struct ia64_sal_retval rv;
         SAL_CALL_NOLOCK(rv, SN_SAL_IOIF_GET_PCI_TOPOLOGY,
diff --git a/include/asm-ia64/sn/types.h b/include/asm-ia64/sn/types.h
index 586ed47cae9c..8e04ee211e59 100644
--- a/include/asm-ia64/sn/types.h
+++ b/include/asm-ia64/sn/types.h
@@ -16,7 +16,8 @@ typedef signed short	nasid_t;	/* node id in numa-as-id space */
 typedef signed char     partid_t;       /* partition ID type */
 typedef unsigned int    moduleid_t;     /* user-visible module number type */
 typedef unsigned int    cmoduleid_t;    /* kernel compact module id type */
-typedef signed char     slabid_t;
+typedef unsigned char   slotid_t;       /* slot (blade) within module */
+typedef unsigned char   slabid_t;       /* slab (asic) within slot */
 typedef u64 nic_t;
 typedef unsigned long iopaddr_t;
 typedef unsigned long paddr_t;