summaryrefslogtreecommitdiffstats
path: root/include/asm-mips64
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-mips64')
-rw-r--r--include/asm-mips64/asm.h4
-rw-r--r--include/asm-mips64/bootinfo.h2
-rw-r--r--include/asm-mips64/checksum.h245
-rw-r--r--include/asm-mips64/cpu.h3
-rw-r--r--include/asm-mips64/mipsregs.h4
-rw-r--r--include/asm-mips64/sgi/sgint23.h2
-rw-r--r--include/asm-mips64/sgialib.h12
-rw-r--r--include/asm-mips64/sgiarcs.h42
-rw-r--r--include/asm-mips64/system.h2
9 files changed, 161 insertions, 155 deletions
diff --git a/include/asm-mips64/asm.h b/include/asm-mips64/asm.h
index 48f6bfbec..4b48e636e 100644
--- a/include/asm-mips64/asm.h
+++ b/include/asm-mips64/asm.h
@@ -94,7 +94,7 @@ symbol = value
TEXT(msg)
/*
- * Print formated string
+ * Print formatted string
*/
#define PRINT(string) \
.set push; \
@@ -105,7 +105,7 @@ symbol = value
TEXT(string)
/*
- * Print formated string
+ * Print formatted string
*/
#define PROM_PRINT(string) \
.set push; \
diff --git a/include/asm-mips64/bootinfo.h b/include/asm-mips64/bootinfo.h
index 2c1d40205..823fb2e00 100644
--- a/include/asm-mips64/bootinfo.h
+++ b/include/asm-mips64/bootinfo.h
@@ -88,7 +88,7 @@
/*
* Valid machtype for group SGI
*/
-#define MACH_SGI_INDY 0 /* R4?K and R5K Indy workstaions */
+#define MACH_SGI_INDY 0 /* R4?K and R5K Indy workstations */
#define MACH_SGI_CHALLENGE_S 1 /* The Challenge S server */
#define MACH_SGI_INDIGO2 2 /* The Indigo2 system */
#define MACH_SGI_IP27 3 /* Origin 200, Origin 2000, Onyx 2 */
diff --git a/include/asm-mips64/checksum.h b/include/asm-mips64/checksum.h
index 94206a81c..bfac60ffe 100644
--- a/include/asm-mips64/checksum.h
+++ b/include/asm-mips64/checksum.h
@@ -1,15 +1,17 @@
-/* $Id: checksum.h,v 1.6 2000/02/18 22:06:19 ralf Exp $
- *
+/*
* 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) 1995, 1996, 1997, 1998, 1999 by Ralf Baechle
* Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 2001 Thiemo Seufer.
*/
#ifndef _ASM_CHECKSUM_H
#define _ASM_CHECKSUM_H
+#include <asm/uaccess.h>
+
/*
* computes the checksum of a memory block at buff, length len,
* and adds in "sum" (32-bit)
@@ -22,7 +24,7 @@
*
* it's best to have buff aligned on a 32-bit boundary
*/
-unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum);
+unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum);
/*
* this is a new version of the above that records errors it finds in *errp,
@@ -41,9 +43,9 @@ unsigned int csum_partial_copy_from_user(const char *src, char *dst, int len,
* Copy and checksum to user
*/
#define HAVE_CSUM_COPY_USER
-extern inline unsigned int
-csum_and_copy_to_user (const char *src, char *dst,
- int len, int sum, int *err_ptr)
+extern inline unsigned int csum_and_copy_to_user (const char *src, char *dst,
+ int len, int sum,
+ int *err_ptr)
{
sum = csum_partial(src, len, sum);
@@ -62,23 +64,23 @@ csum_and_copy_to_user (const char *src, char *dst,
* this is obsolete and will go away.
*/
#define csum_partial_copy_fromuser csum_partial_copy
-unsigned int csum_partial_copy(const char *src, char *dst, int len, unsigned int sum);
-
+unsigned int csum_partial_copy(const char *src, char *dst, int len,
+ unsigned int sum);
+
/*
* Fold a partial checksum without adding pseudo headers
*/
-static inline unsigned short int
-csum_fold(unsigned int sum)
+static inline unsigned short int csum_fold(unsigned int sum)
{
- __asm__("
- .set noat
- sll $1, %0, 16
- addu %0, $1
- sltu $1, %0, $1
- srl %0, %0, 16
- addu %0, $1
- xori %0, 0xffff
- .set at"
+ __asm__(
+ ".set\tnoat\t\t\t# csum_fold\n\t"
+ "sll\t$1,%0,16\n\t"
+ "addu\t%0,$1\n\t"
+ "sltu\t$1,%0,$1\n\t"
+ "srl\t%0,%0,16\n\t"
+ "addu\t%0,$1\n\t"
+ "xori\t%0,0xffff\n\t"
+ ".set\tat"
: "=r" (sum)
: "0" (sum)
: "$1");
@@ -93,8 +95,8 @@ csum_fold(unsigned int sum)
* By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by
* Arnt Gulbrandsen.
*/
-static inline unsigned short
-ip_fast_csum(unsigned char * iph, unsigned int ihl)
+static inline unsigned short ip_fast_csum(unsigned char *iph,
+ unsigned int ihl)
{
unsigned int sum;
unsigned long dummy;
@@ -103,36 +105,35 @@ ip_fast_csum(unsigned char * iph, unsigned int ihl)
* This is for 32-bit processors ... but works just fine for 64-bit
* processors for now ... XXX
*/
- __asm__ __volatile__("
- .set noreorder
- .set noat
- lw %0, (%1)
- subu %2, 4
- dsll %2, 2
-
- lw %3, 4(%1)
- daddu %2, %1
- addu %0, %3
- sltu $1, %0, %3
- lw %3, 8(%1)
- addu %0, $1
- addu %0, %3
- sltu $1, %0, %3
- lw %3, 12(%1)
- addu %0, $1
- addu %0, %3
- sltu $1, %0, %3
- addu %0, $1
+ __asm__ __volatile__(
+ ".set\tnoreorder\t\t\t# ip_fast_csum\n\t"
+ ".set\tnoat\n\t"
+ "lw\t%0, (%1)\n\t"
+ "subu\t%2, 4\n\t"
+ "dsll\t%2, 2\n\t"
+ "lw\t%3, 4(%1)\n\t"
+ "daddu\t%2, %1\n\t"
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "lw\t%3, 8(%1)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "lw\t%3, 12(%1)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "addu\t%0, $1\n"
-1: lw %3, 16(%1)
- daddiu %1, 4
- addu %0, %3
- sltu $1, %0, %3
- bne %2, %1, 1b
- addu %0, $1
+ "1:\tlw\t%3, 16(%1)\n\t"
+ "daddiu\t%1, 4\n"
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "bne\t%2, %1, 1b\n\t"
+ " addu\t%0, $1\n"
-2: .set at
- .set reorder"
+ "2:\t.set\tat\n\t"
+ ".set\treorder"
: "=&r" (sum), "=&r" (iph), "=&r" (ihl), "=&r" (dummy)
: "1" (iph), "2" (ihl)
: "$1");
@@ -144,26 +145,29 @@ ip_fast_csum(unsigned char * iph, unsigned int ihl)
* computes the checksum of the TCP/UDP pseudo-header
* returns a 16-bit checksum, already complemented
*/
-static inline unsigned long
-csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr,
- unsigned short len, unsigned short proto, unsigned int sum)
+static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
+ unsigned long daddr,
+ unsigned short len,
+ unsigned short proto,
+ unsigned int sum)
{
- __asm__("
- .set noat
- daddu %0, %2
- daddu %0, %3
- daddu %0, %4
- dsll32 $1, %0, 0
- daddu %0, $1 # never results in an overflow
- dsrl32 %0, %0, 0
- .set at"
+ __asm__(
+ ".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t"
+ "daddu\t%0, %2\n\t"
+ "daddu\t%0, %3\n\t"
+ "daddu\t%0, %4\n\t"
+ "dsll32\t$1, %0, 0\n\t"
+ "daddu\t%0, $1\n\t"
+ "dsrl32\t%0, %0, 0\n\t"
+ ".set\tat"
: "=r" (sum)
- : "0" (sum), "r"(saddr), "r" (daddr),
+ : "r" (daddr), "r"(saddr),
#ifdef __MIPSEL__
- "r" ((ntohs(len)<<16)+proto*256)
+ "r" ((ntohs(len)<<16)+proto*256),
#else
- "r" (((proto)<<16)+len)
+ "r" (((proto)<<16)+len),
#endif
+ "r" (sum)
: "$1");
return sum;
@@ -173,82 +177,85 @@ csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr,
* computes the checksum of the TCP/UDP pseudo-header
* returns a 16-bit checksum, already complemented
*/
-static inline unsigned short int
-csum_tcpudp_magic(unsigned long saddr, unsigned long daddr, unsigned short len,
- unsigned short proto, unsigned int sum)
+static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
+ unsigned long daddr,
+ unsigned short len,
+ unsigned short proto,
+ unsigned int sum)
{
- return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
+ return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
}
/*
* this routine is used for miscellaneous IP-like checksums, mainly
* in icmp.c
*/
-static inline unsigned short
-ip_compute_csum(unsigned char * buff, int len)
+static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
{
return csum_fold(csum_partial(buff, len, 0));
}
#define _HAVE_ARCH_IPV6_CSUM
-static inline unsigned short int
-csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr, __u32 len,
- unsigned short proto, unsigned int sum)
+static inline unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
+ struct in6_addr *daddr,
+ __u32 len,
+ unsigned short proto,
+ unsigned int sum)
{
- __asm__("
- .set noreorder
- .set noat
- addu %0, %5 # proto (long in network byte order)
- sltu $1, %0, %5
- addu %0, $1
+ __asm__(
+ ".set\tnoreorder\t\t\t# csum_ipv6_magic\n\t"
+ ".set\tnoat\n\t"
+ "addu\t%0, %5\t\t\t# proto (long in network byte order)\n\t"
+ "sltu\t$1, %0, %5\n\t"
+ "addu\t%0, $1\n\t"
- addu %0, %6 # csum
- sltu $1, %0, %6
- lw %1, 0(%2) # four words source address
- addu %0, $1
- addu %0, %1
- sltu $1, %0, $1
+ "addu\t%0, %6\t\t\t# csum\n\t"
+ "sltu\t$1, %0, %6\n\t"
+ "lw\t%1, 0(%2)\t\t\t# four words source address\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1, 4(%2)
- addu %0, $1
- addu %0, %1
- sltu $1, %0, $1
+ "lw\t%1, 4(%2)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1, 8(%2)
- addu %0, $1
- addu %0, %1
- sltu $1, %0, $1
+ "lw\t%1, 8(%2)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1, 12(%2)
- addu %0, $1
- addu %0, %1
- sltu $1, %0, $1
+ "lw\t%1, 12(%2)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1, 0(%3)
- addu %0, $1
- addu %0, %1
- sltu $1, %0, $1
+ "lw\t%1, 0(%3)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1, 4(%3)
- addu %0, $1
- addu %0, %1
- sltu $1, %0, $1
+ "lw\t%1, 4(%3)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1, 8(%3)
- addu %0, $1
- addu %0, %1
- sltu $1, %0, $1
+ "lw\t%1, 8(%3)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1, 12(%3)
- addu %0, $1
- addu %0, %1
- sltu $1, %0, $1
- .set noat
- .set noreorder"
- : "=r" (sum), "=r" (proto)
- : "r" (saddr), "r" (daddr),
- "0" (htonl(len)), "1" (htonl(proto)), "r"(sum)
- : "$1");
+ "lw\t%1, 12(%3)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
+ ".set\tnoat\n\t"
+ ".set\tnoreorder"
+ : "=r" (sum), "=r" (proto)
+ : "r" (saddr), "r" (daddr),
+ "0" (htonl(len)), "1" (htonl(proto)), "r" (sum)
+ : "$1");
return csum_fold(sum);
}
diff --git a/include/asm-mips64/cpu.h b/include/asm-mips64/cpu.h
index 942928b46..b4324529c 100644
--- a/include/asm-mips64/cpu.h
+++ b/include/asm-mips64/cpu.h
@@ -22,14 +22,13 @@
#define PRID_IMP_R4000 0x0400
#define PRID_IMP_R6000A 0x0600
#define PRID_IMP_R10000 0x0900
-#define PRID_IMP_R12000 0x0e00
#define PRID_IMP_R4300 0x0b00
#define PRID_IMP_R12000 0x0e00
#define PRID_IMP_R8000 0x1000
#define PRID_IMP_R4600 0x2000
#define PRID_IMP_R4700 0x2100
#define PRID_IMP_R4640 0x2200
-#define PRID_IMP_R4650 0x2200 /* Same as R4640 */
+#define PRID_IMP_R4650 0x2200 /* Same as R4640 */
#define PRID_IMP_R5000 0x2300
#define PRID_IMP_SONIC 0x2400
#define PRID_IMP_MAGIC 0x2500
diff --git a/include/asm-mips64/mipsregs.h b/include/asm-mips64/mipsregs.h
index 7a9f12cc8..b0bfb829f 100644
--- a/include/asm-mips64/mipsregs.h
+++ b/include/asm-mips64/mipsregs.h
@@ -246,7 +246,7 @@ __BUILD_SET_CP0(config,CP0_CONFIG)
#define CAUSEF_BD (1 << 31)
/*
- * Bits in the coprozessor 0 config register.
+ * Bits in the coprocessor 0 config register.
*/
#define CONF_CM_CACHABLE_NO_WA 0
#define CONF_CM_CACHABLE_WA 1
@@ -265,7 +265,7 @@ __BUILD_SET_CP0(config,CP0_CONFIG)
* R10000 performance counter definitions.
*
* FIXME: The R10000 performance counter opens a nice way to implement CPU
- * time accounting with a precission of one cycle. I don't have
+ * time accounting with a precision of one cycle. I don't have
* R10000 silicon but just a manual, so ...
*/
diff --git a/include/asm-mips64/sgi/sgint23.h b/include/asm-mips64/sgi/sgint23.h
index 7ed7c786c..be8efd8e2 100644
--- a/include/asm-mips64/sgi/sgint23.h
+++ b/include/asm-mips64/sgi/sgint23.h
@@ -170,7 +170,7 @@ struct sgi_int2_regs {
#endif
#define INT2_TCLEAR_T0CLR 0x1 /* Clear timer0 IRQ */
#define INT2_TCLEAR_T1CLR 0x2 /* Clear timer1 IRQ */
-/* I am guesing there are only two unused registers here
+/* I am guessing there are only two unused registers here
* but I could be wrong... - andrewb
*/
/* u32 _unused[3]; */
diff --git a/include/asm-mips64/sgialib.h b/include/asm-mips64/sgialib.h
index 16444eff8..85f714963 100644
--- a/include/asm-mips64/sgialib.h
+++ b/include/asm-mips64/sgialib.h
@@ -90,9 +90,9 @@ extern pcomponent *prom_componentbypath(char *path);
*/
extern void prom_identify_arch(void);
-/* Environemt variable routines. */
+/* Environment variable routines. */
extern PCHAR ArcGetEnvironmentVariable(PCHAR name);
-extern LONG SetEnvironmentVariable(PCHAR name, PCHAR value);
+extern LONG ArcSetEnvironmentVariable(PCHAR name, PCHAR value);
/* ARCS command line acquisition and parsing. */
extern char *prom_getcmdline(void);
@@ -120,11 +120,11 @@ extern long prom_invoke(unsigned long pc, unsigned long sp, long argc, char **ar
extern long prom_exec(char *name, long argc, char **argv, char **envp);
/* Misc. routines. */
-extern void prom_halt(VOID) __attribute__((noreturn));
-extern void prom_powerdown(VOID) __attribute__((noreturn));
-extern void prom_restart(VOID) __attribute__((noreturn));
+extern VOID prom_halt(VOID) __attribute__((noreturn));
+extern VOID prom_powerdown(VOID) __attribute__((noreturn));
+extern VOID prom_restart(VOID) __attribute__((noreturn));
extern VOID ArcReboot(VOID) __attribute__((noreturn));
-extern VOID ArcEnterInteractiveMode(void) __attribute__((noreturn));
+extern VOID ArcEnterInteractiveMode(VOID) __attribute__((noreturn));
extern long prom_cfgsave(VOID);
extern struct linux_sysid *prom_getsysid(VOID);
extern VOID ArcFlushAllCaches(VOID);
diff --git a/include/asm-mips64/sgiarcs.h b/include/asm-mips64/sgiarcs.h
index 457c03af1..ad5532ca5 100644
--- a/include/asm-mips64/sgiarcs.h
+++ b/include/asm-mips64/sgiarcs.h
@@ -143,7 +143,7 @@ struct linux_tinfo {
/* ARCS virtual dirents. */
struct linux_vdirent {
- unsigned long namelen;
+ ULONG namelen;
unsigned char attr;
char fname[32]; /* XXX imperical, should be a define */
};
@@ -177,38 +177,38 @@ struct linux_finfo {
struct linux_bigint begin;
struct linux_bigint end;
struct linux_bigint cur;
- enum linux_devtypes dtype;
+ enum linux_devtypes dtype;
unsigned long namelen;
unsigned char attr;
char name[32]; /* XXX imperical, should be define */
};
-/* This describes the vector containing fuction pointers to the ARC
+/* This describes the vector containing function pointers to the ARC
firmware functions. */
struct linux_romvec {
- LONG load; /* Load an executable image. */
- LONG invoke; /* Invoke a standalong image. */
- LONG exec; /* Load and begin execution of a
+ LONG load; /* Load an executable image. */
+ LONG invoke; /* Invoke a standalong image. */
+ LONG exec; /* Load and begin execution of a
standalone image. */
- LONG halt; /* Halt the machine. */
- LONG pdown; /* Power down the machine. */
- LONG restart; /* XXX soft reset??? */
- LONG reboot; /* Reboot the machine. */
- LONG imode; /* Enter PROM interactive mode. */
- LONG _unused1; /* Was ReturnFromMain(). */
+ LONG halt; /* Halt the machine. */
+ LONG pdown; /* Power down the machine. */
+ LONG restart; /* XXX soft reset??? */
+ LONG reboot; /* Reboot the machine. */
+ LONG imode; /* Enter PROM interactive mode. */
+ LONG _unused1; /* Was ReturnFromMain(). */
/* PROM device tree interface. */
- LONG next_component;
- LONG child_component;
- LONG parent_component;
- LONG component_data;
- LONG child_add;
- LONG comp_del;
- LONG component_by_path;
+ LONG next_component;
+ LONG child_component;
+ LONG parent_component;
+ LONG component_data;
+ LONG child_add;
+ LONG comp_del;
+ LONG component_by_path;
/* Misc. stuff. */
- LONG cfg_save;
- LONG get_sysid;
+ LONG cfg_save;
+ LONG get_sysid;
/* Probing for memory. */
LONG get_mdesc;
diff --git a/include/asm-mips64/system.h b/include/asm-mips64/system.h
index fc9407332..dfb641fbf 100644
--- a/include/asm-mips64/system.h
+++ b/include/asm-mips64/system.h
@@ -33,7 +33,7 @@ __sti(void)
}
/*
- * For cli() we have to insert nops to make shure that the new value
+ * For cli() we have to insert nops to make sure that the new value
* has actually arrived in the status register before the end of this
* macro.
* R4000/R4400 need three nops, the R4600 two nops and the R10000 needs
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:59:06 +0000