8 files changed, 415 insertions, 223 deletions

diff --git a/arch/mips/fw/arc/cmdline.c b/arch/mips/fw/arc/cmdline.c
index fd604ef28823..4ca4eef934a5 100644
--- a/arch/mips/fw/arc/cmdline.c
+++ b/arch/mips/fw/arc/cmdline.c
@@ -52,7 +52,7 @@ static char * __init move_firmware_args(char* cp)
                                 strcat(cp, used_arc[i][1]);
                                 cp += strlen(used_arc[i][1]);
                                 /* ... and now the argument */
-                                s = strstr(prom_argv(actr), "=");
+                                s = strchr(prom_argv(actr), '=');
                                 if (s) {
                                         s++;
                                         strcpy(cp, s);
diff --git a/arch/mips/fw/arc/init.c b/arch/mips/fw/arc/init.c
index e2f75b13312f..3ad8788b6eaa 100644
--- a/arch/mips/fw/arc/init.c
+++ b/arch/mips/fw/arc/init.c
@@ -12,6 +12,7 @@
 
 #include <asm/bootinfo.h>
 #include <asm/sgialib.h>
+#include <asm/smp-ops.h>
 
 #undef DEBUG_PROM_INIT
 
@@ -48,4 +49,11 @@ void __init prom_init(void)
         ArcRead(0, &c, 1, &cnt);
         ArcEnterInteractiveMode();
 #endif
+#ifdef CONFIG_SGI_IP27
+        {
+                extern struct plat_smp_ops ip27_smp_ops;
+
+                register_smp_ops(&ip27_smp_ops);
+        }
+#endif
 }
diff --git a/arch/mips/fw/cfe/cfe_api.c b/arch/mips/fw/cfe/cfe_api.c
index a9f69e4e40ac..717db74f7c6e 100644
--- a/arch/mips/fw/cfe/cfe_api.c
+++ b/arch/mips/fw/cfe/cfe_api.c
@@ -16,19 +16,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/*  *********************************************************************
-    *
-    *  Broadcom Common Firmware Environment (CFE)
-    *
-    *  Device Function stubs                    File: cfe_api.c
-    *
-    *  This module contains device function stubs (small routines to
-    *  call the standard "iocb" interface entry point to CFE).
-    *  There should be one routine here per iocb function call.
-    *
-    *  Authors:  Mitch Lichtenberg, Chris Demetriou
-    *
-    ********************************************************************* */
+/*
+ *
+ * Broadcom Common Firmware Environment (CFE)
+ *
+ * This module contains device function stubs (small routines to
+ * call the standard "iocb" interface entry point to CFE).
+ * There should be one routine here per iocb function call.
+ *
+ * Authors:  Mitch Lichtenberg, Chris Demetriou
+ */
 
 #include <asm/fw/cfe/cfe_api.h>
 #include "cfe_api_int.h"
@@ -37,12 +34,8 @@
 #define XPTR_FROM_NATIVE(n)     ((cfe_xptr_t) (intptr_t) (n))
 #define NATIVE_FROM_XPTR(x)     ((void *) (intptr_t) (x))
 
-#ifdef CFE_API_IMPL_NAMESPACE
-#define cfe_iocb_dispatch(a)            __cfe_iocb_dispatch(a)
-#endif
-int cfe_iocb_dispatch(cfe_xiocb_t * xiocb);
+int cfe_iocb_dispatch(struct cfe_xiocb *xiocb);
 
-#if defined(CFE_API_common) || defined(CFE_API_ALL)
 /*
  * Declare the dispatch function with args of "intptr_t".
  * This makes sure whatever model we're compiling in
@@ -53,27 +46,25 @@ int cfe_iocb_dispatch(cfe_xiocb_t * xiocb);
  */
 
 static int (*cfe_dispfunc) (intptr_t handle, intptr_t xiocb) = 0;
-static cfe_xuint_t cfe_handle = 0;
+static u64 cfe_handle = 0;
 
-int cfe_init(cfe_xuint_t handle, cfe_xuint_t ept)
+int cfe_init(u64 handle, u64 ept)
 {
         cfe_dispfunc = NATIVE_FROM_XPTR(ept);
         cfe_handle = handle;
         return 0;
 }
 
-int cfe_iocb_dispatch(cfe_xiocb_t * xiocb)
+int cfe_iocb_dispatch(struct cfe_xiocb * xiocb)
 {
         if (!cfe_dispfunc)
                 return -1;
         return (*cfe_dispfunc) ((intptr_t) cfe_handle, (intptr_t) xiocb);
 }
-#endif                          /* CFE_API_common || CFE_API_ALL */
 
-#if defined(CFE_API_close) || defined(CFE_API_ALL)
 int cfe_close(int handle)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_CLOSE;
         xiocb.xiocb_status = 0;
@@ -86,18 +77,16 @@ int cfe_close(int handle)
         return xiocb.xiocb_status;
 
 }
-#endif                          /* CFE_API_close || CFE_API_ALL */
 
-#if defined(CFE_API_cpu_start) || defined(CFE_API_ALL)
 int cfe_cpu_start(int cpu, void (*fn) (void), long sp, long gp, long a1)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_CPUCTL;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_cpuctl_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_cpuctl);
         xiocb.plist.xiocb_cpuctl.cpu_number = cpu;
         xiocb.plist.xiocb_cpuctl.cpu_command = CFE_CPU_CMD_START;
         xiocb.plist.xiocb_cpuctl.gp_val = gp;
@@ -109,18 +98,16 @@ int cfe_cpu_start(int cpu, void (*fn) (void), long sp, long gp, long a1)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_cpu_start || CFE_API_ALL */
 
-#if defined(CFE_API_cpu_stop) || defined(CFE_API_ALL)
 int cfe_cpu_stop(int cpu)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_CPUCTL;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_cpuctl_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_cpuctl);
         xiocb.plist.xiocb_cpuctl.cpu_number = cpu;
         xiocb.plist.xiocb_cpuctl.cpu_command = CFE_CPU_CMD_STOP;
 
@@ -128,18 +115,16 @@ int cfe_cpu_stop(int cpu)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_cpu_stop || CFE_API_ALL */
 
-#if defined(CFE_API_enumenv) || defined(CFE_API_ALL)
 int cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_ENV_SET;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_envbuf);
         xiocb.plist.xiocb_envbuf.enum_idx = idx;
         xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
         xiocb.plist.xiocb_envbuf.name_length = namelen;
@@ -150,20 +135,17 @@ int cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_enumenv || CFE_API_ALL */
 
-#if defined(CFE_API_enummem) || defined(CFE_API_ALL)
 int
-cfe_enummem(int idx, int flags, cfe_xuint_t * start, cfe_xuint_t * length,
-            cfe_xuint_t * type)
+cfe_enummem(int idx, int flags, u64 *start, u64 *length, u64 *type)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_MEMENUM;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = flags;
-        xiocb.xiocb_psize = sizeof(xiocb_meminfo_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_meminfo);
         xiocb.plist.xiocb_meminfo.mi_idx = idx;
 
         cfe_iocb_dispatch(&xiocb);
@@ -177,30 +159,26 @@ cfe_enummem(int idx, int flags, cfe_xuint_t * start, cfe_xuint_t * length,
 
         return 0;
 }
-#endif                          /* CFE_API_enummem || CFE_API_ALL */
 
-#if defined(CFE_API_exit) || defined(CFE_API_ALL)
 int cfe_exit(int warm, int status)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_RESTART;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = warm ? CFE_FLG_WARMSTART : 0;
-        xiocb.xiocb_psize = sizeof(xiocb_exitstat_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_exitstat);
         xiocb.plist.xiocb_exitstat.status = status;
 
         cfe_iocb_dispatch(&xiocb);
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_exit || CFE_API_ALL */
 
-#if defined(CFE_API_flushcache) || defined(CFE_API_ALL)
 int cfe_flushcache(int flg)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_FLUSHCACHE;
         xiocb.xiocb_status = 0;
@@ -212,34 +190,30 @@ int cfe_flushcache(int flg)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_flushcache || CFE_API_ALL */
 
-#if defined(CFE_API_getdevinfo) || defined(CFE_API_ALL)
 int cfe_getdevinfo(char *name)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_GETINFO;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = 0;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(name);
-        xiocb.plist.xiocb_buffer.buf_length = cfe_strlen(name);
+        xiocb.plist.xiocb_buffer.buf_length = strlen(name);
 
         cfe_iocb_dispatch(&xiocb);
 
         if (xiocb.xiocb_status < 0)
                 return xiocb.xiocb_status;
-        return xiocb.plist.xiocb_buffer.buf_devflags;
+        return xiocb.plist.xiocb_buffer.buf_ioctlcmd;
 }
-#endif                          /* CFE_API_getdevinfo || CFE_API_ALL */
 
-#if defined(CFE_API_getenv) || defined(CFE_API_ALL)
 int cfe_getenv(char *name, char *dest, int destlen)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         *dest = 0;
 
@@ -247,10 +221,10 @@ int cfe_getenv(char *name, char *dest, int destlen)
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_envbuf);
         xiocb.plist.xiocb_envbuf.enum_idx = 0;
         xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
-        xiocb.plist.xiocb_envbuf.name_length = cfe_strlen(name);
+        xiocb.plist.xiocb_envbuf.name_length = strlen(name);
         xiocb.plist.xiocb_envbuf.val_ptr = XPTR_FROM_NATIVE(dest);
         xiocb.plist.xiocb_envbuf.val_length = destlen;
 
@@ -258,18 +232,16 @@ int cfe_getenv(char *name, char *dest, int destlen)
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_getenv || CFE_API_ALL */
 
-#if defined(CFE_API_getfwinfo) || defined(CFE_API_ALL)
 int cfe_getfwinfo(cfe_fwinfo_t * info)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_GETINFO;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_fwinfo_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_fwinfo);
 
         cfe_iocb_dispatch(&xiocb);
 
@@ -292,12 +264,10 @@ int cfe_getfwinfo(cfe_fwinfo_t * info)
 
         return 0;
 }
-#endif                          /* CFE_API_getfwinfo || CFE_API_ALL */
 
-#if defined(CFE_API_getstdhandle) || defined(CFE_API_ALL)
 int cfe_getstdhandle(int flg)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_GETHANDLE;
         xiocb.xiocb_status = 0;
@@ -311,23 +281,17 @@ int cfe_getstdhandle(int flg)
                 return xiocb.xiocb_status;
         return xiocb.xiocb_handle;
 }
-#endif                          /* CFE_API_getstdhandle || CFE_API_ALL */
 
-#if defined(CFE_API_getticks) || defined(CFE_API_ALL)
 int64_t
-#ifdef CFE_API_IMPL_NAMESPACE
-__cfe_getticks(void)
-#else
 cfe_getticks(void)
-#endif
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_FW_GETTIME;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_time_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_time);
         xiocb.plist.xiocb_time.ticks = 0;
 
         cfe_iocb_dispatch(&xiocb);
@@ -335,18 +299,16 @@ cfe_getticks(void)
         return xiocb.plist.xiocb_time.ticks;
 
 }
-#endif                          /* CFE_API_getticks || CFE_API_ALL */
 
-#if defined(CFE_API_inpstat) || defined(CFE_API_ALL)
 int cfe_inpstat(int handle)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_INPSTAT;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = handle;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_inpstat_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_inpstat);
         xiocb.plist.xiocb_inpstat.inp_status = 0;
 
         cfe_iocb_dispatch(&xiocb);
@@ -355,20 +317,18 @@ int cfe_inpstat(int handle)
                 return xiocb.xiocb_status;
         return xiocb.plist.xiocb_inpstat.inp_status;
 }
-#endif                          /* CFE_API_inpstat || CFE_API_ALL */
 
-#if defined(CFE_API_ioctl) || defined(CFE_API_ALL)
 int
 cfe_ioctl(int handle, unsigned int ioctlnum, unsigned char *buffer,
-          int length, int *retlen, cfe_xuint_t offset)
+          int length, int *retlen, u64 offset)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_IOCTL;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = handle;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = offset;
         xiocb.plist.xiocb_buffer.buf_ioctlcmd = ioctlnum;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
@@ -380,21 +340,19 @@ cfe_ioctl(int handle, unsigned int ioctlnum, unsigned char *buffer,
                 *retlen = xiocb.plist.xiocb_buffer.buf_retlen;
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_ioctl || CFE_API_ALL */
 
-#if defined(CFE_API_open) || defined(CFE_API_ALL)
 int cfe_open(char *name)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_OPEN;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = 0;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(name);
-        xiocb.plist.xiocb_buffer.buf_length = cfe_strlen(name);
+        xiocb.plist.xiocb_buffer.buf_length = strlen(name);
 
         cfe_iocb_dispatch(&xiocb);
 
@@ -402,27 +360,21 @@ int cfe_open(char *name)
                 return xiocb.xiocb_status;
         return xiocb.xiocb_handle;
 }
-#endif                          /* CFE_API_open || CFE_API_ALL */
 
-#if defined(CFE_API_read) || defined(CFE_API_ALL)
 int cfe_read(int handle, unsigned char *buffer, int length)
 {
         return cfe_readblk(handle, 0, buffer, length);
 }
-#endif                          /* CFE_API_read || CFE_API_ALL */
 
-#if defined(CFE_API_readblk) || defined(CFE_API_ALL)
-int
-cfe_readblk(int handle, cfe_xint_t offset, unsigned char *buffer,
-            int length)
+int cfe_readblk(int handle, s64 offset, unsigned char *buffer, int length)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_READ;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = handle;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = offset;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
         xiocb.plist.xiocb_buffer.buf_length = length;
@@ -433,62 +385,41 @@ cfe_readblk(int handle, cfe_xint_t offset, unsigned char *buffer,
                 return xiocb.xiocb_status;
         return xiocb.plist.xiocb_buffer.buf_retlen;
 }
-#endif                          /* CFE_API_readblk || CFE_API_ALL */
 
-#if defined(CFE_API_setenv) || defined(CFE_API_ALL)
 int cfe_setenv(char *name, char *val)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_ENV_SET;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = 0;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_envbuf);
         xiocb.plist.xiocb_envbuf.enum_idx = 0;
         xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
-        xiocb.plist.xiocb_envbuf.name_length = cfe_strlen(name);
+        xiocb.plist.xiocb_envbuf.name_length = strlen(name);
         xiocb.plist.xiocb_envbuf.val_ptr = XPTR_FROM_NATIVE(val);
-        xiocb.plist.xiocb_envbuf.val_length = cfe_strlen(val);
+        xiocb.plist.xiocb_envbuf.val_length = strlen(val);
 
         cfe_iocb_dispatch(&xiocb);
 
         return xiocb.xiocb_status;
 }
-#endif                          /* CFE_API_setenv || CFE_API_ALL */
-
-#if (defined(CFE_API_strlen) || defined(CFE_API_ALL)) \
-    && !defined(CFE_API_STRLEN_CUSTOM)
-int cfe_strlen(char *name)
-{
-        int count = 0;
-
-        while (*name++)
-                count++;
 
-        return count;
-}
-#endif                          /* CFE_API_strlen || CFE_API_ALL */
-
-#if defined(CFE_API_write) || defined(CFE_API_ALL)
 int cfe_write(int handle, unsigned char *buffer, int length)
 {
         return cfe_writeblk(handle, 0, buffer, length);
 }
-#endif                          /* CFE_API_write || CFE_API_ALL */
 
-#if defined(CFE_API_writeblk) || defined(CFE_API_ALL)
-int
-cfe_writeblk(int handle, cfe_xint_t offset, unsigned char *buffer,
-             int length)
+int cfe_writeblk(int handle, s64 offset, unsigned char *buffer, int length)
 {
-        cfe_xiocb_t xiocb;
+        struct cfe_xiocb xiocb;
 
         xiocb.xiocb_fcode = CFE_CMD_DEV_WRITE;
         xiocb.xiocb_status = 0;
         xiocb.xiocb_handle = handle;
         xiocb.xiocb_flags = 0;
-        xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
+        xiocb.xiocb_psize = sizeof(struct xiocb_buffer);
         xiocb.plist.xiocb_buffer.buf_offset = offset;
         xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
         xiocb.plist.xiocb_buffer.buf_length = length;
@@ -499,4 +430,3 @@ cfe_writeblk(int handle, cfe_xint_t offset, unsigned char *buffer,
                 return xiocb.xiocb_status;
         return xiocb.plist.xiocb_buffer.buf_retlen;
 }
-#endif                          /* CFE_API_writeblk || CFE_API_ALL */
diff --git a/arch/mips/fw/cfe/cfe_api_int.h b/arch/mips/fw/cfe/cfe_api_int.h
index f7e5a64b55f3..d9759e646956 100644
--- a/arch/mips/fw/cfe/cfe_api_int.h
+++ b/arch/mips/fw/cfe/cfe_api_int.h
@@ -15,28 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-
-/*  *********************************************************************
-    *
-    *  Broadcom Common Firmware Environment (CFE)
-    *
-    *  Device function prototypes               File: cfe_api_int.h
-    *
-    *  This header defines all internal types and macros for the
-    *  library.  This is stuff that's not exported to an app
-    *  using the library.
-    *
-    *  Authors:  Mitch Lichtenberg, Chris Demetriou
-    *
-    ********************************************************************* */
-
 #ifndef CFE_API_INT_H
 #define CFE_API_INT_H
 
-/*  *********************************************************************
-    *  Constants
-    ********************************************************************* */
-
+/*
+ * Constants.
+ */
 #define CFE_CMD_FW_GETINFO      0
 #define CFE_CMD_FW_RESTART      1
 #define CFE_CMD_FW_BOOT         2
@@ -64,89 +48,101 @@
 
 #define CFE_CMD_VENDOR_USE      0x8000  /* codes above this are for customer use */
 
-/*  *********************************************************************
-    *  Structures
-    ********************************************************************* */
+/*
+ * Structures.
+ */
 
-typedef uint64_t cfe_xuint_t;
-typedef int64_t cfe_xint_t;
-typedef int64_t cfe_xptr_t;
+/* eeek, signed "pointers" */
+typedef s64 cfe_xptr_t;
 
-typedef struct xiocb_buffer_s {
-        cfe_xuint_t buf_offset;         /* offset on device (bytes) */
+struct xiocb_buffer {
+        u64 buf_offset;         /* offset on device (bytes) */
         cfe_xptr_t  buf_ptr;            /* pointer to a buffer */
-        cfe_xuint_t buf_length;         /* length of this buffer */
-        cfe_xuint_t buf_retlen;         /* returned length (for read ops) */
-        cfe_xuint_t buf_ioctlcmd;       /* IOCTL command (used only for IOCTLs) */
-} xiocb_buffer_t;
-
-#define buf_devflags buf_ioctlcmd       /* returned device info flags */
+        u64 buf_length;         /* length of this buffer */
+        u64 buf_retlen;         /* returned length (for read ops) */
+        u64 buf_ioctlcmd;       /* IOCTL command (used only for IOCTLs) */
+};
 
-typedef struct xiocb_inpstat_s {
-        cfe_xuint_t inp_status;         /* 1 means input available */
-} xiocb_inpstat_t;
+struct xiocb_inpstat {
+        u64 inp_status;         /* 1 means input available */
+};
 
-typedef struct xiocb_envbuf_s {
-        cfe_xint_t enum_idx;            /* 0-based enumeration index */
+struct xiocb_envbuf {
+        s64 enum_idx;           /* 0-based enumeration index */
         cfe_xptr_t name_ptr;            /* name string buffer */
-        cfe_xint_t name_length;         /* size of name buffer */
+        s64 name_length;                /* size of name buffer */
         cfe_xptr_t val_ptr;             /* value string buffer */
-        cfe_xint_t val_length;          /* size of value string buffer */
-} xiocb_envbuf_t;
-
-typedef struct xiocb_cpuctl_s {
-        cfe_xuint_t cpu_number;         /* cpu number to control */
-        cfe_xuint_t cpu_command;        /* command to issue to CPU */
-        cfe_xuint_t start_addr;         /* CPU start address */
-        cfe_xuint_t gp_val;             /* starting GP value */
-        cfe_xuint_t sp_val;             /* starting SP value */
-        cfe_xuint_t a1_val;             /* starting A1 value */
-} xiocb_cpuctl_t;
-
-typedef struct xiocb_time_s {
-        cfe_xint_t ticks;               /* current time in ticks */
-} xiocb_time_t;
-
-typedef struct xiocb_exitstat_s {
-        cfe_xint_t status;
-} xiocb_exitstat_t;
-
-typedef struct xiocb_meminfo_s {
-        cfe_xint_t mi_idx;              /* 0-based enumeration index */
-        cfe_xint_t mi_type;             /* type of memory block */
-        cfe_xuint_t mi_addr;            /* physical start address */
-        cfe_xuint_t mi_size;            /* block size */
-} xiocb_meminfo_t;
-
-typedef struct xiocb_fwinfo_s {
-        cfe_xint_t fwi_version;         /* major, minor, eco version */
-        cfe_xint_t fwi_totalmem;        /* total installed mem */
-        cfe_xint_t fwi_flags;           /* various flags */
-        cfe_xint_t fwi_boardid;         /* board ID */
-        cfe_xint_t fwi_bootarea_va;     /* VA of boot area */
-        cfe_xint_t fwi_bootarea_pa;     /* PA of boot area */
-        cfe_xint_t fwi_bootarea_size;   /* size of boot area */
-        cfe_xint_t fwi_reserved1;
-        cfe_xint_t fwi_reserved2;
-        cfe_xint_t fwi_reserved3;
-} xiocb_fwinfo_t;
-
-typedef struct cfe_xiocb_s {
-        cfe_xuint_t xiocb_fcode;        /* IOCB function code */
-        cfe_xint_t xiocb_status;        /* return status */
-        cfe_xint_t xiocb_handle;        /* file/device handle */
-        cfe_xuint_t xiocb_flags;        /* flags for this IOCB */
-        cfe_xuint_t xiocb_psize;        /* size of parameter list */
+        s64 val_length;         /* size of value string buffer */
+};
+
+struct xiocb_cpuctl {
+        u64 cpu_number;         /* cpu number to control */
+        u64 cpu_command;        /* command to issue to CPU */
+        u64 start_addr;         /* CPU start address */
+        u64 gp_val;             /* starting GP value */
+        u64 sp_val;             /* starting SP value */
+        u64 a1_val;             /* starting A1 value */
+};
+
+struct xiocb_time {
+        s64 ticks;              /* current time in ticks */
+};
+
+struct xiocb_exitstat{
+        s64 status;
+};
+
+struct xiocb_meminfo {
+        s64 mi_idx;             /* 0-based enumeration index */
+        s64 mi_type;            /* type of memory block */
+        u64 mi_addr;            /* physical start address */
+        u64 mi_size;            /* block size */
+};
+
+struct xiocb_fwinfo {
+        s64 fwi_version;                /* major, minor, eco version */
+        s64 fwi_totalmem;       /* total installed mem */
+        s64 fwi_flags;          /* various flags */
+        s64 fwi_boardid;                /* board ID */
+        s64 fwi_bootarea_va;    /* VA of boot area */
+        s64 fwi_bootarea_pa;    /* PA of boot area */
+        s64 fwi_bootarea_size;  /* size of boot area */
+        s64 fwi_reserved1;
+        s64 fwi_reserved2;
+        s64 fwi_reserved3;
+};
+
+struct cfe_xiocb {
+        u64 xiocb_fcode;        /* IOCB function code */
+        s64 xiocb_status;       /* return status */
+        s64 xiocb_handle;       /* file/device handle */
+        u64 xiocb_flags;        /* flags for this IOCB */
+        u64 xiocb_psize;        /* size of parameter list */
         union {
-                xiocb_buffer_t xiocb_buffer;    /* buffer parameters */
-                xiocb_inpstat_t xiocb_inpstat;  /* input status parameters */
-                xiocb_envbuf_t xiocb_envbuf;    /* environment function parameters */
-                xiocb_cpuctl_t xiocb_cpuctl;    /* CPU control parameters */
-                xiocb_time_t xiocb_time;        /* timer parameters */
-                xiocb_meminfo_t xiocb_meminfo;  /* memory arena info parameters */
-                xiocb_fwinfo_t xiocb_fwinfo;    /* firmware information */
-                xiocb_exitstat_t xiocb_exitstat;        /* Exit Status */
+                /* buffer parameters */
+                struct xiocb_buffer xiocb_buffer;
+
+                /* input status parameters */
+                struct xiocb_inpstat xiocb_inpstat;
+
+                /* environment function parameters */
+                struct xiocb_envbuf xiocb_envbuf;
+
+                /* CPU control parameters */
+                struct xiocb_cpuctl xiocb_cpuctl;
+
+                /* timer parameters */
+                struct xiocb_time xiocb_time;
+
+                /* memory arena info parameters */
+                struct xiocb_meminfo xiocb_meminfo;
+
+                /* firmware information */
+                struct xiocb_fwinfo xiocb_fwinfo;
+
+                /* Exit Status */
+                struct xiocb_exitstat xiocb_exitstat;
         } plist;
-} cfe_xiocb_t;
+};
 
-#endif                          /* CFE_API_INT_H */
+#endif /* CFE_API_INT_H */
diff --git a/arch/mips/fw/lib/Makefile b/arch/mips/fw/lib/Makefile
new file mode 100644
index 000000000000..84befc968fc4
--- /dev/null
+++ b/arch/mips/fw/lib/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for generic prom monitor library routines under Linux.
+#
+
+lib-$(CONFIG_64BIT)     += call_o32.o
diff --git a/arch/mips/fw/lib/call_o32.S b/arch/mips/fw/lib/call_o32.S
new file mode 100644
index 000000000000..bdf7d1d4081a
--- /dev/null
+++ b/arch/mips/fw/lib/call_o32.S
@@ -0,0 +1,97 @@
+/*
+ *      arch/mips/dec/prom/call_o32.S
+ *
+ *      O32 interface for the 64 (or N32) ABI.
+ *
+ *      Copyright (C) 2002  Maciej W. Rozycki
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ */
+
+#include <asm/asm.h>
+#include <asm/regdef.h>
+
+/* Maximum number of arguments supported.  Must be even!  */
+#define O32_ARGC        32
+/* Number of static registers we save.  */
+#define O32_STATC       11
+/* Frame size for static register  */
+#define O32_FRAMESZ     (SZREG * O32_STATC)
+/* Frame size on new stack */
+#define O32_FRAMESZ_NEW (SZREG + 4 * O32_ARGC)
+
+                .text
+
+/*
+ * O32 function call dispatcher, for interfacing 32-bit ROM routines.
+ *
+ * The standard 64 (N32) calling sequence is supported, with a0
+ * holding a function pointer, a1 a new stack pointer, a2-a7 -- its
+ * first six arguments and the stack -- remaining ones (up to O32_ARGC,
+ * including a2-a7). Static registers, gp and fp are preserved, v0 holds
+ * a result. This code relies on the called o32 function for sp and ra
+ * restoration and this dispatcher has to be placed in a KSEGx (or KUSEG)
+ * address space.  Any pointers passed have to point to addresses within
+ * one of these spaces as well.
+ */
+NESTED(call_o32, O32_FRAMESZ, ra)
+                REG_SUBU        sp,O32_FRAMESZ
+
+                REG_S           ra,O32_FRAMESZ-1*SZREG(sp)
+                REG_S           fp,O32_FRAMESZ-2*SZREG(sp)
+                REG_S           gp,O32_FRAMESZ-3*SZREG(sp)
+                REG_S           s7,O32_FRAMESZ-4*SZREG(sp)
+                REG_S           s6,O32_FRAMESZ-5*SZREG(sp)
+                REG_S           s5,O32_FRAMESZ-6*SZREG(sp)
+                REG_S           s4,O32_FRAMESZ-7*SZREG(sp)
+                REG_S           s3,O32_FRAMESZ-8*SZREG(sp)
+                REG_S           s2,O32_FRAMESZ-9*SZREG(sp)
+                REG_S           s1,O32_FRAMESZ-10*SZREG(sp)
+                REG_S           s0,O32_FRAMESZ-11*SZREG(sp)
+
+                move            jp,a0
+                REG_SUBU        s0,a1,O32_FRAMESZ_NEW
+                REG_S           sp,O32_FRAMESZ_NEW-1*SZREG(s0)
+
+                sll             a0,a2,zero
+                sll             a1,a3,zero
+                sll             a2,a4,zero
+                sll             a3,a5,zero
+                sw              a6,0x10(s0)
+                sw              a7,0x14(s0)
+
+                PTR_LA          t0,O32_FRAMESZ(sp)
+                PTR_LA          t1,0x18(s0)
+                li              t2,O32_ARGC-6
+1:
+                lw              t3,(t0)
+                REG_ADDU        t0,SZREG
+                sw              t3,(t1)
+                REG_SUBU        t2,1
+                REG_ADDU        t1,4
+                bnez            t2,1b
+
+                move            sp,s0
+
+                jalr            jp
+
+                REG_L           sp,O32_FRAMESZ_NEW-1*SZREG(sp)
+
+                REG_L           s0,O32_FRAMESZ-11*SZREG(sp)
+                REG_L           s1,O32_FRAMESZ-10*SZREG(sp)
+                REG_L           s2,O32_FRAMESZ-9*SZREG(sp)
+                REG_L           s3,O32_FRAMESZ-8*SZREG(sp)
+                REG_L           s4,O32_FRAMESZ-7*SZREG(sp)
+                REG_L           s5,O32_FRAMESZ-6*SZREG(sp)
+                REG_L           s6,O32_FRAMESZ-5*SZREG(sp)
+                REG_L           s7,O32_FRAMESZ-4*SZREG(sp)
+                REG_L           gp,O32_FRAMESZ-3*SZREG(sp)
+                REG_L           fp,O32_FRAMESZ-2*SZREG(sp)
+                REG_L           ra,O32_FRAMESZ-1*SZREG(sp)
+
+                REG_ADDU        sp,O32_FRAMESZ
+                jr              ra
+END(call_o32)
diff --git a/arch/mips/fw/sni/Makefile b/arch/mips/fw/sni/Makefile
new file mode 100644
index 000000000000..d9740a3788e2
--- /dev/null
+++ b/arch/mips/fw/sni/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the SNI prom monitor routines under Linux.
+#
+
+lib-$(CONFIG_SNIPROM)   += sniprom.o
diff --git a/arch/mips/fw/sni/sniprom.c b/arch/mips/fw/sni/sniprom.c
new file mode 100644
index 000000000000..96ba99202758
--- /dev/null
+++ b/arch/mips/fw/sni/sniprom.c
@@ -0,0 +1,151 @@
+/*
+ * Big Endian PROM code for SNI RM machines
+ *
+ * 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-2006 Florian Lohoff (flo@rfc822.org)
+ * Copyright (C) 2005-2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/console.h>
+
+#include <asm/addrspace.h>
+#include <asm/sni.h>
+#include <asm/mipsprom.h>
+#include <asm/mipsregs.h>
+#include <asm/bootinfo.h>
+
+/* special SNI prom calls */
+/*
+ * This does not exist in all proms - SINIX compares
+ * the prom env variable "version" against "2.0008"
+ * or greater. If lesser it tries to probe interesting
+ * registers
+ */
+#define PROM_GET_MEMCONF        58
+#define PROM_GET_HWCONF         61
+
+#define PROM_VEC                (u64 *)CKSEG1ADDR(0x1fc00000)
+#define PROM_ENTRY(x)           (PROM_VEC + (x))
+
+#define ___prom_putchar         ((int *(*)(int))PROM_ENTRY(PROM_PUTCHAR))
+#define ___prom_getenv          ((char *(*)(char *))PROM_ENTRY(PROM_GETENV))
+#define ___prom_get_memconf     ((void (*)(void *))PROM_ENTRY(PROM_GET_MEMCONF))
+#define ___prom_get_hwconf      ((u32 (*)(void))PROM_ENTRY(PROM_GET_HWCONF))
+
+#ifdef CONFIG_64BIT
+
+static u8 o32_stk[16384];
+#define O32_STK   &o32_stk[sizeof(o32_stk)]
+
+#define __PROM_O32(fun, arg) fun arg __asm__(#fun); \
+                                     __asm__(#fun " = call_o32")
+
+int   __PROM_O32(__prom_putchar, (int *(*)(int), void *, int));
+char *__PROM_O32(__prom_getenv, (char *(*)(char *), void *, char *));
+void  __PROM_O32(__prom_get_memconf, (void (*)(void *), void *, void *));
+u32   __PROM_O32(__prom_get_hwconf, (u32 (*)(void), void *));
+
+#define _prom_putchar(x)     __prom_putchar(___prom_putchar, O32_STK, x)
+#define _prom_getenv(x)      __prom_getenv(___prom_getenv, O32_STK, x)
+#define _prom_get_memconf(x) __prom_get_memconf(___prom_get_memconf, O32_STK, x)
+#define _prom_get_hwconf()   __prom_get_hwconf(___prom_get_hwconf, O32_STK)
+
+#else
+#define _prom_putchar(x)     ___prom_putchar(x)
+#define _prom_getenv(x)      ___prom_getenv(x)
+#define _prom_get_memconf(x) ___prom_get_memconf(x)
+#define _prom_get_hwconf(x)  ___prom_get_hwconf(x)
+#endif
+
+void prom_putchar(char c)
+{
+        _prom_putchar(c);
+}
+
+
+char *prom_getenv(char *s)
+{
+        return _prom_getenv(s);
+}
+
+void *prom_get_hwconf(void)
+{
+        u32 hwconf = _prom_get_hwconf();
+
+        if (hwconf == 0xffffffff)
+                return NULL;
+
+        return (void *)CKSEG1ADDR(hwconf);
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
+
+/*
+ * /proc/cpuinfo system type
+ *
+ */
+char *system_type = "Unknown";
+const char *get_system_type(void)
+{
+        return system_type;
+}
+
+static void __init sni_mem_init(void)
+{
+        int i, memsize;
+        struct membank {
+                u32             size;
+                u32             base;
+                u32             size2;
+                u32             pad1;
+                u32             pad2;
+        } memconf[8];
+        int brd_type = *(unsigned char *)SNI_IDPROM_BRDTYPE;
+
+
+        /* MemSIZE from prom in 16MByte chunks */
+        memsize = *((unsigned char *) SNI_IDPROM_MEMSIZE) * 16;
+
+        pr_debug("IDProm memsize: %u MByte\n", memsize);
+
+        /* get memory bank layout from prom */
+        _prom_get_memconf(&memconf);
+
+        pr_debug("prom_get_mem_conf memory configuration:\n");
+        for (i = 0; i < 8 && memconf[i].size; i++) {
+                if (brd_type == SNI_BRD_PCI_TOWER ||
+                    brd_type == SNI_BRD_PCI_TOWER_CPLUS) {
+                        if (memconf[i].base >= 0x20000000 &&
+                            memconf[i].base <  0x30000000)
+                                memconf[i].base -= 0x20000000;
+                }
+                pr_debug("Bank%d: %08x @ %08x\n", i,
+                        memconf[i].size, memconf[i].base);
+                add_memory_region(memconf[i].base, memconf[i].size,
+                                  BOOT_MEM_RAM);
+        }
+}
+
+void __init prom_init(void)
+{
+        int argc = fw_arg0;
+        u32 *argv = (u32 *)CKSEG0ADDR(fw_arg1);
+        int i;
+
+        sni_mem_init();
+
+        /* copy prom cmdline parameters to kernel cmdline */
+        for (i = 1; i < argc; i++) {
+                strcat(arcs_cmdline, (char *)CKSEG0ADDR(argv[i]));
+                if (i < (argc - 1))
+                        strcat(arcs_cmdline, " ");
+        }
+}