From 3d4e40f8868a6626fd44a8192b8a9dfa38c446fd Mon Sep 17 00:00:00 2001 From: Neale Ferguson Date: Fri, 19 Jan 2001 09:33:38 +0000 Subject: [PATCH] STABLE10-s390-linux-20001223 Port for Linux on the IBM S/390 (cherry picked from commit 9a7b4da986b0e2d5610fbdff1246353e2ba8d219) --- src/config/Makefile.s390_linux22 | 50 +++++++++++++++++++++ src/config/afs_sysnames.h | 4 ++ src/config/param.s390_linux22.h | 67 +++++++++++++++++++++++++++++ src/config/param.s390_linux22_usr.h | 56 ++++++++++++++++++++++++ src/des/andrew-conf.h | 4 ++ src/des/conf-s390-linux.h | 15 +++++++ src/libafs/MakefileProto.LINUX | 5 +++ src/venus/kdump.c | 19 ++++++-- 8 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 src/config/Makefile.s390_linux22 create mode 100644 src/config/param.s390_linux22.h create mode 100644 src/config/param.s390_linux22_usr.h create mode 100644 src/des/conf-s390-linux.h diff --git a/src/config/Makefile.s390_linux22 b/src/config/Makefile.s390_linux22 new file mode 100644 index 000000000..a8ee3b65d --- /dev/null +++ b/src/config/Makefile.s390_linux22 @@ -0,0 +1,50 @@ +# 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.16 + +# +# 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= +# +# programs +AR=ar +AS=as +CP=cp +INSTALL=${SRCDIR}bin/install +LD=gcc +MT_CC=gcc +MV=mv +RANLIB=ranlib +RM=rm +WASHTOOL=${SRCDIR}bin/washtool +# +# Other OS specific requirements +# +YACC = bison -y +LEX = flex -l +# Used in des library. +CRYPT_OBJ = crypt.o diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 32504e411..7f5ed76f9 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -120,6 +120,10 @@ #define SYS_NAME_ID_sparc64_linux2 1800 #define SYS_NAME_ID_sparc64_linux22 1801 +#define SYS_NAME_ID_s390_linux2 1900 +#define SYS_NAME_ID_s390_linux22 1901 +#define SYS_NAME_ID_s390_linux24 1902 + /* * Placeholder to keep system-wide standard flags since this file is included by all diff --git a/src/config/param.s390_linux22.h b/src/config/param.s390_linux22.h new file mode 100644 index 000000000..f9fbb048d --- /dev/null +++ b/src/config/param.s390_linux22.h @@ -0,0 +1,67 @@ +/* Copyright (C) 1998 by Transarc Corporation */ + + +#ifndef _PARAM_S390_LINUX22_H_ +#define _PARAM_S390_LINUX22_H_ + +/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously s390 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_S390_LINUX20_ENV 1 +#define AFS_S390_LINUX22_ENV 1 +#define AFS_NONFSTRANS 1 + +#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ +#define AFS_SYSCALL 137 +#define AFS_64BIT_IOPS_ENV 1 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#include + +#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 "s390_linux22" +#define SYS_NAME_ID SYS_NAME_ID_s390_linux22 +#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 */ + +#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) +#include +#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 CONFIG_S390_LOCAL_APIC +#define CONFIG_S390_LOCAL_APIC +#endif +#define __SMP__ +#define AFS_GLOBAL_SUNLOCK +#endif + +#endif /* __KERNEL__ && !DUMP_KERNEL*/ + +#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 */ + +#endif /* _PARAM_S390_LINUX20_H_ */ diff --git a/src/config/param.s390_linux22_usr.h b/src/config/param.s390_linux22_usr.h new file mode 100644 index 000000000..b26439c04 --- /dev/null +++ b/src/config/param.s390_linux22_usr.h @@ -0,0 +1,56 @@ +/* Copyright (C) 1998 by Transarc Corporation */ + + +#ifndef _PARAM_USR_S390_LINUX22_H_ +#define _PARAM_USR_S390_LINUX22_H_ + +/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously s390 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_NONFSTRANS 1 + +#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ +#define AFS_SYSCALL 137 +#define AFS_64BIT_IOPS_ENV 1 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#include + +#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 "s390_linux22" +#define SYS_NAME_ID SYS_NAME_ID_s390_linux22 +#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 /* _PARAM_USR_S390_LINUX22_H_ */ diff --git a/src/des/andrew-conf.h b/src/des/andrew-conf.h index 554b41423..99ec3cde2 100644 --- a/src/des/andrew-conf.h +++ b/src/des/andrew-conf.h @@ -50,7 +50,11 @@ #ifdef AFS_SPARC64_LINUX20_ENV #include "conf-sparc64-linux.h" #else +#ifdef AFS_S390_LINUX20_ENV +#include "conf-s390-linux.h" +#else #include "conf-i386-linux.h" +#endif /* AFS_S390_LINUX20_ENV */ #endif /* AFS_SPARC64_LINUX20_ENV */ #endif /* AFS_SPARC_LINUX20_ENV */ #endif diff --git a/src/des/conf-s390-linux.h b/src/des/conf-s390-linux.h new file mode 100644 index 000000000..90a74d7b5 --- /dev/null +++ b/src/des/conf-s390-linux.h @@ -0,0 +1,15 @@ +/* + * Copyright 1988 by the Massachusetts Institute of Technology. + * + * For copying and distribution information, please see the file + * . + * + * Machine-type definitions: Linux on Intel + */ + +#include + +#define BITS32 +#define BIG +#define MSBFIRST +#define MUSTALIGN diff --git a/src/libafs/MakefileProto.LINUX b/src/libafs/MakefileProto.LINUX index 62aa3d4b5..98f9ca732 100644 --- a/src/libafs/MakefileProto.LINUX +++ b/src/libafs/MakefileProto.LINUX @@ -41,6 +41,11 @@ CCFLAGS = -O2 -fomit-frame-pointer \ -fno-strength-reduce -pipe -m486 -malign-loops=2 -malign-jumps=2 \ -malign-functions=2 DEFINES = -D__KERNEL__ -DCPU=586 -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} + +CCFLAGS = -O2 -fomit-frame-pointer -fno-strength-reduce \ + -fno-strict-aliasing -fsigned-char -pipe \ + -fno-builtin +DEFINES = -D__KERNEL__ -D__s390__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} LD = ld -m elf32_sparc CCFLAGS = -O2 -fomit-frame-pointer \ diff --git a/src/venus/kdump.c b/src/venus/kdump.c index 880ab7e94..e72d19bd4 100644 --- a/src/venus/kdump.c +++ b/src/venus/kdump.c @@ -210,9 +210,19 @@ typedef struct adaptive_mutex2 adaptive_mutex2_t; #undef ULONG_MAX #define _LINUX_TIME_H #define _LINUX_FCNTL_H -#define _I386_STATFS_H -#define _SPARC_STATFS_H +#ifdef AFS_S390_LINUX20_ENV +#define _S390_STATFS_H +#else +#ifdef AFS_SPARC64_LINUX20_ENV #define _SPARC64_STATFS_H +#else +#ifdef AFS_SPARC_LINUX20_ENV +#define _SPARC_STATFS_H +#else +#define _I386_STATFS_H +#endif /* AFS_SPARC_LINUX20_ENV */ +#endif /* AFS_SPARC64_LINUX20_ENV */ +#endif /* AFS_S390_LINUX20_ENV */ struct timezone { int a,b; }; @@ -220,8 +230,11 @@ typedef struct timeval { int tv_sec; int tv_usec; } timeval_t; /* Needed here since KERNEL defined. */ -#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H +#if defined(AFSBIG_ENDIAN) #define _LINUX_BYTEORDER_BIG_ENDIAN_H +#else +#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H +#endif #include #include #include -- 2.39.5