From f4f365c7c9c604ef52f0c6d28d61b7f297167706 Mon Sep 17 00:00:00 2001 From: Mike Becher Date: Fri, 17 Dec 2004 15:28:19 +0000 Subject: [PATCH] ia64-linux26-20041217 add ia64 linux26 support --- README | 1 + src/afs/LINUX/osi_module.c | 12 +-- src/afs/LINUX/osi_prototypes.h | 4 +- src/afs/afs.h | 2 +- src/cf/osconf.m4 | 2 +- src/config/afs_sysnames.h | 1 + src/config/param.ia64_linux26.h | 172 ++++++++++++++++++++++++++++++++ src/util/afs_lhash.c | 54 +++++----- 8 files changed, 211 insertions(+), 37 deletions(-) create mode 100644 src/config/param.ia64_linux26.h diff --git a/README b/README index 6757cd5858..086c44de88 100644 --- a/README +++ b/README @@ -53,6 +53,7 @@ A. Creating the proper directory structure. alpha_linux22 alpha_linux24 ia64_linux24 + ia64_linux26 sparc_linux22 sparc_linux24 sparc64_linux22 diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c index 46948d2919..b7e5f2a290 100644 --- a/src/afs/LINUX/osi_module.c +++ b/src/afs/LINUX/osi_module.c @@ -507,7 +507,7 @@ callproc_read(char *buffer, char **start, off_t offset, int count, static struct proc_dir_entry *openafs_procfs; static int -afsproc_init() +afsproc_init(void) { struct proc_dir_entry *entry1; struct proc_dir_entry *entry; @@ -537,7 +537,7 @@ afsproc_init() } static void -afsproc_exit() +afsproc_exit(void) { remove_proc_entry(PROC_RXSTATS_NAME, openafs_procfs); remove_proc_entry(PROC_SERVICES_NAME, openafs_procfs); @@ -576,9 +576,9 @@ afs_syscall_stub(int r0, int r1, long r2, long r3, long r4, long gp) { __asm__ __volatile__("alloc r42 = ar.pfs, 8, 3, 6, 0\n\t" "mov r41 = b0\n\t" /* save rp */ "mov out0 = in0\n\t" "mov out1 = in1\n\t" "mov out2 = in2\n\t" "mov out3 = in3\n\t" "mov out4 = in4\n\t" "mov out5 = gp\n\t" /* save gp */ - ";;\n" ".L1: mov r3 = ip\n\t" ";;\n\t" "addl r15=.fptr_afs_syscall-.L1,r3\n\t" ";;\n\t" "ld8 r15=[r15]\n\t" ";;\n\t" "ld8 r16=[r15],8\n\t" ";;\n\t" "ld8 gp=[r15]\n\t" "mov b6=r16\n\t" "br.call.sptk.many b0 = b6\n\t" ";;\n\t" "mov ar.pfs = r42\n\t" "mov b0 = r41\n\t" "mov gp = r48\n\t" /* restore gp */ + ";;\n" ".L1:\n\t" "mov r3 = ip\n\t" ";;\n\t" "addl r15=.fptr_afs_syscall-.L1,r3\n\t" ";;\n\t" "ld8 r15=[r15]\n\t" ";;\n\t" "ld8 r16=[r15],8\n\t" ";;\n\t" "ld8 gp=[r15]\n\t" "mov b6=r16\n\t" "br.call.sptk.many b0 = b6\n\t" ";;\n\t" "mov ar.pfs = r42\n\t" "mov b0 = r41\n\t" "mov gp = r48\n\t" /* restore gp */ "br.ret.sptk.many b0\n" ".fptr_afs_syscall:\n\t" - "data8 @fptr(afs_syscall)"); + "data8 @fptr(afs_syscall)\n\t" ".skip 8"); } asmlinkage long @@ -586,9 +586,9 @@ afs_xsetgroups_stub(int r0, int r1, long r2, long r3, long r4, long gp) { __asm__ __volatile__("alloc r42 = ar.pfs, 8, 3, 6, 0\n\t" "mov r41 = b0\n\t" /* save rp */ "mov out0 = in0\n\t" "mov out1 = in1\n\t" "mov out2 = in2\n\t" "mov out3 = in3\n\t" "mov out4 = in4\n\t" "mov out5 = gp\n\t" /* save gp */ - ";;\n" ".L2: mov r3 = ip\n\t" ";;\n\t" "addl r15=.fptr_afs_xsetgroups - .L2,r3\n\t" ";;\n\t" "ld8 r15=[r15]\n\t" ";;\n\t" "ld8 r16=[r15],8\n\t" ";;\n\t" "ld8 gp=[r15]\n\t" "mov b6=r16\n\t" "br.call.sptk.many b0 = b6\n\t" ";;\n\t" "mov ar.pfs = r42\n\t" "mov b0 = r41\n\t" "mov gp = r48\n\t" /* restore gp */ + ";;\n" ".L2:\n\t" "mov r3 = ip\n\t" ";;\n\t" "addl r15=.fptr_afs_xsetgroups - .L2,r3\n\t" ";;\n\t" "ld8 r15=[r15]\n\t" ";;\n\t" "ld8 r16=[r15],8\n\t" ";;\n\t" "ld8 gp=[r15]\n\t" "mov b6=r16\n\t" "br.call.sptk.many b0 = b6\n\t" ";;\n\t" "mov ar.pfs = r42\n\t" "mov b0 = r41\n\t" "mov gp = r48\n\t" /* restore gp */ "br.ret.sptk.many b0\n" ".fptr_afs_xsetgroups:\n\t" - "data8 @fptr(afs_xsetgroups)"); + "data8 @fptr(afs_xsetgroups)\n\t" ".skip 8"); } struct fptr { diff --git a/src/afs/LINUX/osi_prototypes.h b/src/afs/LINUX/osi_prototypes.h index bb87dff0b3..3174826f9d 100644 --- a/src/afs/LINUX/osi_prototypes.h +++ b/src/afs/LINUX/osi_prototypes.h @@ -42,8 +42,8 @@ extern void osi_linux_free_inode_pages(void); extern void check_bad_parent(struct dentry *dp); /* osi_sysctl.c */ -extern int osi_sysctl_init(); -extern void osi_sysctl_clean(); +extern int osi_sysctl_init(void); +extern void osi_sysctl_clean(void); /* osi_vm.c */ extern int osi_VM_FlushVCache(struct vcache *avc, int *slept); diff --git a/src/afs/afs.h b/src/afs/afs.h index c5105aac85..c5087c62a1 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -43,7 +43,7 @@ extern int afs_shuttingdown; #if defined(AFS_HPUX102_ENV) #define AFS_FLOCK k_flock #else -#if defined(AFS_SUN56_ENV) || (defined(AFS_LINUX24_ENV) && !defined(AFS_PPC64_LINUX26_ENV) && !defined(AFS_AMD64_LINUX26_ENV)) +#if defined(AFS_SUN56_ENV) || (defined(AFS_LINUX24_ENV) && !defined(AFS_PPC64_LINUX26_ENV) && !defined(AFS_AMD64_LINUX26_ENV) && !defined(AFS_IA64_LINUX26_ENV)) #define AFS_FLOCK flock64 #else #define AFS_FLOCK flock diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 76d745b758..2adcb09eb1 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -217,7 +217,7 @@ case $AFS_SYSNAME in YACC="bison -y" ;; - ia64_linux24) + ia64_linux24|ia64_linux26) KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 6337df5932..25e0004719 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -173,6 +173,7 @@ #define SYS_NAME_ID_ia64_linux2 2200 #define SYS_NAME_ID_ia64_linux22 2201 #define SYS_NAME_ID_ia64_linux24 2202 +#define SYS_NAME_ID_ia64_linux26 2203 #define SYS_NAME_ID_m68k_linux22 2301 #define SYS_NAME_ID_m68k_linux24 2302 diff --git a/src/config/param.ia64_linux26.h b/src/config/param.ia64_linux26.h new file mode 100644 index 0000000000..db9a29c42a --- /dev/null +++ b/src/config/param.ia64_linux26.h @@ -0,0 +1,172 @@ +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ + +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + +#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 ia64 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_LINUX26_ENV 1 +#define AFS_IA64_LINUX20_ENV 1 +#define AFS_IA64_LINUX22_ENV 1 +#define AFS_IA64_LINUX24_ENV 1 +#define AFS_IA64_LINUX26_ENV 1 +#define AFS_LINUX_64BIT_KERNEL 1 +#define AFS_NONFSTRANS 1 + +#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ +#define AFS_SYSCALL 1141 +#define AFS_64BIT_IOPS_ENV 1 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ + +#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ +#define AFS_64BIT_CLIENT 1 + +#define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ + +#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) +#include +#include +#include +#include + +#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 1 +#ifndef __SMP__ +#define __SMP__ +#endif +#define AFS_GLOBAL_SUNLOCK +#endif + +#if defined(MODULE) && defined(CONFIG_MODVERSIONS) +#define MODVERSIONS +/* #include */ +#endif + +#endif /* __KERNEL__ && !DUMP_KERNEL */ + +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 2 /* Set to Userdisabled, allow sysctl to override */ + +/* Machine / Operating system information */ +#define SYS_NAME "ia64_linux26" +#define SYS_NAME_ID SYS_NAME_ID_ia64_linux26 +#define AFSLITTLE_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 */ + +#define USE_UCONTEXT /* should be in afsconfig.h */ + +#endif /* _PARAM_IA64_LINUX20_H_ */ + +#else /* !defined(UKERNEL) */ + +/* This section for user space compiles only */ + +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + +#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 i386 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_USR_LINUX26_ENV 1 +#define AFS_NONFSTRANS 1 + +#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ +#define AFS_SYSCALL 1141 +#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 "ia64_linux26" +#define SYS_NAME_ID SYS_NAME_ID_ia64_linux26 +#define AFSLITTLE_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 + +#define USE_UCONTEXT /* should be in afsconfig.h */ + +#endif /* AFS_PARAM_H */ + +#endif /* !defined(UKERNEL) */ diff --git a/src/util/afs_lhash.c b/src/util/afs_lhash.c index 265811ca1d..5f76ff2a7c 100644 --- a/src/util/afs_lhash.c +++ b/src/util/afs_lhash.c @@ -169,7 +169,7 @@ afs_lhash_expand(afs_lhash * lh) size_t old_address; /* index of bucket to split */ size_t new_address; /* index of new bucket */ - struct bucket *current; /* for scanning down old chain */ + struct bucket *current_b; /* for scanning down old chain */ struct bucket *previous; struct bucket *last_of_new; /* last element in new chain */ @@ -206,36 +206,36 @@ afs_lhash_expand(afs_lhash * lh) /* relocate records to the new bucket */ - current = lh->table[old_address]; + current_b = lh->table[old_address]; previous = 0; last_of_new = 0; lh->table[new_address] = 0; - while (current) { + while (current_b) { size_t addr; - addr = afs_lhash_address(lh, current->key); + addr = afs_lhash_address(lh, current_b->key); if (addr == new_address) { /* attach it to the end of the new chain */ if (last_of_new) { - last_of_new->next = current; + last_of_new->next = current_b; } else { - lh->table[new_address] = current; + lh->table[new_address] = current_b; } if (previous) { - previous->next = current->next; + previous->next = current_b->next; } else { - lh->table[old_address] = current->next; + lh->table[old_address] = current_b->next; } - last_of_new = current; - current = current->next; + last_of_new = current_b; + current_b = current_b->next; last_of_new->next = 0; } else { #ifdef CHECK_INVARIANTS assert(addr == old_address); #endif /* CHECK_INVARIANTS */ /* leave it on the old chain */ - previous = current; - current = current->next; + previous = current_b; + current_b = current_b->next; } } } @@ -329,10 +329,10 @@ afs_lhash_iter(afs_lhash * lh, #endif /* CHECK_INVARIANTS */ for (i = 0; i < lh->ltable; i++) { - struct bucket *current; + struct bucket *current_b; - for (current = lh->table[i]; current; current = current->next) { - f(i, current->key, current->data); + for (current_b = lh->table[i]; current_b; current_b = current_b->next) { + f(i, current_b->key, current_b->data); } } } @@ -342,15 +342,15 @@ afs_lhash_search(afs_lhash * lh, unsigned key, const void *data) { size_t k; struct bucket *previous; - struct bucket *current; + struct bucket *current_b; lh->search_calls++; k = afs_lhash_address(lh, key); - for (previous = 0, current = lh->table[k]; current; - previous = current, current = current->next) { + for (previous = 0, current_b = lh->table[k]; current_b; + previous = current_b, current_b = current_b->next) { lh->search_tests++; - if (lh->equal(data, current->data)) { + if (lh->equal(data, current_b->data)) { /* * Since we found what we were looking for, move @@ -366,12 +366,12 @@ afs_lhash_search(afs_lhash * lh, unsigned key, const void *data) */ if (previous) { - previous->next = current->next; - current->next = lh->table[k]; - lh->table[k] = current; + previous->next = current_b->next; + current_b->next = lh->table[k]; + lh->table[k] = current_b; } - return current->data; + return current_b->data; } } @@ -382,12 +382,12 @@ void * afs_lhash_rosearch(const afs_lhash * lh, unsigned key, const void *data) { size_t k; - struct bucket *current; + struct bucket *current_b; k = afs_lhash_address(lh, key); - for (current = lh->table[k]; current; current = current->next) { - if (lh->equal(data, current->data)) { - return current->data; + for (current_b = lh->table[k]; current_b; current_b = current_b->next) { + if (lh->equal(data, current_b->data)) { + return current_b->data; } }