1 files changed, 6 insertions, 54 deletions

diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index 27976d223186..e67825ad1930 100644
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -55,7 +55,6 @@
 #define  SN_SAL_BUS_CONFIG                         0x02000037
 #define  SN_SAL_SYS_SERIAL_GET                     0x02000038
 #define  SN_SAL_PARTITION_SERIAL_GET               0x02000039
-#define  SN_SAL_SYSCTL_PARTITION_GET               0x0200003a
 #define  SN_SAL_SYSTEM_POWER_DOWN                  0x0200003b
 #define  SN_SAL_GET_MASTER_BASEIO_NASID            0x0200003c
 #define  SN_SAL_COHERENCE                          0x0200003d
@@ -78,7 +77,8 @@
 
 #define SN_SAL_HUB_ERROR_INTERRUPT                 0x02000060
 #define SN_SAL_BTE_RECOVER                         0x02000061
-#define SN_SAL_IOIF_GET_PCI_TOPOLOGY               0x02000062
+#define SN_SAL_RESERVED_DO_NOT_USE                 0x02000062
+#define SN_SAL_IOIF_GET_PCI_TOPOLOGY               0x02000064
 
 /*
  * Service-specific constants
@@ -586,35 +586,6 @@ sn_partition_serial_number_val(void) {
 }
 
 /*
- * Returns the partition id of the nasid passed in as an argument,
- * or INVALID_PARTID if the partition id cannot be retrieved.
- */
-static inline partid_t
-ia64_sn_sysctl_partition_get(nasid_t nasid)
-{
-        struct ia64_sal_retval ret_stuff;
-        ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_SYSCTL_PARTITION_GET, nasid,
-                                0, 0, 0, 0, 0, 0);
-        if (ret_stuff.status != 0)
-            return INVALID_PARTID;
-        return ((partid_t)ret_stuff.v0);
-}
-
-/*
- * Returns the partition id of the current processor.
- */
-
-extern partid_t sn_partid;
-
-static inline partid_t
-sn_local_partid(void) {
-        if (unlikely(sn_partid < 0)) {
-                sn_partid = ia64_sn_sysctl_partition_get(cpuid_to_nasid(smp_processor_id()));
-        }
-        return sn_partid;
-}
-
-/*
  * Returns the physical address of the partition's reserved page through
  * an iterative number of calls.
  *
@@ -749,7 +720,8 @@ ia64_sn_power_down(void)
 {
         struct ia64_sal_retval ret_stuff;
         SAL_CALL(ret_stuff, SN_SAL_SYSTEM_POWER_DOWN, 0, 0, 0, 0, 0, 0, 0);
-        while(1);
+        while(1)
+                cpu_relax();
         /* never returns */
 }
 
@@ -1018,24 +990,6 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift,
         ret_stuff.v2 = 0;
         SAL_CALL_NOLOCK(ret_stuff, SN_SAL_GET_SN_INFO, fc, 0, 0, 0, 0, 0, 0);
 
-/***** BEGIN HACK - temp til old proms no longer supported ********/
-        if (ret_stuff.status == SALRET_NOT_IMPLEMENTED) {
-                int nasid = get_sapicid() & 0xfff;;
-#define SH_SHUB_ID_NODES_PER_BIT_MASK 0x001f000000000000UL                                               
-#define SH_SHUB_ID_NODES_PER_BIT_SHFT 48                                                               
-                if (shubtype) *shubtype = 0;
-                if (nasid_bitmask) *nasid_bitmask = 0x7ff;
-                if (nasid_shift) *nasid_shift = 38;
-                if (systemsize) *systemsize = 11;
-                if (sharing_domain_size) *sharing_domain_size = 9;
-                if (partid) *partid = ia64_sn_sysctl_partition_get(nasid);
-                if (coher) *coher = nasid >> 9;
-                if (reg) *reg = (HUB_L((u64 *) LOCAL_MMR_ADDR(SH1_SHUB_ID)) & SH_SHUB_ID_NODES_PER_BIT_MASK) >>
-                        SH_SHUB_ID_NODES_PER_BIT_SHFT;
-                return 0;
-        }
-/***** END HACK *******/
-
         if (ret_stuff.status < 0)
                 return ret_stuff.status;
 
@@ -1068,12 +1022,10 @@ 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,
-                              u64 buf, u64 len)
+ia64_sn_ioif_get_pci_topology(u64 buf, u64 len)
 {
         struct ia64_sal_retval rv;
-        SAL_CALL_NOLOCK(rv, SN_SAL_IOIF_GET_PCI_TOPOLOGY,
-                rack, bay, slot, slab, buf, len, 0);
+        SAL_CALL_NOLOCK(rv, SN_SAL_IOIF_GET_PCI_TOPOLOGY, buf, len, 0, 0, 0, 0, 0);
         return (int) rv.status;
 }