[OpenAFS-devel] sparc linux 2.4.16 patches for 1.2.2
eichin-oa@boxedpenguin.com
eichin-oa@boxedpenguin.com
Mon, 17 Dec 2001 14:56:42 -0500 (EST)
Well, the debian 1.2.2-2 openafs-modules-source actually, but the
changes are mere cut&pasting; I'm forwarding them here as much to
report that they worked, as anything else. Files changed:
openafs/debian/sysname
- debian specific, just to admit the port exists
openafs/src/config/afs_sysnames.h
- allocate the next SYS_NAME_ID
openafs/src/config/Makefile.sparc_linux24.in
- unchanged copy of Makefile.sparc_linux22.in
openafs/src/config/param.sparc_linux24.h
- starting from param.sparc_linux22.h, set AFS_LINUX24_ENV,
AFS_SPARC_LINUX24_ENV, SYS_NAME, SYS_NAME_ID.
openafs/src/config/param.sparc_linux24_usr.h
- starting from param.sparc_linux22_usr.h, set
AFS_USR_LINUX24_ENV, SYS_NAME, SYS_NAME_ID.
Oh, and for completeness, I've included the patch needed to make
2.4.16 build at all on a sparc:
kernel-source-2.4.16/arch/sparc/kernel/traps.c
- Implement show_trace_task (snarf sparc64 version, drop
STACK_BIAS.)
Nothing momentous, it did handle writing 200M of build tree into one
volume without problems (other than the issue that an SS10 is slow
these days :-) Not what I'd call real testing, but perhaps enough to
justify including this configuration. Thanks.
_Mark_ <eichin@thok.org>
The Herd Of Kittens
diff -uwrpN modules/openafs/debian/sysname modules.sparc/openafs/debian/sysname
--- modules/openafs/debian/sysname Wed Jul 11 18:38:00 2001
+++ modules.sparc/openafs/debian/sysname Sun Dec 16 02:20:05 2001
@@ -26,7 +26,7 @@ alpha)
echo sparc_linux22
;;
2.4*)
- echo Error: Not Supported
+ echo sparc_linux24
;;
esac
;;
diff -uwrpN modules/openafs/src/config/afs_sysnames.h modules.sparc/openafs/src/config/afs_sysnames.h
--- modules/openafs/src/config/afs_sysnames.h Sun Oct 14 14:04:34 2001
+++ modules.sparc/openafs/src/config/afs_sysnames.h Sun Dec 16 14:23:41 2001
@@ -125,6 +125,7 @@
#define SYS_NAME_ID_sparc_linux2 1700
#define SYS_NAME_ID_sparc_linux22 1701
+#define SYS_NAME_ID_sparc_linux24 1702
#define SYS_NAME_ID_sparc64_linux2 1800
#define SYS_NAME_ID_sparc64_linux22 1801
diff -uwrpN modules/openafs/src/config/Makefile.sparc_linux24.in modules.sparc/openafs/src/config/Makefile.sparc_linux24.in
--- modules/openafs/src/config/Makefile.sparc_linux24.in Wed Dec 31 19:00:00 1969
+++ modules.sparc/openafs/src/config/Makefile.sparc_linux24.in Tue Sep 11 10:32:11 2001
@@ -0,0 +1,47 @@
+# Copyright 1998 Transarc Corporation
+#
+# Keep macros within each section in sorted order for clean diff displays.
+#
+# AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
+AFS_OSTYPE = LINUX
+
+# Base directory for linux kernel source. Actually a prefix which is complete
+# when LINUX_VERS is appended to it.
+LINUX_SRCDIR = /usr/src/linux-
+# Default list of Linux kernels to build. Build will run only if all
+# can be built. To build a different set, specify LINUX_VERS to make.
+LINUX_VERS = 2.2.14
+
+#
+# compilation and link editor flags
+DBG=-g
+OPTMZ=-O2
+PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC
+# Put -O2 here to _ensure_ all Makefiles pick it up.
+XCFLAGS= -O2
+MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}
+XLDFLAGS=
+SHARE_LDFLAGS = -shared -Xlinker -x
+SHLIB_SUFFIX=so
+SHLIB_CFLAGS=
+#
+# libraries
+MTLIBS=-lpthread
+TXLIBS= /usr/lib/libncurses.so
+XLIBS=@LIB_AFSDB@
+#
+# programs
+AR=ar
+AS=as
+CP=cp
+LD=ld
+MT_CC=cc
+MV=mv
+RANLIB=ranlib
+RM=rm
+INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+#
+# Other OS specific requirements
+#
+YACC = bison -y
+LEX = flex -l
diff -uwrpN modules/openafs/src/config/param.sparc_linux24.h modules.sparc/openafs/src/config/param.sparc_linux24.h
--- modules/openafs/src/config/param.sparc_linux24.h Wed Dec 31 19:00:00 1969
+++ modules.sparc/openafs/src/config/param.sparc_linux24.h Sun Dec 16 14:22:19 2001
@@ -0,0 +1,89 @@
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define AFS_LINUX20_ENV 1
+#define AFS_LINUX22_ENV 1
+#define AFS_LINUX24_ENV 1
+#define AFS_SPARC_LINUX20_ENV 1
+#define AFS_SPARC_LINUX22_ENV 1
+#define AFS_SPARC_LINUX24_ENV 1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
+#define AFS_SYSCALL 227
+#define AFS_64BIT_IOPS_ENV 1
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+
+#if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
+#include <linux/config.h>
+#ifdef CONFIG_SMP
+#undef CONFIG_SMP
+#endif
+/* Using "AFS_SMP" to map to however many #define's are required to get
+ * MP to compile for Linux
+ */
+#ifdef AFS_SMP
+#define CONFIG_SMP
+#ifndef __SMP__
+#define __SMP__
+#endif
+#define AFS_GLOBAL_SUNLOCK
+#endif
+
+#if defined(MODULE) && defined(CONFIG_MODVERSIONS)
+#define MODVERSIONS
+#include <linux/modversions.h>
+#endif
+#endif /* __KERNEL__ && !DUMP_KERNEL*/
+
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME "sparc_linux24"
+#define SYS_NAME_ID SYS_NAME_ID_sparc_linux24
+#define AFSBIG_ENDIAN 1
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
+
+#ifdef KERNEL
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+#endif /* KERNEL */
+
+#if defined(AFS_SMP) && defined(CONFIG_MODVERSIONS)
+/* hack, I don't know what else with theese symbols */
+#define _do_spin_lock _do_spin_lock_R__ver__do_spin_lock
+#define _do_spin_unlock _do_spin_unlock_R__ver__do_spin_unlock
+#define kernel_flag kernel_flag_R__ver_kernel_flag
+#endif
+
+/* on sparclinux is O_LARGEFILE defined but there is not off64_t,
+ so small hack to get usd_file.c work */
+#ifndef KERNEL
+#define __USE_FILE_OFFSET64 1
+#define __USE_LARGEFILE64 1
+#if !defined off64_t
+#define off64_t __off64_t
+#endif
+#endif
+
+#endif /* AFS_PARAM_H */
diff -uwrpN modules/openafs/src/config/param.sparc_linux24_usr.h modules.sparc/openafs/src/config/param.sparc_linux24_usr.h
--- modules/openafs/src/config/param.sparc_linux24_usr.h Wed Dec 31 19:00:00 1969
+++ modules.sparc/openafs/src/config/param.sparc_linux24_usr.h Sun Dec 16 14:23:11 2001
@@ -0,0 +1,57 @@
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL 1 /* user space kernel */
+#define AFS_ENV 1
+#define AFS_USR_LINUX20_ENV 1
+#define AFS_USR_LINUX22_ENV 1
+#define AFS_USR_LINUX24_ENV 1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
+#define AFS_SYSCALL 227
+#define AFS_64BIT_IOPS_ENV 1
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME "sparc_linux24"
+#define SYS_NAME_ID SYS_NAME_ID_sparc_linux24
+#define AFSBIG_ENDIAN 1
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
+
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_fmode uio_fmode
+#define afsio_resid uio_resid
+#define AFS_UIOSYS 1
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES MCLBYTES
+#define AFS_MINCHANGE 2
+#define VATTR_NULL usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
--- kernel-source-2.4.16/arch/sparc/kernel/traps.c Thu Sep 7 11:32:00 2000
+++ kernel-source-2.4.16/arch/sparc/kernel/traps.c Sat Dec 15 01:45:59 2001
@@ -84,6 +84,32 @@ void instruction_dump (unsigned long *pc
printk("\n");
}
+void show_trace_task(struct task_struct *tsk)
+{
+ unsigned long pc, fp;
+ unsigned long task_base = (unsigned long)tsk;
+ struct reg_window *rw;
+ int count = 0;
+
+ if (!tsk)
+ return;
+#define STACK_BIAS 0
+ fp = tsk->thread.ksp + STACK_BIAS;
+ do {
+ /* Bogus frame pointer? */
+ if (fp < (task_base + sizeof(struct task_struct)) ||
+ fp >= (task_base + THREAD_SIZE))
+ break;
+ rw = (struct reg_window *)fp;
+ pc = rw->ins[7];
+ printk("[%016lx] ", pc);
+ fp = rw->ins[6] + STACK_BIAS;
+ } while (++count < 16);
+ printk("\n");
+}
+
+
+
#define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
#define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")