* Re: Using 8 Instruction and Data BAT registers in 82xx
From: Tom Rini @ 2004-01-27 17:18 UTC (permalink / raw)
To: Dave Johnson; +Cc: cort, linux-kernel, linuxppc-dev
In-Reply-To: <20040126182941.50687.qmail@web21405.mail.yahoo.com>
On Mon, Jan 26, 2004 at 10:29:41AM -0800, Dave Johnson wrote:
>
> Hi All:
> As there are 8 data and Instruction BAT registers in
> some 82xx flavors, and Cort has posted a patch to ADD
> these registers
> (http://www.ussg.iu.edu/hypermail/linux/kernel/0209.1/0871.html)
> I was wondering if anyone has any idea how to use
> these addistional BAT regs be used?? Perhaps for new
> processes and threads, etc.
Step one would be to audit the usages of the 8_BATS feature to ensure
that they'll be fine if invoked on an 82xx with 8 BATS. It's almost
certainly going to be true, but should still be done.
Step two would be to distinguish the 82xx's with 8 BATs from the ones
that don't. I don't know if these have a different PVR, but I hope they
do, otherwise it'll be harder (but not impossible certainly) to.
Finally, as you've probably surmised, all that we do with these
additional BATs is to clear them out. It could be possible to extend
io_block_mapping to make use of these additional BATs (and
v_mapped_by_bats/p_mapped_by_bats, etc).
Trying to do processes and/or threads (i.e. userland stuff) becomes a
giant pain (per-context BAT mappings have to be tracked), there's lots
of security implications to keep in mind, and of course the overhead of
doing all of this will probably cancel out any speed gain you would have
otherwise gotten.
--
Tom Rini
http://gate.crashing.org/~trini/
^ permalink raw reply
* [U-Boot-Users] Endianness for MIPS
From: Jerry Walden @ 2004-01-27 22:54 UTC (permalink / raw)
To: u-boot
Hello -
I am working on the DBAU1X00 version, and the readme says that it was
created for big endian.
My board (based on the Alchemy eval board) is set for little endian.
Are the changes I will need to make be extensive?
Beyond the obvious - what things (specifically in the source) should I
watch out for?
Thanks for any help.
^ permalink raw reply
* NGROUPS 2.6.2rc2
From: Tim Hockin @ 2004-01-27 22:53 UTC (permalink / raw)
To: torvalds, Linux Kernel mailing list; +Cc: rusty
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
(sorry if this dups, screwup in my aliases file)
Linus,
Attached is a patch to remove the NGROUPS limit (again). This patch is
against linux-2.6.2rc2. If it is OK, I can make it bitkeeper accessible.
This does not use vmalloc, but instead uses an array of pages. It also will
require a glibc patch which I will pop off as soon as I get the OK on this
(I've been reworking this every few months for about 2 years now).
It does duplicate some code in the compat code for some architectures. I'll
follow this up with a cleanup patch for that, I promise.
This patch changes the security interface for task_setgroups().
This throughly breaks intermezzo, though I don't know if anyone will notice.
What think? Can we get rid of this limit at long last? :)
Tim
On Mon, Sep 29, 2003 at 04:10:23PM -0700, Linus Torvalds wrote:
> I'm definitely happier about this one._
>_
> Not that I'm any more thrilled about users using thousands of groups. But_
> this looks a bit saner.
--
Tim Hockin
Sun Microsystems, Linux Software Engineering
thockin@sun.com
All opinions are my own, not Sun's
[-- Attachment #2: ngroups-2.6.2rc2-2.diff --]
[-- Type: text/plain, Size: 34551 bytes --]
===== include/linux/sched.h 1.178 vs edited =====
--- 1.178/include/linux/sched.h Mon Jan 19 15:38:15 2004
+++ edited/include/linux/sched.h Tue Jan 27 12:40:02 2004
@@ -329,6 +329,32 @@
struct io_context; /* See blkdev.h */
void exit_io_context(void);
+#define NGROUPS_SMALL 32
+#define NGROUPS_BLOCK ((int)(EXEC_PAGESIZE / sizeof(gid_t)))
+struct group_info {
+ int ngroups;
+ atomic_t usage;
+ gid_t small_block[NGROUPS_SMALL];
+ int nblocks;
+ gid_t *blocks[0];
+};
+
+#define get_group_info(info) do { \
+ atomic_inc(&(info)->usage); \
+} while (0)
+
+#define put_group_info(info) do { \
+ if (atomic_dec_and_test(&(info)->usage)) \
+ groups_free(info); \
+} while (0)
+
+struct group_info *groups_alloc(int gidsetsize);
+void groups_free(struct group_info *info);
+int set_current_groups(struct group_info *info);
+/* access the groups "array" with this macro */
+#define GROUP_AT(gi, i) ((gi)->blocks[(i)/NGROUPS_BLOCK][(i)%NGROUPS_BLOCK])
+
+
struct task_struct {
volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
struct thread_info *thread_info;
@@ -403,8 +429,7 @@
/* process credentials */
uid_t uid,euid,suid,fsuid;
gid_t gid,egid,sgid,fsgid;
- int ngroups;
- gid_t groups[NGROUPS];
+ struct group_info *group_info;
kernel_cap_t cap_effective, cap_inheritable, cap_permitted;
int keep_capabilities:1;
struct user_struct *user;
===== include/linux/init_task.h 1.27 vs edited =====
--- 1.27/include/linux/init_task.h Mon Aug 18 19:46:23 2003
+++ edited/include/linux/init_task.h Tue Jan 27 12:40:02 2004
@@ -56,6 +56,8 @@
.siglock = SPIN_LOCK_UNLOCKED, \
}
+extern struct group_info init_groups;
+
/*
* INIT_TASK is used to set up the first task table, touch at
* your own risk!. Base=0, limit=0x1fffff (=2MB)
@@ -87,6 +89,7 @@
.real_timer = { \
.function = it_real_fn \
}, \
+ .group_info = &init_groups, \
.cap_effective = CAP_INIT_EFF_SET, \
.cap_inheritable = CAP_INIT_INH_SET, \
.cap_permitted = CAP_FULL_SET, \
===== include/linux/limits.h 1.3 vs edited =====
--- 1.3/include/linux/limits.h Tue Feb 5 07:28:33 2002
+++ edited/include/linux/limits.h Tue Jan 27 12:40:02 2004
@@ -3,7 +3,6 @@
#define NR_OPEN 1024
-#define NGROUPS_MAX 32 /* supplemental group IDs are available */
#define ARG_MAX 131072 /* # bytes of args + environ for exec() */
#define CHILD_MAX 999 /* no limit :-) */
#define OPEN_MAX 256 /* # open files a process may have */
===== kernel/sys.c 1.69 vs edited =====
--- 1.69/kernel/sys.c Mon Jan 19 15:38:13 2004
+++ edited/kernel/sys.c Tue Jan 27 12:40:02 2004
@@ -1091,9 +1091,163 @@
/*
* Supplementary group IDs
*/
-asmlinkage long sys_getgroups(int gidsetsize, gid_t __user *grouplist)
+
+/* init to 2 - one for init_task, one to ensure it is never freed */
+struct group_info init_groups = { .usage = ATOMIC_INIT(2) };
+
+struct group_info *groups_alloc(int gidsetsize)
+{
+ struct group_info *info;
+ int nblocks;
+
+ nblocks = (gidsetsize/NGROUPS_BLOCK) + (gidsetsize%NGROUPS_BLOCK?1:0);
+ info = kmalloc(sizeof(*info) + nblocks*sizeof(gid_t *), GFP_USER);
+ if (!info)
+ return NULL;
+ info->ngroups = gidsetsize;
+ info->nblocks = nblocks;
+ atomic_set(&info->usage, 1);
+
+ if (gidsetsize <= NGROUPS_SMALL) {
+ info->blocks[0] = info->small_block;
+ } else {
+ int i;
+ for (i = 0; i < nblocks; i++) {
+ gid_t *b;
+ b = (void *)__get_free_page(GFP_USER);
+ if (!b) {
+ int j;
+ for (j = 0; j < i; j++)
+ free_page((unsigned long)info->blocks[j]);
+ kfree(info);
+ return NULL;
+ }
+ info->blocks[i] = b;
+ }
+ }
+ return info;
+}
+
+void groups_free(struct group_info *info)
{
+ if (info->ngroups > NGROUPS_SMALL) {
+ int i;
+ for (i = 0; i < info->nblocks; i++)
+ free_page((unsigned long)info->blocks[i]);
+ }
+ kfree(info);
+}
+
+/* export the group_info to a user-space array */
+static int groups_to_user(gid_t *grouplist, struct group_info __user *info)
+{
+ int i;
+ int count = info->ngroups;
+
+ for (i = 0; i < info->nblocks; i++) {
+ int cp_count = min(NGROUPS_BLOCK, count);
+ int off = i * NGROUPS_BLOCK;
+ int len = cp_count * sizeof(*grouplist);
+
+ if (copy_to_user(grouplist+off, info->blocks[i], len))
+ return -EFAULT;
+
+ count -= cp_count;
+ }
+ return 0;
+}
+
+/* fill a group_info from a user-space array - it must be allocated already */
+static int groups_from_user(struct group_info *info, gid_t __user *grouplist)
+ {
int i;
+ int count = info->ngroups;
+
+ for (i = 0; i < info->nblocks; i++) {
+ int cp_count = min(NGROUPS_BLOCK, count);
+ int off = i * NGROUPS_BLOCK;
+ int len = cp_count * sizeof(*grouplist);
+
+ if (copy_from_user(info->blocks[i], grouplist+off, len))
+ return -EFAULT;
+
+ count -= cp_count;
+ }
+ return 0;
+}
+
+/* a simple shell-metzner sort */
+static void groups_sort(struct group_info *info)
+{
+ int base, max, stride;
+ int gidsetsize = info->ngroups;
+
+ for (stride = 1; stride < gidsetsize; stride = 3 * stride + 1)
+ ; /* nothing */
+ stride /= 3;
+
+ while (stride) {
+ max = gidsetsize - stride;
+ for (base = 0; base < max; base++) {
+ int left = base;
+ int right = left + stride;
+ gid_t tmp = GROUP_AT(info, right);
+
+ while (left >= 0 && GROUP_AT(info, left) > tmp) {
+ GROUP_AT(info, right) = GROUP_AT(info, left);
+ left -= stride;
+ right = left + stride;
+ }
+ GROUP_AT(info, right) = tmp;
+ }
+ stride /= 3;
+ }
+}
+
+/* a simple bsearch */
+static int groups_search(struct group_info *info, gid_t grp)
+{
+ int left, right;
+
+ if (!info)
+ return 0;
+
+ left = 0;
+ right = info->ngroups;
+ while (left < right) {
+ int mid = (left+right)/2;
+ int cmp = grp - GROUP_AT(info, mid);
+ if (cmp > 0)
+ left = mid + 1;
+ else if (cmp < 0)
+ right = mid;
+ else
+ return 1;
+ }
+ return 0;
+}
+
+/* validate and set current->group_info */
+int set_current_groups(struct group_info *info)
+{
+ int retval;
+ struct group_info *old_info;
+
+ retval = security_task_setgroups(info);
+ if (retval)
+ return retval;
+
+ groups_sort(info);
+ old_info = current->group_info;
+ current->group_info = info;
+ put_group_info(old_info);
+
+ return 0;
+}
+
+asmlinkage long sys_getgroups(int gidsetsize, gid_t __user *grouplist)
+{
+ int i = 0;
/*
* SMP: Nobody else can change our grouplist. Thus we are
@@ -1102,54 +1256,43 @@
if (gidsetsize < 0)
return -EINVAL;
- i = current->ngroups;
+ i = current->group_info->ngroups;
if (gidsetsize) {
if (i > gidsetsize)
return -EINVAL;
- if (copy_to_user(grouplist, current->groups, sizeof(gid_t)*i))
+ if (groups_to_user(grouplist, current->group_info))
return -EFAULT;
}
return i;
}
/*
- * SMP: Our groups are not shared. We can copy to/from them safely
+ * SMP: Our groups are copy-on-write. We can set them safely
* without another task interfering.
*/
asmlinkage long sys_setgroups(int gidsetsize, gid_t __user *grouplist)
{
- gid_t groups[NGROUPS];
+ struct group_info *new_info;
int retval;
if (!capable(CAP_SETGID))
return -EPERM;
- if ((unsigned) gidsetsize > NGROUPS)
- return -EINVAL;
- if (copy_from_user(groups, grouplist, gidsetsize * sizeof(gid_t)))
- return -EFAULT;
- retval = security_task_setgroups(gidsetsize, groups);
- if (retval)
+
+ new_info = groups_alloc(gidsetsize);
+ if (!new_info)
+ return -ENOMEM;
+ retval = groups_from_user(new_info, grouplist);
+ if (retval) {
+ groups_free(new_info);
return retval;
- memcpy(current->groups, groups, gidsetsize * sizeof(gid_t));
- current->ngroups = gidsetsize;
- return 0;
-}
+ }
-static int supplemental_group_member(gid_t grp)
-{
- int i = current->ngroups;
+ retval = set_current_groups(new_info);
+ if (retval)
+ groups_free(new_info);
- if (i) {
- gid_t *groups = current->groups;
- do {
- if (*groups == grp)
- return 1;
- groups++;
- i--;
- } while (i);
- }
- return 0;
+ return retval;
}
/*
@@ -1159,7 +1302,7 @@
{
int retval = 1;
if (grp != current->fsgid)
- retval = supplemental_group_member(grp);
+ retval = groups_search(current->group_info, grp);
return retval;
}
@@ -1169,7 +1312,7 @@
{
int retval = 1;
if (grp != current->egid)
- retval = supplemental_group_member(grp);
+ retval = groups_search(current->group_info, grp);
return retval;
}
===== kernel/fork.c 1.154 vs edited =====
--- 1.154/kernel/fork.c Mon Jan 19 15:38:15 2004
+++ edited/kernel/fork.c Tue Jan 27 12:40:02 2004
@@ -86,6 +86,7 @@
security_task_free(tsk);
free_uid(tsk->user);
+ put_group_info(tsk->group_info);
free_task(tsk);
}
@@ -878,6 +879,7 @@
atomic_inc(&p->user->__count);
atomic_inc(&p->user->processes);
+ get_group_info(p->group_info);
/*
* If multiple threads are within copy_process(), then this check
@@ -1084,6 +1086,7 @@
bad_fork_cleanup_put_domain:
module_put(p->thread_info->exec_domain->module);
bad_fork_cleanup_count:
+ put_group_info(p->group_info);
atomic_dec(&p->user->processes);
free_uid(p->user);
bad_fork_free:
===== kernel/uid16.c 1.5 vs edited =====
--- 1.5/kernel/uid16.c Wed Apr 9 20:51:27 2003
+++ edited/kernel/uid16.c Tue Jan 27 12:40:02 2004
@@ -107,20 +107,57 @@
return sys_setfsgid((gid_t)gid);
}
+static int groups16_to_user(old_gid_t __user *grouplist,
+ struct group_info *info)
+{
+ int i;
+ old_gid_t group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_WRITE, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
+
+ for (i = 0; i < info->ngroups; i++) {
+ group = (old_gid_t)GROUP_AT(info, i);
+ if (__put_user(group, grouplist+i))
+ return -EFAULT;
+ }
+
+ return 0;
+}
+
+static int groups16_from_user(struct group_info *info,
+ old_gid_t __user *grouplist)
+{
+ int i;
+ old_gid_t group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_READ, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
+
+ for (i = 0; i < info->ngroups; i++) {
+ if (__get_user(group, grouplist+i))
+ return -EFAULT;
+ GROUP_AT(info, i) = (gid_t)group;
+ }
+
+ return 0;
+}
+
asmlinkage long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist)
{
- old_gid_t groups[NGROUPS];
- int i,j;
+ int i = 0;
if (gidsetsize < 0)
return -EINVAL;
- i = current->ngroups;
+ i = current->group_info->ngroups;
if (gidsetsize) {
if (i > gidsetsize)
return -EINVAL;
- for(j=0;j<i;j++)
- groups[j] = current->groups[j];
- if (copy_to_user(grouplist, groups, sizeof(old_gid_t)*i))
+ if (groups16_to_user(grouplist, current->group_info))
return -EFAULT;
}
return i;
@@ -128,24 +165,25 @@
asmlinkage long sys_setgroups16(int gidsetsize, old_gid_t __user *grouplist)
{
- old_gid_t groups[NGROUPS];
- gid_t new_groups[NGROUPS];
- int i;
+ struct group_info *new_info;
+ int retval;
if (!capable(CAP_SETGID))
return -EPERM;
- if ((unsigned) gidsetsize > NGROUPS)
- return -EINVAL;
- if (copy_from_user(groups, grouplist, gidsetsize * sizeof(old_gid_t)))
- return -EFAULT;
- for (i = 0 ; i < gidsetsize ; i++)
- new_groups[i] = (gid_t)groups[i];
- i = security_task_setgroups(gidsetsize, new_groups);
- if (i)
- return i;
- memcpy(current->groups, new_groups, gidsetsize * sizeof(gid_t));
- current->ngroups = gidsetsize;
- return 0;
+ new_info = groups_alloc(gidsetsize);
+ if (!new_info)
+ return -ENOMEM;
+ retval = groups16_from_user(new_info, grouplist);
+ if (retval) {
+ groups_free(new_info);
+ return retval;
+ }
+
+ retval = set_current_groups(new_info);
+ if (retval)
+ groups_free(new_info);
+
+ return retval;
}
asmlinkage long sys_getuid16(void)
===== fs/proc/array.c 1.55 vs edited =====
--- 1.55/fs/proc/array.c Tue Oct 14 14:00:09 2003
+++ edited/fs/proc/array.c Tue Jan 27 12:40:02 2004
@@ -176,8 +176,8 @@
p->files ? p->files->max_fds : 0);
task_unlock(p);
- for (g = 0; g < p->ngroups; g++)
- buffer += sprintf(buffer, "%d ", p->groups[g]);
+ for (g = 0; g < min(p->group_info->ngroups,NGROUPS_SMALL); g++)
+ buffer += sprintf(buffer, "%d ", GROUP_AT(p->group_info,g));
buffer += sprintf(buffer, "\n");
return buffer;
===== include/linux/sunrpc/auth.h 1.9 vs edited =====
--- 1.9/include/linux/sunrpc/auth.h Wed Jun 11 19:22:40 2003
+++ edited/include/linux/sunrpc/auth.h Tue Jan 27 12:40:02 2004
@@ -28,8 +28,7 @@
struct auth_cred {
uid_t uid;
gid_t gid;
- int ngroups;
- gid_t *groups;
+ struct group_info *group_info;
};
/*
===== include/linux/sunrpc/svcauth.h 1.9 vs edited =====
--- 1.9/include/linux/sunrpc/svcauth.h Fri Jan 10 17:55:15 2003
+++ edited/include/linux/sunrpc/svcauth.h Tue Jan 27 12:40:02 2004
@@ -16,10 +16,11 @@
#include <linux/sunrpc/cache.h>
#include <linux/hash.h>
+#define SVC_CRED_NGROUPS 32
struct svc_cred {
uid_t cr_uid;
gid_t cr_gid;
- gid_t cr_groups[NGROUPS];
+ gid_t cr_groups[SVC_CRED_NGROUPS];
};
struct svc_rqst; /* forward decl */
===== net/sunrpc/auth.c 1.12 vs edited =====
--- 1.12/net/sunrpc/auth.c Wed Jun 11 19:22:40 2003
+++ edited/net/sunrpc/auth.c Tue Jan 27 12:40:02 2004
@@ -249,8 +249,7 @@
struct auth_cred acred = {
.uid = current->fsuid,
.gid = current->fsgid,
- .ngroups = current->ngroups,
- .groups = current->groups,
+ .group_info = current->group_info,
};
dprintk("RPC: looking up %s cred\n",
auth->au_ops->au_name);
@@ -264,8 +263,7 @@
struct auth_cred acred = {
.uid = current->fsuid,
.gid = current->fsgid,
- .ngroups = current->ngroups,
- .groups = current->groups,
+ .group_info = current->group_info,
};
dprintk("RPC: %4d looking up %s cred\n",
===== net/sunrpc/auth_unix.c 1.11 vs edited =====
--- 1.11/net/sunrpc/auth_unix.c Mon Feb 24 08:08:37 2003
+++ edited/net/sunrpc/auth_unix.c Tue Jan 27 12:40:02 2004
@@ -82,7 +82,7 @@
cred->uc_gid = cred->uc_pgid = 0;
cred->uc_gids[0] = NOGROUP;
} else {
- int groups = acred->ngroups;
+ int groups = acred->group_info->ngroups;
if (groups > NFS_NGROUPS)
groups = NFS_NGROUPS;
@@ -91,7 +91,7 @@
cred->uc_puid = current->uid;
cred->uc_pgid = current->gid;
for (i = 0; i < groups; i++)
- cred->uc_gids[i] = (gid_t) acred->groups[i];
+ cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
if (i < NFS_NGROUPS)
cred->uc_gids[i] = NOGROUP;
}
@@ -126,11 +126,11 @@
|| cred->uc_pgid != current->gid)
return 0;
- groups = acred->ngroups;
+ groups = acred->group_info->ngroups;
if (groups > NFS_NGROUPS)
groups = NFS_NGROUPS;
for (i = 0; i < groups ; i++)
- if (cred->uc_gids[i] != (gid_t) acred->groups[i])
+ if (cred->uc_gids[i] != GROUP_AT(acred->group_info, i))
return 0;
return 1;
}
===== net/sunrpc/svcauth_unix.c 1.20 vs edited =====
--- 1.20/net/sunrpc/svcauth_unix.c Thu Jun 26 21:21:42 2003
+++ edited/net/sunrpc/svcauth_unix.c Tue Jan 27 12:40:02 2004
@@ -434,11 +434,11 @@
if (slen > 16 || (len -= (slen + 2)*4) < 0)
goto badcred;
for (i = 0; i < slen; i++)
- if (i < NGROUPS)
+ if (i < SVC_CRED_NGROUPS)
cred->cr_groups[i] = ntohl(svc_getu32(argv));
else
svc_getu32(argv);
- if (i < NGROUPS)
+ if (i < SVC_CRED_NGROUPS)
cred->cr_groups[i] = NOGROUP;
if (svc_getu32(argv) != RPC_AUTH_NULL || svc_getu32(argv) != 0) {
===== fs/nfsd/auth.c 1.2 vs edited =====
--- 1.2/fs/nfsd/auth.c Tue Jun 17 16:31:29 2003
+++ edited/fs/nfsd/auth.c Tue Jan 27 12:40:02 2004
@@ -10,12 +10,15 @@
#include <linux/sunrpc/svcauth.h>
#include <linux/nfsd/nfsd.h>
+extern asmlinkage long sys_setgroups(int gidsetsize, gid_t *grouplist);
+
#define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
void
nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
{
struct svc_cred *cred = &rqstp->rq_cred;
int i;
+ gid_t groups[SVC_CRED_NGROUPS];
if (exp->ex_flags & NFSEXP_ALLSQUASH) {
cred->cr_uid = exp->ex_anon_uid;
@@ -26,7 +29,7 @@
cred->cr_uid = exp->ex_anon_uid;
if (!cred->cr_gid)
cred->cr_gid = exp->ex_anon_gid;
- for (i = 0; i < NGROUPS; i++)
+ for (i = 0; i < SVC_CRED_NGROUPS; i++)
if (!cred->cr_groups[i])
cred->cr_groups[i] = exp->ex_anon_gid;
}
@@ -39,13 +42,13 @@
current->fsgid = cred->cr_gid;
else
current->fsgid = exp->ex_anon_gid;
- for (i = 0; i < NGROUPS; i++) {
+ for (i = 0; i < SVC_CRED_NGROUPS; i++) {
gid_t group = cred->cr_groups[i];
if (group == (gid_t) NOGROUP)
break;
- current->groups[i] = group;
+ groups[i] = group;
}
- current->ngroups = i;
+ sys_setgroups(i, groups);
if ((cred->cr_uid)) {
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
===== fs/nfsd/nfs4state.c 1.21 vs edited =====
--- 1.21/fs/nfsd/nfs4state.c Tue Oct 7 17:52:28 2003
+++ edited/fs/nfsd/nfs4state.c Tue Jan 27 12:40:02 2004
@@ -244,7 +244,7 @@
target->cr_uid = source->cr_uid;
target->cr_gid = source->cr_gid;
- for(i = 0; i < NGROUPS; i++)
+ for(i = 0; i < SVC_CRED_NGROUPS; i++)
target->cr_groups[i] = source->cr_groups[i];
}
===== include/linux/security.h 1.28 vs edited =====
--- 1.28/include/linux/security.h Tue Jan 20 17:58:48 2004
+++ edited/include/linux/security.h Tue Jan 27 12:40:02 2004
@@ -554,9 +554,8 @@
* Return 0 if permission is granted.
* @task_setgroups:
* Check permission before setting the supplementary group set of the
- * current process to @grouplist.
- * @gidsetsize contains the number of elements in @grouplist.
- * @grouplist contains the array of gids.
+ * current process.
+ * @group_info contains the new group information.
* Return 0 if permission is granted.
* @task_setnice:
* Check permission before setting the nice value of @p to @nice.
@@ -1116,7 +1115,7 @@
int (*task_setpgid) (struct task_struct * p, pid_t pgid);
int (*task_getpgid) (struct task_struct * p);
int (*task_getsid) (struct task_struct * p);
- int (*task_setgroups) (int gidsetsize, gid_t * grouplist);
+ int (*task_setgroups) (struct group_info *group_info);
int (*task_setnice) (struct task_struct * p, int nice);
int (*task_setrlimit) (unsigned int resource, struct rlimit * new_rlim);
int (*task_setscheduler) (struct task_struct * p, int policy,
@@ -1670,9 +1669,9 @@
return security_ops->task_getsid (p);
}
-static inline int security_task_setgroups (int gidsetsize, gid_t *grouplist)
+static inline int security_task_setgroups (struct group_info *group_info)
{
- return security_ops->task_setgroups (gidsetsize, grouplist);
+ return security_ops->task_setgroups (group_info);
}
static inline int security_task_setnice (struct task_struct *p, int nice)
@@ -2299,7 +2298,7 @@
return 0;
}
-static inline int security_task_setgroups (int gidsetsize, gid_t *grouplist)
+static inline int security_task_setgroups (struct group_info *group_info)
{
return 0;
}
===== security/dummy.c 1.30 vs edited =====
--- 1.30/security/dummy.c Tue Jan 20 17:58:48 2004
+++ edited/security/dummy.c Tue Jan 27 12:40:02 2004
@@ -539,7 +539,7 @@
return 0;
}
-static int dummy_task_setgroups (int gidsetsize, gid_t * grouplist)
+static int dummy_task_setgroups (struct group_info *group_info)
{
return 0;
}
===== arch/ia64/ia32/sys_ia32.c 1.87 vs edited =====
--- 1.87/arch/ia64/ia32/sys_ia32.c Mon Jan 12 16:31:14 2004
+++ edited/arch/ia64/ia32/sys_ia32.c Tue Jan 27 12:40:02 2004
@@ -2413,44 +2413,85 @@
return sys_lseek(fd, offset, whence);
}
-extern asmlinkage long sys_getgroups (int gidsetsize, gid_t *grouplist);
+static int
+groups16_to_user(short *grouplist, struct group_info *info)
+{
+ int i;
+ short group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_WRITE, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
+
+ for (i = 0; i < info->ngroups; i++) {
+ group = (short)GROUP_AT(info, i);
+ if (__put_user(group, grouplist+i))
+ return -EFAULT;
+ }
+
+ return 0;
+}
+
+static int
+groups16_from_user(struct group_info *info, short *grouplist)
+{
+ int i;
+ short group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_READ, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
+
+ for (i = 0; i < info->ngroups; i++) {
+ if (__get_user(group, grouplist+i))
+ return -EFAULT;
+ GROUP_AT(info, i) = (gid_t)group;
+ }
+
+ return 0;
+}
asmlinkage long
sys32_getgroups16 (int gidsetsize, short *grouplist)
{
- mm_segment_t old_fs = get_fs();
- gid_t gl[NGROUPS];
- int ret, i;
-
- set_fs(KERNEL_DS);
- ret = sys_getgroups(gidsetsize, gl);
- set_fs(old_fs);
-
- if (gidsetsize && ret > 0 && ret <= NGROUPS)
- for (i = 0; i < ret; i++, grouplist++)
- if (put_user(gl[i], grouplist))
- return -EFAULT;
- return ret;
-}
+ int i;
-extern asmlinkage long sys_setgroups (int gidsetsize, gid_t *grouplist);
+ if (gidsetsize < 0)
+ return -EINVAL;
+ i = current->group_info->ngroups;
+ if (gidsetsize) {
+ if (i > gidsetsize)
+ return -EINVAL;
+ if (groups16_to_user(grouplist, current->group_info))
+ return -EFAULT;
+ }
+ return i;
+}
asmlinkage long
sys32_setgroups16 (int gidsetsize, short *grouplist)
{
- mm_segment_t old_fs = get_fs();
- gid_t gl[NGROUPS];
- int ret, i;
+ struct group_info *new_info;
+ int retval;
- if ((unsigned) gidsetsize > NGROUPS)
- return -EINVAL;
- for (i = 0; i < gidsetsize; i++, grouplist++)
- if (get_user(gl[i], grouplist))
- return -EFAULT;
- set_fs(KERNEL_DS);
- ret = sys_setgroups(gidsetsize, gl);
- set_fs(old_fs);
- return ret;
+ if (!capable(CAP_SETGID))
+ return -EPERM;
+ new_info = groups_alloc(gidsetsize);
+ if (!new_info)
+ return -ENOMEM;
+ retval = groups16_from_user(new_info, grouplist);
+ if (retval) {
+ groups_free(new_info);
+ return retval;
+ }
+
+ retval = set_current_groups(new_info);
+ if (retval)
+ groups_free(new_info);
+
+ return retval;
}
asmlinkage long
===== arch/mips/kernel/sysirix.c 1.18 vs edited =====
--- 1.18/arch/mips/kernel/sysirix.c Tue Sep 23 19:34:27 2003
+++ edited/arch/mips/kernel/sysirix.c Tue Jan 27 12:40:02 2004
@@ -368,7 +368,7 @@
retval = HZ;
goto out;
case 4:
- retval = NGROUPS;
+ retval = INT_MAX;
goto out;
case 5:
retval = NR_OPEN;
===== arch/s390/kernel/compat_linux.c 1.10 vs edited =====
--- 1.10/arch/s390/kernel/compat_linux.c Sun Jan 18 22:35:58 2004
+++ edited/arch/s390/kernel/compat_linux.c Tue Jan 27 12:40:02 2004
@@ -190,20 +190,55 @@
return sys_setfsgid((gid_t)gid);
}
+static int groups16_to_user(u16 *grouplist, struct group_info *info)
+{
+ int i;
+ u16 group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_WRITE, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
+
+ for (i = 0; i < info->ngroups; i++) {
+ group = (u16)GROUP_AT(info, i);
+ if (__put_user(group, grouplist+i))
+ return -EFAULT;
+ }
+
+ return 0;
+}
+
+static int groups16_from_user(struct group_info *info, u16 *grouplist)
+{
+ int i;
+ u16 group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_READ, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
+
+ for (i = 0; i < info->ngroups; i++) {
+ if (__get_user(group, grouplist+i))
+ return -EFAULT;
+ GROUP_AT(info, i) = (gid_t)group;
+ }
+
+ return 0;
+}
+
asmlinkage long sys32_getgroups16(int gidsetsize, u16 *grouplist)
{
- u16 groups[NGROUPS];
- int i,j;
+ int i;
if (gidsetsize < 0)
return -EINVAL;
- i = current->ngroups;
+ i = current->group_info->ngroups;
if (gidsetsize) {
if (i > gidsetsize)
return -EINVAL;
- for(j=0;j<i;j++)
- groups[j] = current->groups[j];
- if (copy_to_user(grouplist, groups, sizeof(u16)*i))
+ if (groups16_to_user(grouplist, current->group_info))
return -EFAULT;
}
return i;
@@ -211,19 +246,25 @@
asmlinkage long sys32_setgroups16(int gidsetsize, u16 *grouplist)
{
- u16 groups[NGROUPS];
- int i;
+ struct group_info *new_info;
+ int retval;
if (!capable(CAP_SETGID))
return -EPERM;
- if ((unsigned) gidsetsize > NGROUPS)
- return -EINVAL;
- if (copy_from_user(groups, grouplist, gidsetsize * sizeof(u16)))
- return -EFAULT;
- for (i = 0 ; i < gidsetsize ; i++)
- current->groups[i] = (gid_t)groups[i];
- current->ngroups = gidsetsize;
- return 0;
+ new_info = groups_alloc(gidsetsize);
+ if (!new_info)
+ return -ENOMEM;
+ retval = groups16_from_user(new_info, grouplist);
+ if (retval) {
+ groups_free(new_info);
+ return retval;
+ }
+
+ retval = set_current_groups(new_info);
+ if (retval)
+ groups_free(new_info);
+
+ return retval;
}
asmlinkage long sys32_getuid16(void)
===== arch/sparc/kernel/sys_sunos.c 1.26 vs edited =====
--- 1.26/arch/sparc/kernel/sys_sunos.c Tue Aug 26 09:25:41 2003
+++ edited/arch/sparc/kernel/sys_sunos.c Tue Jan 27 12:40:02 2004
@@ -896,7 +896,7 @@
ret = HZ;
break;
case _SC_NGROUPS_MAX:
- ret = NGROUPS_MAX;
+ ret = INT_MAX;
break;
case _SC_OPEN_MAX:
ret = OPEN_MAX;
===== arch/sparc64/kernel/sys_sparc32.c 1.86 vs edited =====
--- 1.86/arch/sparc64/kernel/sys_sparc32.c Wed Jan 21 22:25:38 2004
+++ edited/arch/sparc64/kernel/sys_sparc32.c Tue Jan 27 12:40:02 2004
@@ -179,20 +179,55 @@
return sys_setfsgid((gid_t)gid);
}
+static int groups16_to_user(u16 *grouplist, struct group_info *info)
+{
+ int i;
+ u16 group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_WRITE, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
+
+ for (i = 0; i < info->ngroups; i++) {
+ group = (u16)GROUP_AT(info, i);
+ if (__put_user(group, grouplist+i))
+ return -EFAULT;
+ }
+
+ return 0;
+}
+
+static int groups16_from_user(struct group_info *info, u16 *grouplist)
+{
+ int i;
+ u16 group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_READ, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
+
+ for (i = 0; i < info->ngroups; i++) {
+ if (__get_user(group, grouplist+i))
+ return -EFAULT;
+ GROUP_AT(info, i) = (gid_t)group;
+ }
+
+ return 0;
+}
+
asmlinkage long sys32_getgroups16(int gidsetsize, u16 *grouplist)
{
- u16 groups[NGROUPS];
- int i,j;
+ int i;
if (gidsetsize < 0)
return -EINVAL;
- i = current->ngroups;
+ i = current->group_info->ngroups;
if (gidsetsize) {
if (i > gidsetsize)
return -EINVAL;
- for(j=0;j<i;j++)
- groups[j] = current->groups[j];
- if (copy_to_user(grouplist, groups, sizeof(u16)*i))
+ if (groups16_to_user(grouplist, current->group_info))
return -EFAULT;
}
return i;
@@ -200,19 +235,25 @@
asmlinkage long sys32_setgroups16(int gidsetsize, u16 *grouplist)
{
- u16 groups[NGROUPS];
- int i;
+ struct group_info *new_info;
+ int retval;
if (!capable(CAP_SETGID))
return -EPERM;
- if ((unsigned) gidsetsize > NGROUPS)
- return -EINVAL;
- if (copy_from_user(groups, grouplist, gidsetsize * sizeof(u16)))
- return -EFAULT;
- for (i = 0 ; i < gidsetsize ; i++)
- current->groups[i] = (gid_t)groups[i];
- current->ngroups = gidsetsize;
- return 0;
+ new_info = groups_alloc(gidsetsize);
+ if (!new_info)
+ return -ENOMEM;
+ retval = groups16_from_user(new_info, grouplist);
+ if (retval) {
+ groups_free(new_info);
+ return retval;
+ }
+
+ retval = set_current_groups(new_info);
+ if (retval)
+ groups_free(new_info);
+
+ return retval;
}
asmlinkage long sys32_getuid16(void)
===== arch/sparc64/kernel/sys_sunos32.c 1.35 vs edited =====
--- 1.35/arch/sparc64/kernel/sys_sunos32.c Tue Aug 26 09:25:41 2003
+++ edited/arch/sparc64/kernel/sys_sunos32.c Tue Jan 27 12:40:02 2004
@@ -859,7 +859,7 @@
ret = HZ;
break;
case _SC_NGROUPS_MAX:
- ret = NGROUPS_MAX;
+ ret = INT_MAX;
break;
case _SC_OPEN_MAX:
ret = OPEN_MAX;
===== arch/sparc64/solaris/misc.c 1.20 vs edited =====
--- 1.20/arch/sparc64/solaris/misc.c Thu Oct 9 15:13:53 2003
+++ edited/arch/sparc64/solaris/misc.c Tue Jan 27 12:40:02 2004
@@ -341,7 +341,7 @@
asmlinkage int solaris_sysconf(int id)
{
switch (id) {
- case SOLARIS_CONFIG_NGROUPS: return NGROUPS_MAX;
+ case SOLARIS_CONFIG_NGROUPS: return INT_MAX;
case SOLARIS_CONFIG_CHILD_MAX: return CHILD_MAX;
case SOLARIS_CONFIG_OPEN_FILES: return OPEN_MAX;
case SOLARIS_CONFIG_POSIX_VER: return 199309;
===== include/asm-alpha/param.h 1.2 vs edited =====
--- 1.2/include/asm-alpha/param.h Thu Aug 8 12:28:02 2002
+++ edited/include/asm-alpha/param.h Tue Jan 27 12:40:02 2004
@@ -19,10 +19,6 @@
#define EXEC_PAGESIZE 8192
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-arm/param.h 1.5 vs edited =====
--- 1.5/include/asm-arm/param.h Wed Sep 3 10:17:57 2003
+++ edited/include/asm-arm/param.h Tue Jan 27 12:40:02 2004
@@ -26,10 +26,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-arm26/param.h 1.1 vs edited =====
--- 1.1/include/asm-arm26/param.h Wed Jun 4 04:14:10 2003
+++ edited/include/asm-arm26/param.h Tue Jan 27 12:40:02 2004
@@ -22,10 +22,6 @@
# define HZ 100
#endif
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-cris/param.h 1.2 vs edited =====
--- 1.2/include/asm-cris/param.h Thu Nov 7 01:29:17 2002
+++ edited/include/asm-cris/param.h Tue Jan 27 12:40:02 2004
@@ -14,10 +14,6 @@
#define EXEC_PAGESIZE 8192
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-h8300/param.h 1.1 vs edited =====
--- 1.1/include/asm-h8300/param.h Sun Feb 16 16:01:58 2003
+++ edited/include/asm-h8300/param.h Tue Jan 27 12:40:02 2004
@@ -14,10 +14,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-i386/param.h 1.2 vs edited =====
--- 1.2/include/asm-i386/param.h Mon Jul 1 14:41:36 2002
+++ edited/include/asm-i386/param.h Tue Jan 27 12:40:02 2004
@@ -13,10 +13,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-ia64/param.h 1.5 vs edited =====
--- 1.5/include/asm-ia64/param.h Fri Jan 23 10:52:25 2004
+++ edited/include/asm-ia64/param.h Tue Jan 27 12:40:02 2004
@@ -12,10 +12,6 @@
#define EXEC_PAGESIZE 65536
-#ifndef NGROUPS
-# define NGROUPS 32
-#endif
-
#ifndef NOGROUP
# define NOGROUP (-1)
#endif
===== include/asm-m68k/param.h 1.2 vs edited =====
--- 1.2/include/asm-m68k/param.h Mon Jul 8 05:53:12 2002
+++ edited/include/asm-m68k/param.h Tue Jan 27 12:40:02 2004
@@ -13,10 +13,6 @@
#define EXEC_PAGESIZE 8192
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-m68knommu/param.h 1.1 vs edited =====
--- 1.1/include/asm-m68knommu/param.h Fri Nov 1 08:37:46 2002
+++ edited/include/asm-m68knommu/param.h Tue Jan 27 12:40:02 2004
@@ -44,10 +44,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-mips/param.h 1.3 vs edited =====
--- 1.3/include/asm-mips/param.h Mon Apr 14 20:10:06 2003
+++ edited/include/asm-mips/param.h Tue Jan 27 12:40:02 2004
@@ -33,10 +33,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-parisc/param.h 1.3 vs edited =====
--- 1.3/include/asm-parisc/param.h Sat Sep 27 14:43:45 2003
+++ edited/include/asm-parisc/param.h Tue Jan 27 12:40:02 2004
@@ -18,10 +18,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-ppc/param.h 1.6 vs edited =====
--- 1.6/include/asm-ppc/param.h Tue Jan 7 11:45:19 2003
+++ edited/include/asm-ppc/param.h Tue Jan 27 12:40:02 2004
@@ -13,10 +13,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-ppc64/param.h 1.2 vs edited =====
--- 1.2/include/asm-ppc64/param.h Wed Jul 17 23:18:40 2002
+++ edited/include/asm-ppc64/param.h Tue Jan 27 12:40:02 2004
@@ -20,10 +20,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-s390/param.h 1.3 vs edited =====
--- 1.3/include/asm-s390/param.h Fri Oct 4 09:14:42 2002
+++ edited/include/asm-s390/param.h Tue Jan 27 12:40:02 2004
@@ -21,10 +21,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-sh/param.h 1.2 vs edited =====
--- 1.2/include/asm-sh/param.h Tue May 27 15:48:59 2003
+++ edited/include/asm-sh/param.h Tue Jan 27 12:40:02 2004
@@ -17,10 +17,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-sparc/param.h 1.2 vs edited =====
--- 1.2/include/asm-sparc/param.h Fri Jul 12 15:54:40 2002
+++ edited/include/asm-sparc/param.h Tue Jan 27 12:40:02 2004
@@ -14,10 +14,6 @@
#define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-sparc64/param.h 1.2 vs edited =====
--- 1.2/include/asm-sparc64/param.h Fri Jul 12 15:54:40 2002
+++ edited/include/asm-sparc64/param.h Tue Jan 27 12:40:02 2004
@@ -14,10 +14,6 @@
#define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-um/param.h 1.1 vs edited =====
--- 1.1/include/asm-um/param.h Fri Sep 6 10:29:29 2002
+++ edited/include/asm-um/param.h Tue Jan 27 12:40:02 2004
@@ -3,10 +3,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-v850/param.h 1.1 vs edited =====
--- 1.1/include/asm-v850/param.h Fri Nov 1 08:38:12 2002
+++ edited/include/asm-v850/param.h Tue Jan 27 12:40:02 2004
@@ -18,10 +18,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
===== include/asm-x86_64/param.h 1.3 vs edited =====
--- 1.3/include/asm-x86_64/param.h Fri Oct 18 18:36:59 2002
+++ edited/include/asm-x86_64/param.h Tue Jan 27 12:40:02 2004
@@ -13,10 +13,6 @@
#define EXEC_PAGESIZE 4096
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
-
#ifndef NOGROUP
#define NOGROUP (-1)
#endif
^ permalink raw reply
* Re: [2.6.1] fbdev console: can't load vga=791 and yes vga=ask!
From: Kiko Piris @ 2004-01-27 22:59 UTC (permalink / raw)
To: Xan; +Cc: Zack Winkles, linux-kernel
In-Reply-To: <200401271859.03309.DXpublica@telefonica.net>
On 27/01/2004 at 18:59, Xan wrote:
> I did _not_ booted fine. I tried if with vga=795 it booted fine as you and the
> same result as 791 obtained: black screen until X window appears. When I
> switch to pty, black screen or color (and deformed) puzzle of X window
> contain.
In 2.6.1 I could use framebuffer through vesafb just with that parameter
(vga=795, ie. 1280x10224 16M).
In 2.6.2-rc* it does not work for me, just blank screen if I try to use
vesafb.
Zack Winkles pointed me that I could try passing
video=vesafb:ywrap,pmipal,mtrr,vga=795 to get vesafb working.
Thanks for it. Right now I'm on travel and I can not try it, I will be
able to do so on thursday.
> It's rare thing: I could promise that I compiled 2.6.0 with the same
> configuration and it worked.
I did not try 2.6.0 with that radeon 9200 (I didn't have it then).
vesafb stopped working for me in 2.6.2-rc1.
> Can you explain me what means 791, 795, ... and what number belongs to
> 1024x768 and 16 colors, and if 800x600 and 256?...
You can see it in Documentation/fb/vesafb.txt (that file has the numbers
in hexadecimal, and kernel wants the boot parameter in decimal, just
convert it).
Althoug, I would prefer to use radeonfb instead of vesafb (radeonfb
turns off my monitor and vesafb does not).
Anyone with a Radeon 9200 does use radeonfb ? If yes, any special boot
parameter?
--
Kiko
^ permalink raw reply
* Re: Patch for review and testing
From: James Simmons @ 2004-01-27 22:59 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Geert Uytterhoeven, Linux Fbdev development list, Andrew Morton
In-Reply-To: <1075241846.5657.222.camel@gaston>
> > Then I will remove it.
>
> Not yet, not until the new version is in. It does work someway with the
> current code. Let me deal with those OF things please.
Sorry. I will leave this alone then. I posted it just case there where
conflicts with peoples work here. I will wait to send that patch.
> Actually, that may not be a good approach neither... You probably want
> to check that you are indeed dealing with the default VGA device so an
> additional card don't get an unrelated EDID, no ?
>
> Also, other archs may want to implement this function too. Keep the
> struct device as an argument, check for bus_type before casting to PCI,
> and we should probably, in the x86 PCI code, "remember" the pci_dev of
> the default VGA (if not done already) and compare it on calls to this
> function. (To be completely clean, I also need to know if I'm the
> primary VGA in radeonfb and aty128fb).
I knew this was going to be more complex than I written.
> What about a cmdline option then ? it's too early during boot to check
> for it ?
Yes. The code is run in real mode before linux is started.
> vendors will build kernels with or without the CONFIG_ option,
> and people won't change it, so I'm afraid it will be useless... Is the
> BIOS call standard ?
Yes it is standard.
> There may be a way to workaround the hang, no ? Or
> it's one of those calls that Windows never uses and are broken in half
> of the BIOSes around ?
I don't know of any work arounds. Its a small precentage but I like to
make life easier for people.
P.S.
Have any idea to know which card is the primary one on intel. I have
been trying to figure that one out for quite some time.
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* [PATCH] 2.4.25-pre7 SCSI fusion driver - version - 2.05.11.01
From: Moore, Eric Dean @ 2004-01-27 23:04 UTC (permalink / raw)
To: linux-scsi; +Cc: marcelo.tosatti
Here is another update for the MPT Fusion drivers,
2.4 kernel.
Change log:
(1) created define for MPT_CONFIG_COMPAT, replacing CONFIG_COMPAT
(2) CONFIG_SMP replaces __SMP__
(3) changed to version 2.05.11.01
Here's location of patches and full source.
ftp://ftp.lsil.com/HostAdapterDrivers/linux/Fusion-MPT/
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/isense.c
linux-2.4.25-pre7/drivers/message/fusion/isense.c
--- linux-2.4.25-pre7-reference/drivers/message/fusion/isense.c 2004-01-27
11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/isense.c 2004-01-27
10:42:50.000000000 -0700
@@ -9,7 +9,7 @@
* Written By: Steven J. Ralston
* (yes I wrote some of the orig. code back in 1991!)
* (mailto:sjralston1@netscape.net)
- * (mailto:lstephens@lsil.com)
+ * (mailto:mpt_linux_developer@lsil.com)
*
* $Id: isense.c,v 1.34 2003/03/18 22:49:48 pdelaney Exp $
*/
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/linux_compat.h
linux-2.4.25-pre7/drivers/message/fusion/linux_compat.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/linux_compat.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/linux_compat.h 2004-01-27
10:42:50.000000000 -0700
@@ -11,6 +11,11 @@
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=*/
+
+#if (defined(__sparc__) && defined(__sparc_v9__)) || defined(__x86_64__) ||
defined(__ia64__) || defined(__alpha__)
+#define MPT_CONFIG_COMPAT
+#endif
+
#ifndef rwlock_init
#define rwlock_init(x) do { *(x) = RW_LOCK_UNLOCKED; } while(0)
#endif
@@ -267,9 +272,9 @@
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,28)
-#define mptscsih_sync_irq(_irq) synchronize_irq(_irq)
+#define mpt_sync_irq(_irq) synchronize_irq(_irq)
#else
-#define mptscsih_sync_irq(_irq) synchronize_irq()
+#define mpt_sync_irq(_irq) synchronize_irq()
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,58)
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_cnfg.h
linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_cnfg.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_cnfg.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_cnfg.h 2004-01-27
10:42:50.000000000 -0700
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2000-2002 LSI Logic Corporation.
+ * Copyright (c) 2000-2003 LSI Logic Corporation.
*
*
* Name: MPI_CNFG.H
* Title: MPI Config message, structures, and Pages
* Creation Date: July 27, 2000
*
- * MPI_CNFG.H Version: 01.02.09
+ * MPI_CNFG.H Version: 01.02.12
*
* Version History
* ---------------
@@ -127,7 +127,24 @@
* MPI_SCSIDEVPAGE1_CONF_EXTENDED_PARAMS_ENABLE.
* Added new config page: CONFIG_PAGE_SCSI_DEVICE_3.
* Modified MPI_FCPORTPAGE5_FLAGS_ defines.
- * 09-16-02 01.02.09 Added more MPI_SCSIDEVPAGE1_CONF_FORCE_PPR_MSG
define.
+ * 09-16-02 01.02.09 Added MPI_SCSIDEVPAGE1_CONF_FORCE_PPR_MSG define.
+ * 11-15-02 01.02.10 Added ConnectedID defines for
CONFIG_PAGE_SCSI_PORT_0.
+ * Added more Flags defines for CONFIG_PAGE_FC_PORT_1.
+ * Added more Flags defines for
CONFIG_PAGE_FC_DEVICE_0.
+ * 04-01-03 01.02.11 Added RR_TOV field and additional Flags defines for
+ * CONFIG_PAGE_FC_PORT_1.
+ * Added define MPI_FCPORTPAGE5_FLAGS_DISABLE to
disable
+ * an alias.
+ * Added more device id defines.
+ * 06-26-03 01.02.12 Added MPI_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID
define.
+ * Added TargetConfig and IDConfig fields to
+ * CONFIG_PAGE_SCSI_PORT_1.
+ * Added more PortFlags defines for
CONFIG_PAGE_SCSI_PORT_2
+ * to control DV.
+ * Added more Flags defines for CONFIG_PAGE_FC_PORT_1.
+ * In CONFIG_PAGE_FC_DEVICE_0, replaced Reserved1
field
+ * with ADISCHardALPA.
+ * Added MPI_FC_DEVICE_PAGE0_PROT_FCP_RETRY define.
*
--------------------------------------------------------------------------
*/
@@ -281,6 +298,9 @@
/***************************************************************************
*
* Manufacturing Config pages
****************************************************************************
/
+#define MPI_MANUFACTPAGE_VENDORID_LSILOGIC (0x1000)
+#define MPI_MANUFACTPAGE_VENDORID_TREBIA (0x1783)
+
#define MPI_MANUFACTPAGE_DEVICEID_FC909 (0x0621)
#define MPI_MANUFACTPAGE_DEVICEID_FC919 (0x0624)
#define MPI_MANUFACTPAGE_DEVICEID_FC929 (0x0622)
@@ -299,6 +319,10 @@
#define MPI_MANUFACTPAGE_DEVID_SA2020 (0x0806)
#define MPI_MANUFACTPAGE_DEVID_SA2020ZC (0x0807)
+#define MPI_MANUFACTPAGE_DEVID_SNP1000 (0x0010)
+#define MPI_MANUFACTPAGE_DEVID_SNP500 (0x0020)
+
+
typedef struct _CONFIG_PAGE_MANUFACTURING_0
{
@@ -422,6 +446,7 @@
#define MPI_IOUNITPAGE1_SINGLE_FUNCTION (0x00000001)
#define MPI_IOUNITPAGE1_MULTI_PATHING (0x00000002)
#define MPI_IOUNITPAGE1_SINGLE_PATHING (0x00000000)
+#define MPI_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID (0x00000004)
#define MPI_IOUNITPAGE1_DISABLE_IR (0x00000040)
#define MPI_IOUNITPAGE1_FORCE_32 (0x00000080)
@@ -694,6 +719,10 @@
#define MPI_SCSIPORTPAGE0_PHY_SIGNAL_HVD (0x01)
#define MPI_SCSIPORTPAGE0_PHY_SIGNAL_SE (0x02)
#define MPI_SCSIPORTPAGE0_PHY_SIGNAL_LVD (0x03)
+#define MPI_SCSIPORTPAGE0_PHY_MASK_CONNECTED_ID (0xFF000000)
+#define MPI_SCSIPORTPAGE0_PHY_SHIFT_CONNECTED_ID (24)
+#define MPI_SCSIPORTPAGE0_PHY_BUS_FREE_CONNECTED_ID (0xFE)
+#define MPI_SCSIPORTPAGE0_PHY_UNKNOWN_CONNECTED_ID (0xFF)
typedef struct _CONFIG_PAGE_SCSI_PORT_1
@@ -701,14 +730,22 @@
fCONFIG_PAGE_HEADER Header; /* 00h */
U32 Configuration; /* 04h */
U32 OnBusTimerValue; /* 08h */
+ U8 TargetConfig; /* 0Ch */
+ U8 Reserved1; /* 0Dh */
+ U16 IDConfig; /* 0Eh */
} fCONFIG_PAGE_SCSI_PORT_1, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_1,
SCSIPortPage1_t, MPI_POINTER pSCSIPortPage1_t;
#define MPI_SCSIPORTPAGE1_PAGEVERSION (0x02)
+/* Configuration values */
#define MPI_SCSIPORTPAGE1_CFG_PORT_SCSI_ID_MASK (0x000000FF)
#define MPI_SCSIPORTPAGE1_CFG_PORT_RESPONSE_ID_MASK (0xFFFF0000)
+/* TargetConfig values */
+#define MPI_SCSIPORTPAGE1_TARGCONFIG_TARG_ONLY (0x01)
+#define MPI_SCSIPORTPAGE1_TARGCONFIG_INIT_TARG (0x02)
+
typedef struct _MPI_DEVICE_INFO
{
@@ -727,13 +764,20 @@
} fCONFIG_PAGE_SCSI_PORT_2, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_2,
SCSIPortPage2_t, MPI_POINTER pSCSIPortPage2_t;
-#define MPI_SCSIPORTPAGE2_PAGEVERSION (0x01)
+#define MPI_SCSIPORTPAGE2_PAGEVERSION (0x02)
+/* PortFlags values */
#define MPI_SCSIPORTPAGE2_PORT_FLAGS_SCAN_HIGH_TO_LOW (0x00000001)
#define MPI_SCSIPORTPAGE2_PORT_FLAGS_AVOID_SCSI_RESET (0x00000004)
#define MPI_SCSIPORTPAGE2_PORT_FLAGS_ALTERNATE_CHS (0x00000008)
#define MPI_SCSIPORTPAGE2_PORT_FLAGS_TERMINATION_DISABLE (0x00000010)
+#define MPI_SCSIPORTPAGE2_PORT_FLAGS_DV_MASK (0x00000060)
+#define MPI_SCSIPORTPAGE2_PORT_FLAGS_FULL_DV (0x00000000)
+#define MPI_SCSIPORTPAGE2_PORT_FLAGS_BASIC_DV_ONLY (0x00000020)
+#define MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV (0x00000060)
+
+/* PortSettings values */
#define MPI_SCSIPORTPAGE2_PORT_HOST_ID_MASK (0x0000000F)
#define MPI_SCSIPORTPAGE2_PORT_MASK_INIT_HBA (0x00000030)
#define MPI_SCSIPORTPAGE2_PORT_DISABLE_INIT_HBA (0x00000000)
@@ -915,7 +959,7 @@
#define MPI_FCPORTPAGE0_FLAGS_ALIAS_ALPA_SUPPORTED (0x00000010)
#define MPI_FCPORTPAGE0_FLAGS_ALIAS_WWN_SUPPORTED (0x00000020)
-#define MPI_FCPORTPAGE0_FLAGS_FABRIC_WWN_VALID (0x00000030)
+#define MPI_FCPORTPAGE0_FLAGS_FABRIC_WWN_VALID (0x00000040)
#define MPI_FCPORTPAGE0_FLAGS_ATTACH_TYPE_MASK (0x00000F00)
#define MPI_FCPORTPAGE0_FLAGS_ATTACH_NO_INIT (0x00000000)
@@ -974,15 +1018,23 @@
U8 TopologyConfig; /* 1Ah */
U8 AltConnector; /* 1Bh */
U8 NumRequestedAliases; /* 1Ch */
- U8 Reserved1; /* 1Dh */
+ U8 RR_TOV; /* 1Dh */
U16 Reserved2; /* 1Eh */
} fCONFIG_PAGE_FC_PORT_1, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_1,
FCPortPage1_t, MPI_POINTER pFCPortPage1_t;
-#define MPI_FCPORTPAGE1_PAGEVERSION (0x04)
+#define MPI_FCPORTPAGE1_PAGEVERSION (0x05)
#define MPI_FCPORTPAGE1_FLAGS_EXT_FCP_STATUS_EN (0x08000000)
#define MPI_FCPORTPAGE1_FLAGS_IMMEDIATE_ERROR_REPLY (0x04000000)
+#define MPI_FCPORTPAGE1_FLAGS_FORCE_USE_NOSEEPROM_WWNS (0x02000000)
+#define MPI_FCPORTPAGE1_FLAGS_VERBOSE_RESCAN_EVENTS (0x01000000)
+#define MPI_FCPORTPAGE1_FLAGS_TARGET_MODE_OXID (0x00800000)
+#define MPI_FCPORTPAGE1_FLAGS_PORT_OFFLINE (0x00400000)
+#define MPI_FCPORTPAGE1_FLAGS_MASK_RR_TOV_UNITS (0x00000070)
+#define MPI_FCPORTPAGE1_FLAGS_SUPPRESS_PROT_REG (0x00000008)
+#define MPI_FCPORTPAGE1_FLAGS_PLOGI_ON_LOGO (0x00000004)
+#define MPI_FCPORTPAGE1_FLAGS_MAINTAIN_LOGINS (0x00000002)
#define MPI_FCPORTPAGE1_FLAGS_SORT_BY_DID (0x00000001)
#define MPI_FCPORTPAGE1_FLAGS_SORT_BY_WWN (0x00000000)
@@ -993,6 +1045,11 @@
#define MPI_FCPORTPAGE1_FLAGS_PROT_LAN
((U32)MPI_PORTFACTS_PROTOCOL_LAN << MPI_FCPORTPAGE1_FLAGS_PROT_SHIFT)
#define MPI_FCPORTPAGE1_FLAGS_PROT_LOGBUSADDR
((U32)MPI_PORTFACTS_PROTOCOL_LOGBUSADDR << MPI_FCPORTPAGE1_FLAGS_PROT_SHIFT)
+#define MPI_FCPORTPAGE1_FLAGS_NONE_RR_TOV_UNITS (0x00000000)
+#define MPI_FCPORTPAGE1_FLAGS_THOUSANDTH_RR_TOV_UNITS (0x00000010)
+#define MPI_FCPORTPAGE1_FLAGS_TENTH_RR_TOV_UNITS (0x00000030)
+#define MPI_FCPORTPAGE1_FLAGS_TEN_RR_TOV_UNITS (0x00000050)
+
#define MPI_FCPORTPAGE1_HARD_ALPA_NOT_USED (0xFF)
#define MPI_FCPORTPAGE1_LCONFIG_SPEED_MASK (0x0F)
@@ -1108,12 +1165,13 @@
} fCONFIG_PAGE_FC_PORT_5, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_5,
FCPortPage5_t, MPI_POINTER pFCPortPage5_t;
-#define MPI_FCPORTPAGE5_PAGEVERSION (0x01)
+#define MPI_FCPORTPAGE5_PAGEVERSION (0x02)
#define MPI_FCPORTPAGE5_FLAGS_ALPA_ACQUIRED (0x01)
#define MPI_FCPORTPAGE5_FLAGS_HARD_ALPA (0x02)
#define MPI_FCPORTPAGE5_FLAGS_HARD_WWNN (0x04)
#define MPI_FCPORTPAGE5_FLAGS_HARD_WWPN (0x08)
+#define MPI_FCPORTPAGE5_FLAGS_DISABLE (0x10)
typedef struct _CONFIG_PAGE_FC_PORT_6
{
@@ -1322,7 +1380,7 @@
U8 Flags; /* 19h */
U16 BBCredit; /* 1Ah */
U16 MaxRxFrameSize; /* 1Ch */
- U8 Reserved1; /* 1Eh */
+ U8 ADISCHardALPA; /* 1Eh */
U8 PortNumber; /* 1Fh */
U8 FcPhLowestVersion; /* 20h */
U8 FcPhHighestVersion; /* 21h */
@@ -1331,13 +1389,16 @@
} fCONFIG_PAGE_FC_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_FC_DEVICE_0,
FCDevicePage0_t, MPI_POINTER pFCDevicePage0_t;
-#define MPI_FC_DEVICE_PAGE0_PAGEVERSION (0x02)
+#define MPI_FC_DEVICE_PAGE0_PAGEVERSION (0x03)
#define MPI_FC_DEVICE_PAGE0_FLAGS_TARGETID_BUS_VALID (0x01)
+#define MPI_FC_DEVICE_PAGE0_FLAGS_PLOGI_INVALID (0x02)
+#define MPI_FC_DEVICE_PAGE0_FLAGS_PRLI_INVALID (0x04)
#define MPI_FC_DEVICE_PAGE0_PROT_IP (0x01)
#define MPI_FC_DEVICE_PAGE0_PROT_FCP_TARGET (0x02)
#define MPI_FC_DEVICE_PAGE0_PROT_FCP_INITIATOR (0x04)
+#define MPI_FC_DEVICE_PAGE0_PROT_FCP_RETRY (0x08)
#define MPI_FC_DEVICE_PAGE0_PGAD_PORT_MASK
(MPI_FC_DEVICE_PGAD_PORT_MASK)
#define MPI_FC_DEVICE_PAGE0_PGAD_FORM_MASK
(MPI_FC_DEVICE_PGAD_FORM_MASK)
@@ -1348,6 +1409,7 @@
#define MPI_FC_DEVICE_PAGE0_PGAD_BUS_SHIFT
(MPI_FC_DEVICE_PGAD_BT_BUS_SHIFT)
#define MPI_FC_DEVICE_PAGE0_PGAD_TID_MASK
(MPI_FC_DEVICE_PGAD_BT_TID_MASK)
+#define MPI_FC_DEVICE_PAGE0_HARD_ALPA_UNKNOWN (0xFF)
/***************************************************************************
*
* RAID Volume Config Pages
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi.h
linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi.h 2004-01-27
10:42:50.000000000 -0700
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2000-2002 LSI Logic Corporation.
+ * Copyright (c) 2000-2003 LSI Logic Corporation.
*
*
* Name: MPI.H
* Title: MPI Message independent structures and definitions
* Creation Date: July 27, 2000
*
- * MPI.H Version: 01.02.07
+ * MPI.H Version: 01.02.10
*
* Version History
* ---------------
@@ -48,6 +48,10 @@
* 05-31-02 01.02.05 Bumped MPI_HEADER_VERSION_UNIT.
* 07-12-02 01.02.06 Added define for MPI_FUNCTION_MAILBOX.
* 09-16-02 01.02.07 Bumped value for MPI_HEADER_VERSION_UNIT.
+ * 11-15-02 01.02.08 Added define MPI_IOCSTATUS_TARGET_INVALID_IO_INDEX
and
+ * obsoleted define
MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX.
+ * 04-01-03 01.02.09 New IOCStatus code:
MPI_IOCSTATUS_FC_EXCHANGE_CANCELED
+ * 06-26-03 01.02.10 Bumped MPI_HEADER_VERSION_UNIT value.
*
--------------------------------------------------------------------------
*/
@@ -76,7 +80,7 @@
/* Note: The major versions of 0xe0 through 0xff are reserved */
/* versioning for this MPI header set */
-#define MPI_HEADER_VERSION_UNIT (0x09)
+#define MPI_HEADER_VERSION_UNIT (0x0C)
#define MPI_HEADER_VERSION_DEV (0x00)
#define MPI_HEADER_VERSION_UNIT_MASK (0xFF00)
#define MPI_HEADER_VERSION_UNIT_SHIFT (8)
@@ -618,7 +622,8 @@
#define MPI_IOCSTATUS_TARGET_PRIORITY_IO (0x0060)
#define MPI_IOCSTATUS_TARGET_INVALID_PORT (0x0061)
-#define MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX (0x0062)
+#define MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX (0x0062) /* obsolete */
+#define MPI_IOCSTATUS_TARGET_INVALID_IO_INDEX (0x0062)
#define MPI_IOCSTATUS_TARGET_ABORTED (0x0063)
#define MPI_IOCSTATUS_TARGET_NO_CONN_RETRYABLE (0x0064)
#define MPI_IOCSTATUS_TARGET_NO_CONNECTION (0x0065)
@@ -642,6 +647,7 @@
#define MPI_IOCSTATUS_FC_RX_ID_INVALID (0x0067)
#define MPI_IOCSTATUS_FC_DID_INVALID (0x0068)
#define MPI_IOCSTATUS_FC_NODE_LOGGED_OUT (0x0069)
+#define MPI_IOCSTATUS_FC_EXCHANGE_CANCELED (0x006C)
/***************************************************************************
*/
/* LAN values
*/
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_init.h
linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_init.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_init.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_init.h 2004-01-27
10:42:50.000000000 -0700
@@ -6,7 +6,7 @@
* Title: MPI initiator mode messages and structures
* Creation Date: June 8, 2000
*
- * MPI_INIT.H Version: 01.02.05
+ * MPI_INIT.H Version: 01.02.07
*
* Version History
* ---------------
@@ -31,6 +31,8 @@
* 10-04-01 01.02.04 Added defines for SEP request Action field.
* 05-31-02 01.02.05 Added MPI_SCSIIO_MSGFLGS_CMD_DETERMINES_DATA_DIR
define
* for SCSI IO requests.
+ * 11-15-02 01.02.06 Added special extended SCSI Status defines for FCP.
+ * 06-26-03 01.02.07 Added MPI_SCSI_STATUS_FCPEXT_UNASSIGNED define.
*
--------------------------------------------------------------------------
*/
@@ -153,6 +155,10 @@
#define MPI_SCSI_STATUS_TASK_SET_FULL (0x28)
#define MPI_SCSI_STATUS_ACA_ACTIVE (0x30)
+#define MPI_SCSI_STATUS_FCPEXT_DEVICE_LOGGED_OUT (0x80)
+#define MPI_SCSI_STATUS_FCPEXT_NO_LINK (0x81)
+#define MPI_SCSI_STATUS_FCPEXT_UNASSIGNED (0x82)
+
/* SCSI IO Reply SCSIState values */
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_ioc.h
linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_ioc.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_ioc.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_ioc.h 2004-01-27
10:42:50.000000000 -0700
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2000-2002 LSI Logic Corporation.
+ * Copyright (c) 2000-2003 LSI Logic Corporation.
*
*
* Name: MPI_IOC.H
* Title: MPI IOC, Port, Event, FW Download, and FW Upload
messages
* Creation Date: August 11, 2000
*
- * MPI_IOC.H Version: 01.02.06
+ * MPI_IOC.H Version: 01.02.08
*
* Version History
* ---------------
@@ -55,6 +55,8 @@
* 05-31-02 01.02.06 Added define for
* MPI_IOCFACTS_EXCEPT_RAID_CONFIG_INVALID.
* Added AliasIndex to EVENT_DATA_LOGOUT structure.
+ * 04-01-03 01.02.07 Added defines for MPI_FW_HEADER_SIGNATURE_.
+ * 06-26-03 01.02.08 Added new values to the product family defines.
*
--------------------------------------------------------------------------
*/
@@ -654,6 +656,10 @@
#define MPI_FW_HEADER_PID_TYPE_SCSI (0x0000)
#define MPI_FW_HEADER_PID_TYPE_FC (0x1000)
+#define MPI_FW_HEADER_SIGNATURE_0 (0x5AEAA55A)
+#define MPI_FW_HEADER_SIGNATURE_1 (0xA55AEAA5)
+#define MPI_FW_HEADER_SIGNATURE_2 (0x5AA55AEA)
+
#define MPI_FW_HEADER_PID_PROD_MASK (0x0F00)
#define MPI_FW_HEADER_PID_PROD_INITIATOR_SCSI (0x0100)
#define MPI_FW_HEADER_PID_PROD_TARGET_INITIATOR_SCSI (0x0200)
@@ -673,6 +679,8 @@
#define MPI_FW_HEADER_PID_FAMILY_1020C0_SCSI (0x0008)
#define MPI_FW_HEADER_PID_FAMILY_1035A0_SCSI (0x0009)
#define MPI_FW_HEADER_PID_FAMILY_1035B0_SCSI (0x000A)
+#define MPI_FW_HEADER_PID_FAMILY_1030TA0_SCSI (0x000B)
+#define MPI_FW_HEADER_PID_FAMILY_1020TA0_SCSI (0x000C)
#define MPI_FW_HEADER_PID_FAMILY_909_FC (0x0000)
#define MPI_FW_HEADER_PID_FAMILY_919_FC (0x0001)
#define MPI_FW_HEADER_PID_FAMILY_919X_FC (0x0002)
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_raid.h
linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_raid.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_raid.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_raid.h 2004-01-27
10:42:50.000000000 -0700
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2001-2002 LSI Logic Corporation.
+ * Copyright (c) 2001-2003 LSI Logic Corporation.
*
*
* Name: MPI_RAID.H
* Title: MPI RAID message and structures
* Creation Date: February 27, 2001
*
- * MPI_RAID.H Version: 01.02.07
+ * MPI_RAID.H Version: 01.02.09
*
* Version History
* ---------------
@@ -25,6 +25,9 @@
* MPI_RAID_ACTION_INACTIVATE_VOLUME, and
* MPI_RAID_ACTION_ADATA_INACTIVATE_ALL.
* 07-12-02 01.02.07 Added structures for Mailbox request and reply.
+ * 11-15-02 01.02.08 Added missing MsgContext field to
MSG_MAILBOX_REQUEST.
+ * 04-01-03 01.02.09 New action data option flag for
+ * MPI_RAID_ACTION_DELETE_VOLUME.
*
--------------------------------------------------------------------------
*/
@@ -90,6 +93,9 @@
#define MPI_RAID_ACTION_ADATA_KEEP_PHYS_DISKS (0x00000000)
#define MPI_RAID_ACTION_ADATA_DEL_PHYS_DISKS (0x00000001)
+#define MPI_RAID_ACTION_ADATA_KEEP_LBA0 (0x00000000)
+#define MPI_RAID_ACTION_ADATA_ZERO_LBA0 (0x00000002)
+
/* ActionDataWord defines for use with MPI_RAID_ACTION_ACTIVATE_VOLUME
action */
#define MPI_RAID_ACTION_ADATA_INACTIVATE_ALL (0x00000001)
@@ -195,6 +201,7 @@
U16 Reserved2;
U8 Reserved3;
U8 MsgFlags;
+ U32 MsgContext;
U8 Command[10];
U16 Reserved4;
SGE_IO_UNION SGL;
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_targ.h
linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_targ.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_targ.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_targ.h 2004-01-27
10:42:50.000000000 -0700
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2000-2002 LSI Logic Corporation.
+ * Copyright (c) 2000-2003 LSI Logic Corporation.
*
*
* Name: MPI_TARG.H
* Title: MPI Target mode messages and structures
* Creation Date: June 22, 2000
*
- * MPI_TARG.H Version: 01.02.07
+ * MPI_TARG.H Version: 01.02.09
*
* Version History
* ---------------
@@ -41,6 +41,8 @@
* Added AliasIndex field to
MPI_TARGET_FCP_CMD_BUFFER.
* 09-16-02 01.02.07 Added flags for confirmed completion.
* Added PRIORITY_REASON_TARGET_BUSY.
+ * 11-15-02 01.02.08 Added AliasID field to
MPI_TARGET_SCSI_SPI_CMD_BUFFER.
+ * 04-01-03 01.02.09 Added OptionalOxid field to
MPI_TARGET_FCP_CMD_BUFFER.
*
--------------------------------------------------------------------------
*/
@@ -171,7 +173,7 @@
U32 FcpDl; /* 1Ch */
U8 AliasIndex; /* 20h */
U8 Reserved1; /* 21h */
- U16 Reserved2; /* 22h */
+ U16 OptionalOxid; /* 22h */
} MPI_TARGET_FCP_CMD_BUFFER, MPI_POINTER PTR_MPI_TARGET_FCP_CMD_BUFFER,
MpiTargetFcpCmdBuffer, MPI_POINTER pMpiTargetFcpCmdBuffer;
@@ -190,6 +192,10 @@
U8 TaskManagementFlags; /* 12h */
U8 AdditionalCDBLength; /* 13h */
U8 CDB[16]; /* 14h */
+ /* Alias ID */
+ U8 AliasID; /* 24h */
+ U8 Reserved1; /* 25h */
+ U16 Reserved2; /* 26h */
} MPI_TARGET_SCSI_SPI_CMD_BUFFER,
MPI_POINTER PTR_MPI_TARGET_SCSI_SPI_CMD_BUFFER,
MpiTargetScsiSpiCmdBuffer, MPI_POINTER pMpiTargetScsiSpiCmdBuffer;
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_tool.h
linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_tool.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/lsi/mpi_tool.h
1969-12-31 17:00:00.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/lsi/mpi_tool.h 2004-01-27
10:42:50.000000000 -0700
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2001 LSI Logic Corporation.
+ *
+ *
+ * Name: MPI_TOOL.H
+ * Title: MPI Toolbox structures and definitions
+ * Creation Date: July 30, 2001
+ *
+ * MPI Version: 01.02.02
+ *
+ * Version History
+ * ---------------
+ *
+ * Date Version Description
+ * -------- --------
------------------------------------------------------
+ * 08-08-01 01.02.01 Original release.
+ * 08-29-01 01.02.02 Added DIAG_DATA_UPLOAD_HEADER and related defines.
+ *
--------------------------------------------------------------------------
+ */
+
+#ifndef MPI_TOOL_H
+#define MPI_TOOL_H
+
+#define MPI_TOOLBOX_CLEAN_TOOL (0x00)
+#define MPI_TOOLBOX_MEMORY_MOVE_TOOL (0x01)
+#define MPI_TOOLBOX_DIAG_DATA_UPLOAD_TOOL (0x02)
+
+
+/**************************************************************************
**/
+/* Toolbox reply
*/
+/**************************************************************************
**/
+
+typedef struct _MSG_TOOLBOX_REPLY
+{
+ U8 Tool; /* 00h */
+ U8 Reserved; /* 01h */
+ U8 MsgLength; /* 02h */
+ U8 Function; /* 03h */
+ U16 Reserved1; /* 04h */
+ U8 Reserved2; /* 06h */
+ U8 MsgFlags; /* 07h */
+ U32 MsgContext; /* 08h */
+ U16 Reserved3; /* 0Ch */
+ U16 IOCStatus; /* 0Eh */
+ U32 IOCLogInfo; /* 10h */
+} MSG_TOOLBOX_REPLY, MPI_POINTER PTR_MSG_TOOLBOX_REPLY,
+ ToolboxReply_t, MPI_POINTER pToolboxReply_t;
+
+
+/**************************************************************************
**/
+/* Toolbox Clean Tool request
*/
+/**************************************************************************
**/
+
+typedef struct _MSG_TOOLBOX_CLEAN_REQUEST
+{
+ U8 Tool; /* 00h */
+ U8 Reserved; /* 01h */
+ U8 ChainOffset; /* 02h */
+ U8 Function; /* 03h */
+ U16 Reserved1; /* 04h */
+ U8 Reserved2; /* 06h */
+ U8 MsgFlags; /* 07h */
+ U32 MsgContext; /* 08h */
+ U32 Flags; /* 0Ch */
+} MSG_TOOLBOX_CLEAN_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_CLEAN_REQUEST,
+ ToolboxCleanRequest_t, MPI_POINTER pToolboxCleanRequest_t;
+
+#define MPI_TOOLBOX_CLEAN_NVSRAM (0x00000001)
+#define MPI_TOOLBOX_CLEAN_SEEPROM (0x00000002)
+#define MPI_TOOLBOX_CLEAN_FLASH (0x00000004)
+
+
+/**************************************************************************
**/
+/* Toolbox Memory Move request
*/
+/**************************************************************************
**/
+
+typedef struct _MSG_TOOLBOX_MEM_MOVE_REQUEST
+{
+ U8 Tool; /* 00h */
+ U8 Reserved; /* 01h */
+ U8 ChainOffset; /* 02h */
+ U8 Function; /* 03h */
+ U16 Reserved1; /* 04h */
+ U8 Reserved2; /* 06h */
+ U8 MsgFlags; /* 07h */
+ U32 MsgContext; /* 08h */
+ SGE_SIMPLE_UNION SGL; /* 0Ch */
+} MSG_TOOLBOX_MEM_MOVE_REQUEST, MPI_POINTER
PTR_MSG_TOOLBOX_MEM_MOVE_REQUEST,
+ ToolboxMemMoveRequest_t, MPI_POINTER pToolboxMemMoveRequest_t;
+
+
+/**************************************************************************
**/
+/* Toolbox Diagnostic Data Upload request
*/
+/**************************************************************************
**/
+
+typedef struct _MSG_TOOLBOX_DIAG_DATA_UPLOAD_REQUEST
+{
+ U8 Tool; /* 00h */
+ U8 Reserved; /* 01h */
+ U8 ChainOffset; /* 02h */
+ U8 Function; /* 03h */
+ U16 Reserved1; /* 04h */
+ U8 Reserved2; /* 06h */
+ U8 MsgFlags; /* 07h */
+ U32 MsgContext; /* 08h */
+ U32 Flags; /* 0Ch */
+ U32 Reserved3; /* 10h */
+ SGE_SIMPLE_UNION SGL; /* 14h */
+} MSG_TOOLBOX_DIAG_DATA_UPLOAD_REQUEST, MPI_POINTER
PTR_MSG_TOOLBOX_DIAG_DATA_UPLOAD_REQUEST,
+ ToolboxDiagDataUploadRequest_t, MPI_POINTER
pToolboxDiagDataUploadRequest_t;
+
+typedef struct _DIAG_DATA_UPLOAD_HEADER
+{
+ U32 DiagDataLength; /* 00h */
+ U8 FormatCode; /* 04h */
+ U8 Reserved; /* 05h */
+ U16 Reserved1; /* 06h */
+} DIAG_DATA_UPLOAD_HEADER, MPI_POINTER PTR_DIAG_DATA_UPLOAD_HEADER,
+ DiagDataUploadHeader_t, MPI_POINTER pDiagDataUploadHeader_t;
+
+#define MPI_TB_DIAG_FORMAT_SCSI_PRINTF_1 (0x01)
+#define MPI_TB_DIAG_FORMAT_SCSI_2 (0x02)
+#define MPI_TB_DIAG_FORMAT_SCSI_3 (0x03)
+#define MPI_TB_DIAG_FORMAT_FC_TRACE_1 (0x04)
+
+
+#endif
+
+
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/mptbase.c
linux-2.4.25-pre7/drivers/message/fusion/mptbase.c
--- linux-2.4.25-pre7-reference/drivers/message/fusion/mptbase.c
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/mptbase.c 2004-01-27
10:42:50.000000000 -0700
@@ -47,7 +47,7 @@
* Copyright (c) 1999-2002 LSI Logic Corporation
* Originally By: Steven J. Ralston
* (mailto:sjralston1@netscape.net)
- * (mailto:lstephens@lsil.com)
+ * (mailto:mpt_linux_developer@lsil.com)
*
* $Id: mptbase.c,v 1.130 2003/05/07 14:08:30 pdelaney Exp $
*/
@@ -211,6 +211,7 @@
static int mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int
portnum);
static int mpt_findImVolumes(MPT_ADAPTER *ioc);
static void mpt_read_ioc_pg_1(MPT_ADAPTER *ioc);
+static void mpt_read_ioc_pg_4(MPT_ADAPTER *ioc);
static void mpt_timer_expired(unsigned long data);
static int SendEventNotification(MPT_ADAPTER *ioc, u8 EvSwitch);
static int SendEventAck(MPT_ADAPTER *ioc, EventNotificationReply_t
*evnp);
@@ -319,14 +320,14 @@
MPT_FRAME_HDR *mf;
MPT_FRAME_HDR *mr;
u32 pa;
- int req_idx = -1;
+ int req_idx;
int cb_idx;
int type;
int freeme;
- int count = 0;
ioc = bus_id;
+#ifdef MPT_DEBUG_IRQ
/*
* Verify ioc pointer is ok
*/
@@ -341,6 +342,7 @@
return;
}
}
+#endif
/*
* Drain the reply FIFO!
@@ -493,17 +495,7 @@
spin_unlock_irqrestore(&ioc->FreeQlock, flags);
}
- count++;
- dirqprintk((MYIOC_s_INFO_FMT "ISR processed frame #%d\n",
ioc->name, count));
mb();
-
- if (count >= MPT_MAX_REPLIES_PER_ISR) {
- dirqprintk((MYIOC_s_INFO_FMT "ISR processed %d
replies.",
- ioc->name, count));
- dirqprintk((" Giving this ISR a break!\n"));
- return;
- }
-
} /* drain reply FIFO */
}
@@ -814,7 +806,7 @@
MPT_FRAME_HDR*
mpt_get_msg_frame(int handle, int iocid)
{
- MPT_FRAME_HDR *mf = NULL;
+ MPT_FRAME_HDR *mf;
MPT_ADAPTER *iocp;
unsigned long flags;
@@ -846,6 +838,8 @@
iocp->mfcnt++;
#endif
}
+ else
+ mf = NULL;
spin_unlock_irqrestore(&iocp->FreeQlock, flags);
#ifdef MFCNT
@@ -1114,10 +1108,12 @@
MPT_ADAPTER *
mpt_adapter_find_first(void)
{
- MPT_ADAPTER *this = NULL;
+ MPT_ADAPTER *this;
if (! Q_IS_EMPTY(&MptAdapters))
this = MptAdapters.head;
+ else
+ this = NULL;
return this;
}
@@ -1132,10 +1128,12 @@
MPT_ADAPTER *
mpt_adapter_find_next(MPT_ADAPTER *prev)
{
- MPT_ADAPTER *next = NULL;
+ MPT_ADAPTER *next;
if (prev && (prev->forw != (MPT_ADAPTER*)&MptAdapters.head))
next = prev->forw;
+ else
+ next = NULL;
return next;
}
@@ -1285,7 +1283,11 @@
if (pci_enable_device(pdev))
return r;
- if (!pci_set_dma_mask(pdev, mask)) {
+ /* For some kernels, broken kernel limits memory allocation for
target mode
+ * driver. Shirron. Fixed in 2.4.20-8
+ * if ((sizeof(dma_addr_t) == sizeof(u64)) &&
(!pci_set_dma_mask(pdev, mask))) {
+ */
+ if ((!pci_set_dma_mask(pdev, mask))) {
dprintk((KERN_INFO MYNAM ": 64 BIT PCI BUS DMA ADDRESSING
SUPPORTED\n"));
} else {
if (pci_set_dma_mask(pdev, (u64) 0xffffffff)) {
@@ -1300,10 +1302,10 @@
printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add
adapter!\n");
return -ENOMEM;
}
- memset(ioc, 0, sizeof(*ioc));
+ memset(ioc, 0, sizeof(MPT_ADAPTER));
ioc->alloc_total = sizeof(MPT_ADAPTER);
ioc->req_sz = MPT_DEFAULT_FRAME_SIZE; /* avoid div by
zero! */
- ioc->reply_sz = ioc->req_sz;
+ ioc->reply_sz = MPT_REPLY_FRAME_SIZE;
ioc->pcidev = pdev;
ioc->diagPending = 0;
@@ -1419,13 +1421,12 @@
ioc->prod_name = "LSIFC929X";
{
/* 929X Chip Fix. Set Split transactions level
- * for PCIX. Set bits 5 - 6 to zero, turn on bit 4.
+ * for PCIX. Set MOST bits to zero.
*/
- u16 pcixcmd = 0;
- pci_read_config_word(pdev, 0x6a, &pcixcmd);
- pcixcmd &= 0xFF9F;
- pcixcmd |= 0x0010;
- pci_write_config_word(pdev, 0x6a, pcixcmd);
+ u8 pcixcmd;
+ pci_read_config_byte(pdev, 0x6a, &pcixcmd);
+ pcixcmd &= 0x8F;
+ pci_write_config_byte(pdev, 0x6a, pcixcmd);
}
}
else if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC919X) {
@@ -1433,13 +1434,12 @@
ioc->prod_name = "LSIFC919X";
{
/* 919X Chip Fix. Set Split transactions level
- * for PCIX. Set bits 5 - 6 to zero, turn on bit 4.
+ * for PCIX. Set MOST bits to zero.
*/
- u16 pcixcmd = 0;
- pci_read_config_word(pdev, 0x6a, &pcixcmd);
- pcixcmd &= 0xFF9F;
- pcixcmd |= 0x0010;
- pci_write_config_word(pdev, 0x6a, pcixcmd);
+ u8 pcixcmd;
+ pci_read_config_byte(pdev, 0x6a, &pcixcmd);
+ pcixcmd &= 0x8F;
+ pci_write_config_byte(pdev, 0x6a, pcixcmd);
}
}
else if (pdev->device == MPI_MANUFACTPAGE_DEVID_53C1030) {
@@ -1449,14 +1449,14 @@
u8 revision;
/* 1030 Chip Fix. Disable Split transactions
- * for PCIX. Set bits 4 - 6 to zero if Rev < C0( =
8)
+ * for PCIX. Set MOST bits to zero if Rev < C0( =
8).
*/
pci_read_config_byte(pdev, PCI_CLASS_REVISION,
&revision);
if (revision < 0x08) {
- u16 pcixcmd = 0;
- pci_read_config_word(pdev, 0x6a, &pcixcmd);
- pcixcmd &= 0xFF8F;
- pci_write_config_word(pdev, 0x6a, pcixcmd);
+ u8 pcixcmd;
+ pci_read_config_byte(pdev, 0x6a, &pcixcmd);
+ pcixcmd &= 0x8F;
+ pci_write_config_byte(pdev, 0x6a, pcixcmd);
}
}
}
@@ -1764,6 +1764,8 @@
/* Check, and possibly reset, the coalescing value
*/
mpt_read_ioc_pg_1(ioc);
+
+ mpt_read_ioc_pg_4(ioc);
}
GetIoUnitPage2(ioc);
@@ -1950,6 +1952,15 @@
kfree(this->spi_data.pIocPg3);
this->spi_data.pIocPg3 = NULL;
}
+
+ if (freeup && this->spi_data.pIocPg4 != NULL) {
+ sz = this->spi_data.IocPg4Sz;
+ pci_free_consistent(this->pcidev, sz,
+ this->spi_data.pIocPg4,
+ this->spi_data.IocPg4_dma);
+ this->spi_data.pIocPg4 = NULL;
+ this->alloc_total -= sz;
+ }
}
}
@@ -2346,7 +2357,7 @@
*/
ioc->req_sz = MIN(MPT_DEFAULT_FRAME_SIZE,
facts->RequestFrameSize * 4);
ioc->req_depth = MIN(MPT_MAX_REQ_DEPTH,
facts->GlobalCredits);
- ioc->reply_sz = ioc->req_sz;
+ ioc->reply_sz = MPT_REPLY_FRAME_SIZE;
ioc->reply_depth = MIN(MPT_DEFAULT_REPLY_DEPTH,
facts->ReplyQueueDepth);
dprintk((MYIOC_s_INFO_FMT "reply_sz=%3d,
reply_depth=%4d\n",
@@ -2609,8 +2620,8 @@
void *
mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size, int *frags, int *alloc_sz)
{
- fw_image_t **cached_fw = NULL;
- u8 *mem = NULL;
+ fw_image_t **cached_fw;
+ u8 *mem;
dma_addr_t fw_dma;
int alloc_total = 0;
int bytes_left, bytes, num_frags;
@@ -2758,7 +2769,7 @@
u8 reply[sizeof(FWUploadReply_t)];
FWUpload_t *prequest;
FWUploadReply_t *preply;
- FWUploadTCSGE_t *ptcsge = NULL;
+ FWUploadTCSGE_t *ptcsge;
int sgeoffset;
int ii, sz, reply_sz;
int cmdStatus, freeMem = 0;
@@ -2890,16 +2901,16 @@
static int
mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag)
{
- MpiFwHeader_t *FwHdr = NULL;
+ MpiFwHeader_t *FwHdr;
MpiExtImageHeader_t *ExtHdr;
- fw_image_t **pCached = NULL;
+ fw_image_t **pCached;
int fw_sz;
u32 diag0val;
#ifdef MPT_DEBUG
u32 diag1val = 0;
#endif
int count = 0;
- u32 *ptru32 = NULL;
+ u32 *ptru32;
u32 diagRwData;
u32 nextImage;
u32 ext_offset;
@@ -4301,7 +4312,7 @@
static int
mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
{
- u8 *pbuf = NULL;
+ u8 *pbuf;
dma_addr_t buf_dma;
CONFIGPARMS cfg;
ConfigPageHeader_t header;
@@ -4387,7 +4398,6 @@
}
if (pbuf) {
pci_free_consistent(ioc->pcidev,
header.PageLength * 4, pbuf, buf_dma);
- pbuf = NULL;
}
}
}
@@ -4424,6 +4434,8 @@
/* Save the Port Page 2 data
* (reformat into a 32bit quantity)
*/
+ data = le32_to_cpu(pPP2->PortFlags) &
MPI_SCSIPORTPAGE2_PORT_FLAGS_DV_MASK;
+ ioc->spi_data.PortFlags = data;
for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++)
{
pdevice = &pPP2->DeviceSettings[ii];
data =
(le16_to_cpu(pdevice->DeviceFlags) << 16) |
@@ -4433,7 +4445,6 @@
}
pci_free_consistent(ioc->pcidev, header.PageLength *
4, pbuf, buf_dma);
- pbuf = NULL;
}
}
@@ -4509,8 +4520,8 @@
static int
mpt_findImVolumes(MPT_ADAPTER *ioc)
{
- IOCPage2_t *pIoc2 = NULL;
- ConfigPageIoc2RaidVol_t *pIocRv = NULL;
+ IOCPage2_t *pIoc2;
+ ConfigPageIoc2RaidVol_t *pIocRv;
dma_addr_t ioc2_dma;
CONFIGPARMS cfg;
ConfigPageHeader_t header;
@@ -4587,10 +4598,7 @@
}
done_and_free:
- if (pIoc2) {
- pci_free_consistent(ioc->pcidev, iocpage2sz, pIoc2,
ioc2_dma);
- pIoc2 = NULL;
- }
+ pci_free_consistent(ioc->pcidev, iocpage2sz, pIoc2, ioc2_dma);
return rc;
}
@@ -4598,7 +4606,7 @@
int
mpt_read_ioc_pg_3(MPT_ADAPTER *ioc)
{
- IOCPage3_t *pIoc3 = NULL;
+ IOCPage3_t *pIoc3;
u8 *mem;
CONFIGPARMS cfg;
ConfigPageHeader_t header;
@@ -4651,18 +4659,66 @@
}
}
- if (pIoc3) {
- pci_free_consistent(ioc->pcidev, iocpage3sz, pIoc3,
ioc3_dma);
- pIoc3 = NULL;
- }
+ pci_free_consistent(ioc->pcidev, iocpage3sz, pIoc3, ioc3_dma);
return 0;
}
static void
+mpt_read_ioc_pg_4(MPT_ADAPTER *ioc)
+{
+ IOCPage4_t *pIoc4;
+ CONFIGPARMS cfg;
+ ConfigPageHeader_t header;
+ dma_addr_t ioc4_dma;
+ int iocpage4sz;
+
+ /* Read and save IOC Page 4
+ */
+ header.PageVersion = 0;
+ header.PageLength = 0;
+ header.PageNumber = 4;
+ header.PageType = MPI_CONFIG_PAGETYPE_IOC;
+ cfg.hdr = &header;
+ cfg.physAddr = -1;
+ cfg.pageAddr = 0;
+ cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
+ cfg.dir = 0;
+ cfg.timeout = 0;
+ if (mpt_config(ioc, &cfg) != 0)
+ return;
+
+ if (header.PageLength == 0)
+ return;
+
+ if ( (pIoc4 = ioc->spi_data.pIocPg4) == NULL ) {
+ iocpage4sz = (header.PageLength + 4) * 4; /* Allow 4
additional SEP's */
+ pIoc4 = pci_alloc_consistent(ioc->pcidev, iocpage4sz,
&ioc4_dma);
+ if (!pIoc4)
+ return;
+ } else {
+ ioc4_dma = ioc->spi_data.IocPg4_dma;
+ iocpage4sz = ioc->spi_data.IocPg4Sz;
+ }
+
+ /* Read the Page into dma memory.
+ */
+ cfg.physAddr = ioc4_dma;
+ cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
+ if (mpt_config(ioc, &cfg) == 0) {
+ ioc->spi_data.pIocPg4 = (IOCPage4_t *) pIoc4;
+ ioc->spi_data.IocPg4_dma = ioc4_dma;
+ ioc->spi_data.IocPg4Sz = iocpage4sz;
+ } else {
+ pci_free_consistent(ioc->pcidev, iocpage4sz, pIoc4,
ioc4_dma);
+ ioc->spi_data.pIocPg4 = NULL;
+ }
+}
+
+static void
mpt_read_ioc_pg_1(MPT_ADAPTER *ioc)
{
- IOCPage1_t *pIoc1 = NULL;
+ IOCPage1_t *pIoc1;
CONFIGPARMS cfg;
ConfigPageHeader_t header;
dma_addr_t ioc1_dma;
@@ -4738,10 +4794,7 @@
}
}
- if (pIoc1) {
- pci_free_consistent(ioc->pcidev, iocpage1sz, pIoc1,
ioc1_dma);
- pIoc1 = NULL;
- }
+ pci_free_consistent(ioc->pcidev, iocpage1sz, pIoc1, ioc1_dma);
return;
}
@@ -5428,7 +5481,7 @@
int rc;
unsigned long flags;
- dprintk((MYIOC_s_INFO_FMT "HardResetHandler Entered!\n",
ioc->name));
+ dtmprintk((MYIOC_s_INFO_FMT "HardResetHandler Entered!\n",
ioc->name));
#ifdef MFCNT
printk(MYIOC_s_INFO_FMT "HardResetHandler Entered!\n", ioc->name);
printk("MF count 0x%x !\n", ioc->mfcnt);
@@ -5460,11 +5513,11 @@
for (ii=MPT_MAX_PROTOCOL_DRIVERS-1; ii; ii--) {
if (MptResetHandlers[ii]) {
- dprintk((MYIOC_s_INFO_FMT "Calling IOC
reset_setup handler #%d\n",
+ dtmprintk((MYIOC_s_INFO_FMT "Calling IOC
reset_setup handler #%d\n",
ioc->name, ii));
r += (*(MptResetHandlers[ii]))(ioc,
MPT_IOC_SETUP_RESET);
if (ioc->alt_ioc) {
- dprintk((MYIOC_s_INFO_FMT "Calling
alt-%s setup reset handler #%d\n",
+ dtmprintk((MYIOC_s_INFO_FMT "Calling
alt-%s setup reset handler #%d\n",
ioc->name,
ioc->alt_ioc->name, ii));
r +=
(*(MptResetHandlers[ii]))(ioc->alt_ioc, MPT_IOC_SETUP_RESET);
}
@@ -5486,7 +5539,7 @@
ioc->alt_ioc->diagPending = 0;
spin_unlock_irqrestore(&ioc->diagLock, flags);
- dprintk((MYIOC_s_INFO_FMT "HardResetHandler rc = %d!\n", ioc->name,
rc));
+ dtmprintk((MYIOC_s_INFO_FMT "HardResetHandler rc = %d!\n",
ioc->name, rc));
return rc;
}
@@ -5495,7 +5548,7 @@
static char *
EventDescriptionStr(u8 event, u32 evData0)
{
- char *ds = NULL;
+ char *ds;
switch(event) {
case MPI_EVENT_NONE:
@@ -6001,7 +6054,7 @@
fusion_exit(void)
{
MPT_ADAPTER *this;
- struct pci_dev *pdev = NULL;
+ struct pci_dev *pdev;
dprintk((KERN_INFO MYNAM ": fusion_exit() called!\n"));
@@ -6021,7 +6074,7 @@
this->active = 0;
pdev = (struct pci_dev *)this->pcidev;
- mptscsih_sync_irq(pdev->irq);
+ mpt_sync_irq(pdev->irq);
/* Clear any lingering interrupt */
CHIPREG_WRITE32(&this->chip->IntStatus, 0);
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/mptbase.h
linux-2.4.25-pre7/drivers/message/fusion/mptbase.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/mptbase.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/mptbase.h 2004-01-27
10:42:50.000000000 -0700
@@ -11,7 +11,7 @@
* Copyright (c) 1999-2002 LSI Logic Corporation
* Originally By: Steven J. Ralston
* (mailto:sjralston1@netscape.net)
- * (mailto:lstephens@lsil.com)
+ * (mailto:mpt_linux_developer@lsil.com)
*
* $Id: mptbase.h,v 1.149 2003/05/07 14:08:31 pdelaney Exp $
*/
@@ -77,11 +77,11 @@
#endif
#ifndef COPYRIGHT
-#define COPYRIGHT "Copyright (c) 1999-2002 " MODULEAUTHOR
+#define COPYRIGHT "Copyright (c) 1999-2003 " MODULEAUTHOR
#endif
-#define MPT_LINUX_VERSION_COMMON "2.05.05+"
-#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-2.05.05+"
+#define MPT_LINUX_VERSION_COMMON "2.05.11.01"
+#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-2.05.11.01"
#define WHAT_MAGIC_STRING "@" "(" "#" ")"
#define show_mptmod_ver(s,ver) \
@@ -96,7 +96,7 @@
#define MPT_MAX_BUS 1 /* Do not change */
#define MPT_MAX_FC_DEVICES 255
#define MPT_MAX_SCSI_DEVICES 16
-#define MPT_LAST_LUN 31
+#define MPT_LAST_LUN 255
#define MPT_SENSE_BUFFER_ALLOC 64
/* allow for 256 max sense alloc, but only 255 max request */
#if MPT_SENSE_BUFFER_ALLOC >= 256
@@ -127,6 +127,8 @@
#define MPT_MAX_FRAME_SIZE 128
#define MPT_DEFAULT_FRAME_SIZE 128
+#define MPT_REPLY_FRAME_SIZE 0x40 /* Must be a multiple of 8 */
+
#define MPT_SG_REQ_128_SCALE 1
#define MPT_SG_REQ_96_SCALE 2
#define MPT_SG_REQ_64_SCALE 4
@@ -245,6 +247,7 @@
MPIHeader_t hdr;
SCSIIORequest_t scsireq;
SCSIIOReply_t sreply;
+ ConfigReply_t configreply;
MPIDefaultReply_t reply;
MPT_FRAME_TRACKER frame;
} u;
@@ -398,12 +401,9 @@
ScsiCmndTracker SentQ;
ScsiCmndTracker DoneQ;
u32 num_luns;
-//--- LUN split here?
- u32 luns; /* Max LUNs is 32 */
- u8 inq_data[SCSI_STD_INQUIRY_BYTES]; /*
36 */
- u8 pad0[4];
- u8 inq00_data[20];
- u8 pad1[4];
+ u32 luns[8]; /* Max LUNs is 256
*/
+ u8 pad[4];
+ u8 inq_data[8];
/* IEEE Registered Extended Identifier
obtained via INQUIRY VPD page 0x83 */
/* NOTE: Do not separate uniq_prepad and uniq_data
@@ -411,11 +411,6 @@
u8 uniq_prepad[8];
u8 uniq_data[20];
u8 pad2[4];
- u8 inqC3_data[12];
- u8 pad3[4];
- u8 inqC9_data[12];
- u8 pad4[4];
- u8 dev_vol_name[64];
} VirtDevice;
/*
@@ -430,6 +425,7 @@
#define MPT_TARGET_FLAGS_VALID_INQUIRY 0x02
#define MPT_TARGET_FLAGS_Q_YES 0x08
#define MPT_TARGET_FLAGS_VALID_56 0x10
+#define MPT_TARGET_FLAGS_SAF_TE_ISSUED 0x20
#endif
#define MPT_TARGET_NO_NEGO_WIDE 0x01
@@ -529,8 +525,12 @@
/* #define MPT_SCSICFG_BLK_NEGO 0x10 WriteSDP1 with
WDTR and SDTR disabled */
typedef struct _ScsiCfgData {
+ u32 PortFlags;
int *nvram; /* table of device NVRAM
values */
IOCPage3_t *pIocPg3; /* table of physical disks
*/
+ IOCPage4_t *pIocPg4; /* SEP devices addressing */
+ dma_addr_t IocPg4_dma; /* Phys Addr of IOCPage4
data */
+ int IocPg4Sz; /* IOCPage4 size */
u8 dvStatus[MPT_MAX_SCSI_DEVICES];
int isRaid; /* bit field, 1 if RAID */
u8 minSyncFactor; /* 0xFF if async */
@@ -544,7 +544,8 @@
u8 dvScheduled; /* 1 if scheduled */
u8 forceDv; /* 1 to force DV scheduling
*/
u8 noQas; /* Disable QAS for this
adapter */
- u8 rsvd[2];
+ u8 Saf_Te; /* 1 to force all Processors
as SAF-TE if Inquiry data length is too short to check for SAF-TE */
+ u8 rsvd[1];
} ScsiCfgData;
typedef struct _fw_image {
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/mptctl.c
linux-2.4.25-pre7/drivers/message/fusion/mptctl.c
--- linux-2.4.25-pre7-reference/drivers/message/fusion/mptctl.c 2004-01-27
11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/mptctl.c 2004-01-27
10:42:50.000000000 -0700
@@ -32,7 +32,7 @@
* Copyright (c) 1999-2002 LSI Logic Corporation
* Originally By: Steven J. Ralston, Noah Romer
* (mailto:sjralston1@netscape.net)
- * (mailto:lstephens@lsil.com)
+ * (mailto:mpt_linux_developer@lsil.com)
*
* $Id: mptctl.c,v 1.66 2003/05/07 14:08:32 pdelaney Exp $
*/
@@ -208,14 +208,6 @@
return -EBUSY;
}
-#if defined(__sparc__) && defined(__sparc_v9__) /*{*/
- if (!nonblock) {
- if (down_interruptible(&mptctl_syscall_sem_ioc[ioc->id]))
- rc = -ERESTARTSYS;
- } else {
- rc = -EPERM;
- }
-#else
if (nonblock) {
if (down_trylock(&mptctl_syscall_sem_ioc[ioc->id]))
rc = -EAGAIN;
@@ -223,7 +215,6 @@
if (down_interruptible(&mptctl_syscall_sem_ioc[ioc->id]))
rc = -ERESTARTSYS;
}
-#endif
dctlprintk((KERN_INFO MYNAM "::mptctl_syscall_down return %d\n",
rc));
return rc;
}
@@ -1275,10 +1266,10 @@
/* Fill in the data and return the structure to the calling
* program
*/
- if (ioc->chip_type == C1030)
- karg.adapterType = MPT_IOCTL_INTERFACE_SCSI;
- else
+ if ((int)ioc->chip_type <= (int) FC929)
karg.adapterType = MPT_IOCTL_INTERFACE_FC;
+ else
+ karg.adapterType = MPT_IOCTL_INTERFACE_SCSI;
port = karg.hdr.port;
@@ -1329,6 +1320,7 @@
/* Set the Version Strings.
*/
strncpy (karg.driverVersion, MPT_LINUX_PACKAGE_NAME,
MPT_IOCTL_VERSION_LENGTH);
+ karg.driverVersion[MPT_IOCTL_VERSION_LENGTH-1]='\0';
karg.busChangeEvent = 0;
karg.hostId = ioc->pfacts[port].PortSCSIID;
@@ -1369,7 +1361,8 @@
int iocnum;
int numDevices = 0;
unsigned int max_id;
- int ii, jj, lun;
+ int ii, jj, indexed_lun, lun_index;
+ u32 lun;
int maxWordsLeft;
int numBytes;
u8 port;
@@ -1443,8 +1436,10 @@
while (ii <= max_id) {
if (hd->Targets[ii]) {
for (jj = 0; jj <= MPT_LAST_LUN;
jj++) {
- lun = (1 << jj);
- if (hd->Targets[ii]->luns &
lun) {
+ lun_index = (jj >> 5);
+ indexed_lun = (jj % 32);
+ lun = (1 << indexed_lun);
+ if
(hd->Targets[ii]->luns[lun_index] & lun) {
numDevices++;
*pdata = (jj << 16)
| ii;
--maxWordsLeft;
@@ -1529,7 +1524,9 @@
karg.chip_type = ioc->chip_type;
#endif
strncpy (karg.name, ioc->name, MPT_MAX_NAME);
+ karg.name[MPT_MAX_NAME-1]='\0';
strncpy (karg.product, ioc->prod_name, MPT_PRODUCT_LENGTH);
+ karg.product[MPT_PRODUCT_LENGTH-1]='\0';
/* Copy the data from kernel memory to user memory
*/
@@ -1950,6 +1947,8 @@
*/
if (karg.maxSenseBytes > MPT_SENSE_BUFFER_SIZE)
pScsiReq->SenseBufferLength =
MPT_SENSE_BUFFER_SIZE;
+ else
+ pScsiReq->SenseBufferLength =
karg.maxSenseBytes;
pScsiReq->SenseBufferLowAddr =
cpu_to_le32(ioc->sense_buf_low_dma
@@ -2011,6 +2010,8 @@
*/
if (karg.maxSenseBytes > MPT_SENSE_BUFFER_SIZE)
pScsiReq->SenseBufferLength =
MPT_SENSE_BUFFER_SIZE;
+ else
+ pScsiReq->SenseBufferLength =
karg.maxSenseBytes;
pScsiReq->SenseBufferLowAddr =
cpu_to_le32(ioc->sense_buf_low_dma
@@ -2471,8 +2472,10 @@
cfg.physAddr = buf_dma;
if (mpt_config(ioc, &cfg) == 0) {
ManufacturingPage0_t *pdata =
(ManufacturingPage0_t *) pbuf;
- if (strlen(pdata->BoardTracerNumber)
> 1)
+ if (strlen(pdata->BoardTracerNumber)
> 1) {
strncpy(karg.serial_number,
pdata->BoardTracerNumber, 24);
+
karg.serial_number[24-1]='\0';
+ }
}
pci_free_consistent(ioc->pcidev,
hdr.PageLength * 4, pbuf, buf_dma);
pbuf = NULL;
@@ -2705,10 +2708,7 @@
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=*/
-#if defined(__sparc__) && defined(__sparc_v9__) /*{*/
-
-/* The dynamic ioctl32 compat. registry only exists in >2.3.x sparc64
kernels */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) /*{*/
+#ifdef MPT_CONFIG_COMPAT
extern int register_ioctl32_conversion(unsigned int cmd,
int (*handler)(unsigned int,
unsigned int,
@@ -2718,14 +2718,14 @@
extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd, unsigned
long arg);
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=*/
-/* sparc32_XXX functions are used to provide a conversion between
+/* compat_XXX functions are used to provide a conversion between
* pointers and u32's. If the arg does not contain any pointers, then
- * a specialized function (sparc32_XXX) is not needed. If the arg
+ * a specialized function (compat_XXX) is not needed. If the arg
* does contain pointer(s), then the specialized function is used
* to ensure the structure contents is properly processed by mptctl.
*/
static int
-sparc32_mptfwxfer_ioctl(unsigned int fd, unsigned int cmd,
+compat_mptfwxfer_ioctl(unsigned int fd, unsigned int cmd,
unsigned long arg, struct file *filp)
{
struct mpt_fw_xfer32 kfw32;
@@ -2735,7 +2735,7 @@
int nonblock = (filp->f_flags & O_NONBLOCK);
int ret;
- dctlprintk((KERN_INFO MYNAM "::sparc32_mptfwxfer_ioctl()
called\n"));
+ dctlprintk((KERN_INFO MYNAM "::compat_mptfwxfer_ioctl() called\n"));
if (copy_from_user(&kfw32, (char *)arg, sizeof(kfw32)))
return -EFAULT;
@@ -2744,7 +2744,7 @@
iocnumX = kfw32.iocnum & 0xFF;
if (((iocnum = mpt_verify_adapter(iocnumX, &iocp)) < 0) ||
(iocp == NULL)) {
- dctlprintk((KERN_ERR MYNAM "::sparc32_mptfwxfer_ioctl @%d -
ioc%d not found!\n",
+ dctlprintk((KERN_ERR MYNAM "::compat_mptfwxfer_ioctl @%d -
ioc%d not found!\n",
__LINE__, iocnumX));
return -ENODEV;
}
@@ -2764,7 +2764,7 @@
}
static int
-sparc32_mpt_command(unsigned int fd, unsigned int cmd,
+compat_mpt_command(unsigned int fd, unsigned int cmd,
unsigned long arg, struct file *filp)
{
struct mpt_ioctl_command32 karg32;
@@ -2775,7 +2775,7 @@
int nonblock = (filp->f_flags & O_NONBLOCK);
int ret;
- dctlprintk((KERN_INFO MYNAM "::sparc32_mpt_command() called\n"));
+ dctlprintk((KERN_INFO MYNAM "::compat_mpt_command() called\n"));
if (copy_from_user(&karg32, (char *)arg, sizeof(karg32)))
return -EFAULT;
@@ -2784,7 +2784,7 @@
iocnumX = karg32.hdr.iocnum & 0xFF;
if (((iocnum = mpt_verify_adapter(iocnumX, &iocp)) < 0) ||
(iocp == NULL)) {
- dctlprintk((KERN_ERR MYNAM "::sparc32_mpt_command @%d -
ioc%d not found!\n",
+ dctlprintk((KERN_ERR MYNAM "::compat_mpt_command @%d - ioc%d
not found!\n",
__LINE__, iocnumX));
return -ENODEV;
}
@@ -2817,8 +2817,7 @@
return ret;
}
-#endif /*} linux >= 2.3.x */
-#endif /*} sparc */
+#endif
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=*/
int __init mptctl_init(void)
@@ -2864,35 +2863,33 @@
}
}
-#if defined(__sparc__) && defined(__sparc_v9__) /*{*/
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) /*{*/
- err = register_ioctl32_conversion(MPTIOCINFO, NULL);
+#ifdef MPT_CONFIG_COMPAT
+ err = register_ioctl32_conversion(MPTIOCINFO, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(MPTIOCINFO1, NULL);
+ err = register_ioctl32_conversion(MPTIOCINFO1, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(MPTTARGETINFO, NULL);
+ err = register_ioctl32_conversion(MPTTARGETINFO, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(MPTTEST, NULL);
+ err = register_ioctl32_conversion(MPTTEST, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(MPTEVENTQUERY, NULL);
+ err = register_ioctl32_conversion(MPTEVENTQUERY, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(MPTEVENTENABLE, NULL);
+ err = register_ioctl32_conversion(MPTEVENTENABLE, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(MPTEVENTREPORT, NULL);
+ err = register_ioctl32_conversion(MPTEVENTREPORT, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(MPTHARDRESET, NULL);
+ err = register_ioctl32_conversion(MPTHARDRESET, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(MPTCOMMAND32,
sparc32_mpt_command);
+ err = register_ioctl32_conversion(MPTCOMMAND32, compat_mpt_command);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTFWDOWNLOAD32,
- sparc32_mptfwxfer_ioctl);
+ compat_mptfwxfer_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(HP_GETHOSTINFO, NULL);
+ err = register_ioctl32_conversion(HP_GETHOSTINFO, sys_ioctl);
if (++where && err) goto out_fail;
- err = register_ioctl32_conversion(HP_GETTARGETINFO, NULL);
+ err = register_ioctl32_conversion(HP_GETTARGETINFO, sys_ioctl);
if (++where && err) goto out_fail;
-#endif /*} linux >= 2.3.x */
-#endif /*} sparc */
+#endif
/* Register this device */
err = misc_register(&mptctl_miscdev);
@@ -2925,8 +2922,7 @@
out_fail:
-#if defined(__sparc__) && defined(__sparc_v9__) /*{*/
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) /*{*/
+#ifdef MPT_CONFIG_COMPAT
printk(KERN_ERR MYNAM ": ERROR: Failed to register
ioctl32_conversion!"
" (%d:err=%d)\n", where, err);
unregister_ioctl32_conversion(MPTIOCINFO);
@@ -2941,8 +2937,7 @@
unregister_ioctl32_conversion(MPTFWDOWNLOAD32);
unregister_ioctl32_conversion(HP_GETHOSTINFO);
unregister_ioctl32_conversion(HP_GETTARGETINFO);
-#endif /*} linux >= 2.3.x */
-#endif /*} sparc */
+#endif
for (i=0; i<MPT_MAX_ADAPTERS; i++) {
ioc = NULL;
@@ -2979,6 +2974,21 @@
mpt_deregister(mptctl_id);
printk(KERN_INFO MYNAM ": Deregistered from Fusion MPT base
driver\n");
+#ifdef MPT_CONFIG_COMPAT
+ unregister_ioctl32_conversion(MPTIOCINFO);
+ unregister_ioctl32_conversion(MPTIOCINFO1);
+ unregister_ioctl32_conversion(MPTTARGETINFO);
+ unregister_ioctl32_conversion(MPTTEST);
+ unregister_ioctl32_conversion(MPTEVENTQUERY);
+ unregister_ioctl32_conversion(MPTEVENTENABLE);
+ unregister_ioctl32_conversion(MPTEVENTREPORT);
+ unregister_ioctl32_conversion(MPTHARDRESET);
+ unregister_ioctl32_conversion(MPTCOMMAND32);
+ unregister_ioctl32_conversion(MPTFWDOWNLOAD32);
+ unregister_ioctl32_conversion(HP_GETHOSTINFO);
+ unregister_ioctl32_conversion(HP_GETTARGETINFO);
+#endif
+
/* Free allocated memory */
for (i=0; i<MPT_MAX_ADAPTERS; i++) {
ioc = NULL;
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/mptctl.h
linux-2.4.25-pre7/drivers/message/fusion/mptctl.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/mptctl.h 2004-01-27
11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/mptctl.h 2004-01-27
10:42:50.000000000 -0700
@@ -18,7 +18,7 @@
* Copyright (c) 1999-2002 LSI Logic Corporation
* Originally By: Steven J. Ralston
* (mailto:sjralston1@netscape.net)
- * (mailto:lstephens@lsil.com)
+ * (mailto:mpt_linux_developer@lsil.com)
*
* $Id: mptctl.h,v 1.14 2003/03/18 22:49:51 pdelaney Exp $
*/
@@ -84,10 +84,10 @@
#define MPTFWDOWNLOAD _IOWR(MPT_MAGIC_NUMBER,15,struct
mpt_fw_xfer)
#define MPTCOMMAND _IOWR(MPT_MAGIC_NUMBER,20,struct
mpt_ioctl_command)
-#if defined(__KERNEL__) && defined(__sparc__) && defined(__sparc_v9__)
/*{*/
+#if defined(__KERNEL__) && defined(MPT_CONFIG_COMPAT)
#define MPTFWDOWNLOAD32 _IOWR(MPT_MAGIC_NUMBER,15,struct
mpt_fw_xfer32)
#define MPTCOMMAND32 _IOWR(MPT_MAGIC_NUMBER,20,struct
mpt_ioctl_command32)
-#endif /*}*/
+#endif
#define MPTIOCINFO _IOWR(MPT_MAGIC_NUMBER,17,struct
mpt_ioctl_iocinfo)
#define MPTIOCINFO1 _IOWR(MPT_MAGIC_NUMBER,17,struct
mpt_ioctl_iocinfo_rev0)
@@ -117,13 +117,13 @@
void *bufp; /* Pointer to firmware buffer */
};
-#if defined(__KERNEL__) && defined(__sparc__) && defined(__sparc_v9__)
/*{*/
+#if defined(__KERNEL__) && defined(MPT_CONFIG_COMPAT)
struct mpt_fw_xfer32 {
unsigned int iocnum;
unsigned int fwlen;
u32 bufp;
};
-#endif /*}*/
+#endif
/*
* IOCTL header structure.
@@ -316,7 +316,7 @@
/*
* SPARC PLATFORM: See earlier remark.
*/
-#if defined(__KERNEL__) && defined(__sparc__) && defined(__sparc_v9__)
/*{*/
+#if defined(__KERNEL__) && defined(MPT_CONFIG_COMPAT)
struct mpt_ioctl_command32 {
mpt_ioctl_header hdr;
int timeout;
@@ -331,7 +331,7 @@
int dataSgeOffset;
char MF[1];
};
-#endif /*}*/
+#endif
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=*/
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/mptscsih.c
linux-2.4.25-pre7/drivers/message/fusion/mptscsih.c
--- linux-2.4.25-pre7-reference/drivers/message/fusion/mptscsih.c
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/mptscsih.c 2004-01-27
10:42:50.000000000 -0700
@@ -24,7 +24,7 @@
* Copyright (c) 1999-2002 LSI Logic Corporation
* Original author: Steven J. Ralston
* (mailto:sjralston1@netscape.net)
- * (mailto:lstephens@lsil.com)
+ * (mailto:mpt_linux_developer@lsil.com)
*
* $Id: mptscsih.c,v 1.1.2.4 2003/05/07 14:08:34 pdelaney Exp $
*/
@@ -180,12 +180,13 @@
static int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
static int mptscsih_event_process(MPT_ADAPTER *ioc,
EventNotificationReply_t *pEvReply);
-static VirtDevice *mptscsih_initTarget(MPT_SCSI_HOST *hd, int bus_id,
int target_id, u8 lun, char *data, int dlen);
+static void mptscsih_initTarget(MPT_SCSI_HOST *hd, int bus_id, int
target_id, u8 lun, char *data, int dlen);
void mptscsih_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtDevice
*target, char byte56);
static void mptscsih_set_dvflags(MPT_SCSI_HOST *hd, SCSIIORequest_t
*pReq);
static void mptscsih_setDevicePage1Flags (u8 width, u8 factor, u8
offset, int *requestedPtr, int *configurationPtr, u8 flags);
static void mptscsih_no_negotiate(MPT_SCSI_HOST *hd, int target_id);
static int mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int
target, int flags);
+static int mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int
bus);
static int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR
*mf, MPT_FRAME_HDR *r);
static void mptscsih_timer_expired(unsigned long data);
static void mptscsih_taskmgmt_timeout(unsigned long data);
@@ -438,10 +439,10 @@
static inline int
mptscsih_getFreeChainBuffer(MPT_SCSI_HOST *hd, int *retIndex)
{
- MPT_FRAME_HDR *chainBuf = NULL;
+ MPT_FRAME_HDR *chainBuf;
unsigned long flags;
- int rc = FAILED;
- int chain_idx = MPT_HOST_NO_CHAIN;
+ int rc;
+ int chain_idx;
spin_lock_irqsave(&hd->ioc->FreeQlock, flags);
if (!Q_IS_EMPTY(&hd->FreeChainQ)) {
@@ -454,6 +455,10 @@
chain_idx = offset / hd->ioc->req_sz;
rc = SUCCESS;
}
+ else {
+ rc = FAILED;
+ chain_idx = MPT_HOST_NO_CHAIN;
+ }
spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
@@ -506,12 +511,13 @@
/* Map the data portion, if any.
* sges_left = 0 if no data transfer.
*/
- sges_left = SCpnt->use_sg;
- if (SCpnt->use_sg) {
- sges_left = pci_map_sg(hd->ioc->pcidev,
+ if ( (sges_left = SCpnt->use_sg) ) {
+ if ( (sges_left = pci_map_sg(hd->ioc->pcidev,
(struct scatterlist *) SCpnt->request_buffer,
SCpnt->use_sg,
-
scsi_to_pci_dma_dir(SCpnt->sc_data_direction));
+
scsi_to_pci_dma_dir(SCpnt->sc_data_direction)))
+ == 0 )
+ return FAILED;
} else if (SCpnt->request_bufflen) {
dma_addr_t buf_dma_addr;
scPrivate *my_priv;
@@ -730,13 +736,6 @@
hd = (MPT_SCSI_HOST *) ioc->sh->hostdata;
- if ((mf == NULL) ||
- (mf >= MPT_INDEX_2_MFPTR(ioc, ioc->req_depth))) {
- printk(MYIOC_s_ERR_FMT "%s req frame ptr! (=%p)!\n",
- ioc->name, mf?"BAD":"NULL", (void *) mf);
- return 0;
- }
-
req_idx = le16_to_cpu(mf->u.frame.hwhdr.msgctxu.fld.req_idx);
sc = hd->ScsiLookup[req_idx];
if (sc == NULL) {
@@ -878,7 +877,6 @@
mptscsih_no_negotiate(hd, sc->target);
break;
- case MPI_IOCSTATUS_SCSI_RESIDUAL_MISMATCH: /* 0x0049 */
case MPI_IOCSTATUS_SCSI_DATA_UNDERRUN: /* 0x0045 */
/*
* YIKES! I just discovered that SCSI IO which
@@ -916,6 +914,9 @@
sc->resid = sc->request_bufflen - xfer_cnt;
dprintk((KERN_NOTICE " SET sc->resid=%02xh\n",
sc->resid));
#endif
+ if (sc->underflow > xfer_cnt) {
+ sc->result = DID_SOFT_ERROR;
+ }
/* Report Queue Full
*/
@@ -1036,6 +1037,7 @@
case MPI_IOCSTATUS_INVALID_STATE: /* 0x0008 */
case MPI_IOCSTATUS_SCSI_DATA_OVERRUN: /* 0x0044 */
case MPI_IOCSTATUS_SCSI_IO_DATA_ERROR: /* 0x0046 */
+ case MPI_IOCSTATUS_SCSI_RESIDUAL_MISMATCH: /* 0x0049 */
case MPI_IOCSTATUS_SCSI_TASK_MGMT_FAILED: /* 0x004A */
default:
/*
@@ -1156,8 +1158,8 @@
static void
clean_taskQ(MPT_SCSI_HOST *hd)
{
- MPT_FRAME_HDR *mf = NULL;
- MPT_FRAME_HDR *nextmf = NULL;
+ MPT_FRAME_HDR *mf;
+ MPT_FRAME_HDR *nextmf;
MPT_ADAPTER *ioc = hd->ioc;
unsigned long flags;
@@ -1196,7 +1198,7 @@
static void
search_taskQ_for_cmd(Scsi_Cmnd *sc, MPT_SCSI_HOST *hd)
{
- MPT_FRAME_HDR *mf = NULL;
+ MPT_FRAME_HDR *mf;
unsigned long flags;
int count = 0;
@@ -1320,7 +1322,7 @@
static void
mptscsih_reset_timeouts (MPT_SCSI_HOST *hd)
{
- Scsi_Cmnd *SCpnt = NULL;
+ Scsi_Cmnd *SCpnt;
int ii;
int max = hd->ioc->req_depth;
@@ -1346,9 +1348,9 @@
static void
mptscsih_flush_running_cmds(MPT_SCSI_HOST *hd)
{
- Scsi_Cmnd *SCpnt = NULL;
- MPT_FRAME_HDR *mf = NULL;
- MPT_DONE_Q *buffer = NULL;
+ Scsi_Cmnd *SCpnt;
+ MPT_FRAME_HDR *mf;
+ MPT_DONE_Q *buffer;
int ii;
int max = hd->ioc->req_depth;
@@ -1457,18 +1459,16 @@
/* ReqToChain size must equal the req_depth
* index = req_idx
*/
- sz = hd->ioc->req_depth * sizeof(int);
if (hd->ReqToChain == NULL) {
+ sz = hd->ioc->req_depth * sizeof(int);
mem = kmalloc(sz, GFP_ATOMIC);
if (mem == NULL)
return -1;
hd->ReqToChain = (int *) mem;
- } else {
- mem = (u8 *) hd->ReqToChain;
}
- memset(mem, 0xFF, sz);
-
+ for (ii = 0; ii < hd->ioc->req_depth; ii++)
+ hd->ReqToChain[ii] = MPT_HOST_NO_CHAIN;
/* ChainToChain size must equal the total number
* of chain buffers to be allocated.
@@ -1606,9 +1606,9 @@
int
mptscsih_detect(Scsi_Host_Template *tpnt)
{
- struct Scsi_Host *sh = NULL;
- MPT_SCSI_HOST *hd = NULL;
- MPT_ADAPTER *this;
+ struct Scsi_Host *sh;
+ MPT_SCSI_HOST *hd;
+ MPT_ADAPTER *ioc;
MPT_DONE_Q *freedoneQ;
unsigned long flags;
int sz, ii;
@@ -1651,20 +1651,19 @@
atomic_set(&mpt_taskQdepth, 0);
#endif
- this = mpt_adapter_find_first();
- while (this != NULL) {
+ for (ioc = mpt_adapter_find_first(); ioc != NULL; ioc =
mpt_adapter_find_next(ioc)) {
/* 20010202 -sralston
* Added sanity check on readiness of the MPT adapter.
*/
- if (this->last_state != MPI_IOC_STATE_OPERATIONAL) {
+ if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
printk(MYIOC_s_WARN_FMT "Skipping because it's not
operational!\n",
- this->name);
+ ioc->name);
continue;
}
- if (!this->active) {
+ if (!ioc->active) {
printk(MYIOC_s_WARN_FMT "Skipping because it's
disabled!\n",
- this->name);
+ ioc->name);
continue;
}
@@ -1672,14 +1671,14 @@
/* Sanity check - ensure at least 1 port is INITIATOR
capable
*/
ioc_cap = 0;
- for (ii=0; ii < this->facts.NumberOfPorts; ii++) {
- if (this->pfacts[ii].ProtocolFlags &
MPI_PORTFACTS_PROTOCOL_INITIATOR)
+ for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) {
+ if (ioc->pfacts[ii].ProtocolFlags &
MPI_PORTFACTS_PROTOCOL_INITIATOR)
ioc_cap ++;
}
if (!ioc_cap) {
- printk(MYIOC_s_WARN_FMT "Skipping because SCSI
Initiator mode is NOT enabled!\n",
- this->name);
+ printk(MYIOC_s_WARN_FMT "Skipping ioc=%p because
SCSI Initiator mode is NOT enabled!\n",
+ ioc->name, ioc);
continue;
}
@@ -1690,7 +1689,7 @@
tpnt->proc_info = mptscsih_proc_info;
sh = scsi_register(tpnt, sizeof(MPT_SCSI_HOST));
if (sh != NULL) {
- spin_lock_irqsave(&this->FreeQlock, flags);
+ spin_lock_irqsave(&ioc->FreeQlock, flags);
sh->io_port = 0;
sh->n_io_port = 0;
sh->irq = 0;
@@ -1705,7 +1704,7 @@
* max_lun = 1 + actual last lun,
* see hosts.h :o(
*/
- if ((int)this->chip_type > (int)FC929)
+ if ((int)ioc->chip_type > (int)FC929)
sh->max_id = MPT_MAX_SCSI_DEVICES;
else {
/* For FC, increase the queue depth
@@ -1732,7 +1731,7 @@
* and all access to VirtDev
*/
sh->max_channel = 0;
- sh->this_id = this->pfacts[0].PortSCSIID;
+ sh->this_id = ioc->pfacts[0].PortSCSIID;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)
/* OS entry to allow host drivers to force
@@ -1742,7 +1741,7 @@
#endif
/* Required entry.
*/
- sh->unique_id = this->id;
+ sh->unique_id = ioc->id;
/* Verify that we won't exceed the maximum
* number of chain buffers
@@ -1753,38 +1752,38 @@
* A slightly different algorithm is required for
* 64bit SGEs.
*/
- scale = this->req_sz/(sizeof(dma_addr_t) +
sizeof(u32));
+ scale = ioc->req_sz/(sizeof(dma_addr_t) +
sizeof(u32));
if (sizeof(dma_addr_t) == sizeof(u64)) {
- numSGE = (scale - 1) *
(this->facts.MaxChainDepth-1) + scale +
- (this->req_sz - 60) /
(sizeof(dma_addr_t) + sizeof(u32));
+ numSGE = (scale - 1) *
(ioc->facts.MaxChainDepth-1) + scale +
+ (ioc->req_sz - 60) /
(sizeof(dma_addr_t) + sizeof(u32));
} else {
- numSGE = 1 + (scale - 1) *
(this->facts.MaxChainDepth-1) + scale +
- (this->req_sz - 64) /
(sizeof(dma_addr_t) + sizeof(u32));
+ numSGE = 1 + (scale - 1) *
(ioc->facts.MaxChainDepth-1) + scale +
+ (ioc->req_sz - 64) /
(sizeof(dma_addr_t) + sizeof(u32));
}
if (numSGE < sh->sg_tablesize) {
/* Reset this value */
dprintk((MYIOC_s_INFO_FMT
"Resetting sg_tablesize to %d from
%d\n",
- this->name, numSGE,
sh->sg_tablesize));
+ ioc->name, numSGE,
sh->sg_tablesize));
sh->sg_tablesize = numSGE;
}
/* Set the pci device pointer in Scsi_Host
structure.
*/
- scsi_set_pci_device(sh, this->pcidev);
+ scsi_set_pci_device(sh, ioc->pcidev);
- spin_unlock_irqrestore(&this->FreeQlock, flags);
+ spin_unlock_irqrestore(&ioc->FreeQlock, flags);
hd = (MPT_SCSI_HOST *) sh->hostdata;
- hd->ioc = this;
+ hd->ioc = ioc;
hd->max_sge = sh->sg_tablesize;
- if ((int)this->chip_type > (int)FC929)
+ if ((int)ioc->chip_type > (int)FC929)
hd->is_spi = 1;
if (DmpService &&
- (this->chip_type == FC919 || this->chip_type ==
FC929))
+ (ioc->chip_type == FC919 || ioc->chip_type ==
FC929))
hd->is_multipath = 1;
/* SCSI needs Scsi_Cmnd lookup table!
@@ -1799,7 +1798,7 @@
hd->ScsiLookup = (struct scsi_cmnd **) mem;
dprintk((MYIOC_s_INFO_FMT "ScsiLookup @ %p,
sz=%d\n",
- this->name, hd->ScsiLookup, sz));
+ ioc->name, hd->ScsiLookup, sz));
if (mptscsih_initChainBuffers(hd, 1) < 0)
goto done;
@@ -1870,7 +1869,7 @@
/* Attach the SCSI Host to the IOC structure
*/
- this->sh = sh;
+ ioc->sh = sh;
/* Initialize this SCSI Hosts' timers
* To use, set the timer expires field
@@ -1886,7 +1885,7 @@
hd->qtag_tick = jiffies;
/* Moved Earlier Pam D */
- /* this->sh = sh; */
+ /* ioc->sh = sh; */
#ifdef MPTSCSIH_DBG_TIMEOUT
hd->ioc->timeout_hard = 0;
@@ -1909,6 +1908,8 @@
if (hd->ioc->spi_data.minSyncFactor ==
MPT_ASYNC)
hd->ioc->spi_data.maxSyncOffset = 0;
+ hd->ioc->spi_data.Saf_Te =
driver_setup.saf_te;
+
hd->negoNvram = 0;
#ifdef MPTSCSIH_DISABLE_DOMAIN_VALIDATION
hd->negoNvram = MPT_SCSICFG_USE_NVRAM;
@@ -1926,16 +1927,15 @@
}
ddvprintk((MYIOC_s_INFO_FMT
- "dv %x width %x factor %x \n",
+ "dv %x width %x factor %x saf_te
%x\n",
hd->ioc->name, driver_setup.dv,
driver_setup.max_width,
- driver_setup.min_sync_fac));
+ driver_setup.min_sync_fac,
+ driver_setup.saf_te));
}
mpt_scsi_hosts++;
}
-
- this = mpt_adapter_find_next(this);
}
done:
@@ -2146,8 +2146,8 @@
static int
mptscsih_halt(struct notifier_block *nb, ulong event, void *buf)
{
- MPT_ADAPTER *ioc = NULL;
- MPT_SCSI_HOST *hd = NULL;
+ MPT_ADAPTER *ioc;
+ MPT_SCSI_HOST *hd;
/* Ignore all messages other than reboot message
*/
@@ -2182,7 +2182,7 @@
const char *
mptscsih_info(struct Scsi_Host *SChost)
{
- MPT_SCSI_HOST *h = NULL;
+ MPT_SCSI_HOST *h;
int size = 0;
if (info_kbuf == NULL)
@@ -2398,7 +2398,7 @@
int mptscsih_proc_info(char *buffer, char **start, off_t offset,
int length, int hostno, int func)
{
- MPT_ADAPTER *ioc = NULL;
+ MPT_ADAPTER *ioc;
MPT_SCSI_HOST *hd = NULL;
int size = 0;
@@ -2489,7 +2489,7 @@
MPT_FRAME_HDR *mf;
SCSIIORequest_t *pScsiReq;
VirtDevice *pTarget;
- MPT_DONE_Q *buffer = NULL;
+ MPT_DONE_Q *buffer;
unsigned long flags;
int target;
int lun;
@@ -2774,7 +2774,7 @@
static void
mptscsih_freeChainBuffers(MPT_SCSI_HOST *hd, int req_idx)
{
- MPT_FRAME_HDR *chain = NULL;
+ MPT_FRAME_HDR *chain;
unsigned long flags;
int chain_idx;
int next;
@@ -2839,7 +2839,7 @@
static int
mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8
lun, int ctx2abort, int sleepFlag)
{
- MPT_ADAPTER *ioc = NULL;
+ MPT_ADAPTER *ioc;
int rc = -1;
int doTask = 1;
u32 ioc_raw_state;
@@ -3088,7 +3088,6 @@
search_doneQ_for_cmd(hd, SCpnt);
SCpnt->result = DID_RESET << 16;
- SCpnt->scsi_done(SCpnt);
nehprintk((KERN_WARNING MYNAM ": %s: mptscsih_abort: "
"Command not in the active list! (sc=%p)\n",
hd->ioc->name, SCpnt));
@@ -3345,7 +3344,6 @@
if ((hd = (MPT_SCSI_HOST *) SCpnt->host->hostdata) == NULL) {
printk(KERN_WARNING " WARNING - OldAbort, NULL hostdata
ptr!!\n");
SCpnt->result = DID_ERROR << 16;
- SCpnt->scsi_done(SCpnt);
return SCSI_ABORT_NOT_RUNNING;
}
@@ -3359,18 +3357,19 @@
*/
search_doneQ_for_cmd(hd, SCpnt);
- SCpnt->result = DID_RESET << 16;
- SCpnt->scsi_done(SCpnt);
+ SCpnt->result = DID_ABORT << 16;
return SCSI_ABORT_SUCCESS;
} else {
/* If this command is pended, then timeout/hang occurred
* during DV. Force bus reset by posting command to F/W
* and then following up with the reset request.
*/
+#ifndef MPTSCSIH_DBG_TIMEOUT
if ((mf = mptscsih_search_pendingQ(hd, scpnt_idx)) != NULL)
{
mptscsih_put_msgframe(ScsiDoneCtx, hd->ioc->id, mf);
post_pendingQ_commands(hd);
}
+#endif
}
/*
@@ -3476,8 +3475,7 @@
printk(KERN_WARNING " IOs outstanding = %d\n",
atomic_read(&queue_depth));
if ((hd = (MPT_SCSI_HOST *) SCpnt->host->hostdata) == NULL) {
- SCpnt->result = DID_RESET << 16;
- SCpnt->scsi_done(SCpnt);
+ SCpnt->result = DID_ERROR << 16;
return SCSI_RESET_SUCCESS;
}
@@ -3492,17 +3490,18 @@
search_doneQ_for_cmd(hd, SCpnt);
SCpnt->result = DID_RESET << 16;
- SCpnt->scsi_done(SCpnt);
return SCSI_RESET_SUCCESS;
} else {
/* If this command is pended, then timeout/hang occurred
* during DV. Force bus reset by posting command to F/W
* and then following up with the reset request.
*/
+#ifndef MPTSCSIH_DBG_TIMEOUT
if ((mf = mptscsih_search_pendingQ(hd, scpnt_idx)) != NULL)
{
mptscsih_put_msgframe(ScsiDoneCtx, hd->ioc->id, mf);
post_pendingQ_commands(hd);
}
+#endif
}
/*
@@ -3628,8 +3627,8 @@
#ifdef MPTSCSIH_DBG_TIMEOUT
if (ioc->timeout_hard == 1) {
- mptscsih_TMHandler(hd,
-
MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
+ mptscsih_TMHandler(hd,
+
MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
0, 0, 0, 0, CAN_SLEEP);
}
@@ -3727,6 +3726,9 @@
mpt_free_msg_frame(ScsiTaskCtx, hd->ioc->id,
mf);
mf = NULL;
+#ifndef MPTSCSIH_DBG_TIMEOUT
+ post_pendingQ_commands(hd);
+#endif
if (mptscsih_TMHandler(hd, task_type,
SCpnt->channel,
SCpnt->target,
SCpnt->lun,
ctx2abort, CAN_SLEEP)
< 0) {
@@ -3784,7 +3786,7 @@
{
SCSITaskMgmtReply_t *pScsiTmReply;
SCSITaskMgmt_t *pScsiTmReq;
- MPT_SCSI_HOST *hd = NULL;
+ MPT_SCSI_HOST *hd;
unsigned long flags;
u8 tmType = 0;
@@ -3962,10 +3964,10 @@
}
if (pTarget != NULL) {
- printk(MYIOC_s_INFO_FMT
+ dprintk((MYIOC_s_INFO_FMT
"scsi%d: Id=%d Lun=%d: Queue
depth=%d\n",
- hd->ioc->name, sh->host_no,
- device->id, device->lun,
device->queue_depth);
+ hd->ioc->name,
+ device->id, device->lun,
device->queue_depth));
dprintk((MYIOC_s_INFO_FMT
"Id = %d, sync factor = %x\n",
@@ -4041,11 +4043,10 @@
thisIo.SCSIStatus = pScsiReply->SCSIStatus;
thisIo.DoDisplay = 1;
if (hd->is_multipath)
- sprintf(devFoo, "%d:%d:%d \"%s\"",
+ sprintf(devFoo, "%d:%d:%d",
hd->ioc->id,
pReq->TargetID,
- pReq->LUN[1],
- target->dev_vol_name);
+ pReq->LUN[1]);
else
sprintf(devFoo, "%d:%d:%d", hd->ioc->id, sc->target,
sc->lun);
thisIo.DevIDStr = devFoo;
@@ -4102,7 +4103,7 @@
unsigned long flags;
MPT_DONE_Q *buffer;
MPT_FRAME_HDR *mf = NULL;
- MPT_FRAME_HDR *cmdMfPtr = NULL;
+ MPT_FRAME_HDR *cmdMfPtr;
ddvtprintk((MYIOC_s_INFO_FMT ": search_pendingQ ...",
hd->ioc->name));
cmdMfPtr = MPT_INDEX_2_MFPTR(hd->ioc, scpnt_idx);
@@ -4190,7 +4191,7 @@
static int
mptscsih_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
{
- MPT_SCSI_HOST *hd = NULL;
+ MPT_SCSI_HOST *hd;
unsigned long flags;
dtmprintk((KERN_WARNING MYNAM
@@ -4263,7 +4264,7 @@
dtmprintk((MYIOC_s_WARN_FMT "Pre-Reset complete.\n",
ioc->name));
} else {
- ScsiCfgData *pSpi = NULL;
+ ScsiCfgData *pSpi;
dtmprintk((MYIOC_s_WARN_FMT "Post-Diag Reset\n",
ioc->name));
@@ -4971,13 +4972,12 @@
* Allocate and initialize memory for this target.
* Save inquiry data.
*
- * Returns pointer to VirtDevice structure.
*/
-static VirtDevice *
+static void
mptscsih_initTarget(MPT_SCSI_HOST *hd, int bus_id, int target_id, u8 lun,
char *data, int dlen)
{
+ int indexed_lun, lun_index;
VirtDevice *vdev;
- int sz;
dprintk((MYIOC_s_INFO_FMT "initTarget (%d,%d,%d) called, hd=%p\n",
hd->ioc->name, bus_id, target_id, lun, hd));
@@ -4986,6 +4986,7 @@
if ((vdev = kmalloc(sizeof(VirtDevice), GFP_ATOMIC)) ==
NULL) {
printk(MYIOC_s_ERR_FMT "initTarget kmalloc(%d)
FAILED!\n",
hd->ioc->name,
(int)sizeof(VirtDevice));
+ return;
} else {
memset(vdev, 0, sizeof(VirtDevice));
rwlock_init(&vdev->VdevLock);
@@ -5004,24 +5005,44 @@
}
vdev->raidVolume = 0;
- if (vdev && hd->is_spi) {
+ if (hd->is_spi) {
if (hd->ioc->spi_data.isRaid & (1 << target_id)) {
vdev->raidVolume = 1;
ddvtprintk((KERN_INFO "RAID Volume @ id %d\n",
target_id));
}
}
- if (vdev && data) {
- if ((!(vdev->tflags & MPT_TARGET_FLAGS_VALID_INQUIRY)) ||
- ((dlen > 56) && (!(vdev->tflags &
MPT_TARGET_FLAGS_VALID_56)))) {
-
- /* Copy the inquiry data - if we haven't yet.
- */
- sz = MIN(dlen, SCSI_STD_INQUIRY_BYTES);
+ if (!(vdev->tflags & MPT_TARGET_FLAGS_VALID_INQUIRY)) {
+ /* Copy the inquiry data - if we haven't yet.
+ */
+
+ memcpy (vdev->inq_data, data, 8);
- memcpy (vdev->inq_data, data, sz);
+ if ( (data[0] == SCSI_TYPE_PROC) &&
+ !(vdev->tflags & MPT_TARGET_FLAGS_SAF_TE_ISSUED )) {
+ if ( dlen > 49 ) {
+ vdev->tflags |=
MPT_TARGET_FLAGS_VALID_INQUIRY;
+ if ( data[44] == 'S' &&
+ data[45] == 'A' &&
+ data[46] == 'F' &&
+ data[47] == '-' &&
+ data[48] == 'T' &&
+ data[49] == 'E' ) {
+ vdev->tflags |=
MPT_TARGET_FLAGS_SAF_TE_ISSUED;
+ mptscsih_writeIOCPage4(hd,
target_id, bus_id);
+ }
+ } else {
+ /* Treat all Processors as SAF-TE if
+ * command line option is set */
+ if ( hd->ioc->spi_data.Saf_Te ) {
+ vdev->tflags |=
MPT_TARGET_FLAGS_SAF_TE_ISSUED;
+ mptscsih_writeIOCPage4(hd,
target_id, bus_id);
+ }
+ }
+ } else
vdev->tflags |= MPT_TARGET_FLAGS_VALID_INQUIRY;
+ if ((dlen > 56) && (!(vdev->tflags &
MPT_TARGET_FLAGS_VALID_56))) {
/* Update the target capabilities
*/
if (dlen > 56) {
@@ -5038,17 +5059,19 @@
pSpi->dvStatus[target_id] |=
MPT_SCSICFG_NEED_DV;
}
}
-
- /* Is LUN supported? If so, upper 3 bits will be 0
- * in first byte of inquiry data.
- */
- if ((*data & 0xe0) == 0)
- vdev->luns |= (1 << lun);
}
+ /* Is LUN supported? If so, upper 3 bits will be 0
+ * in first byte of inquiry data.
+ */
+ if ((*data & 0xe0) == 0) {
+ lun_index = (lun >> 5); /* 32 luns per lun_index */
+ indexed_lun = (lun % 32);
+ vdev->luns[lun_index] |= (1 << indexed_lun);
+ }
dprintk((KERN_INFO " target = %p\n", vdev));
- return vdev;
+ return;
}
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=*/
@@ -5063,13 +5086,13 @@
int id = (int) target->target_id;
int nvram;
char canQ = 0;
+ VirtDevice *vdev;
+ int ii;
u8 width = MPT_NARROW;
u8 factor = MPT_ASYNC;
u8 offset = 0;
u8 version, nfactor;
- u8 noQas = 0;
-
- ddvtprintk((KERN_INFO "set Target: (id %d) byte56 0x%x\n", id,
byte56));
+ u8 noQas = 1;
if (!hd->is_spi) {
if (target->tflags & MPT_TARGET_FLAGS_VALID_INQUIRY) {
@@ -5079,19 +5102,16 @@
return;
}
+ target->negoFlags = pspi_data->noQas;
+
/* noQas == 0 => device supports QAS. Need byte 56 of Inq to
determine
* support. If available, default QAS to off and allow enabling.
* If not available, default QAS to on, turn off for non-disks.
*/
- if (target->tflags & MPT_TARGET_FLAGS_VALID_56)
- noQas = 1;
/* Set flags based on Inquiry data
*/
if (target->tflags & MPT_TARGET_FLAGS_VALID_INQUIRY) {
- if ((target->inq_data[0] & 0x1F) != 0x00)
- noQas = 1;
-
version = target->inq_data[2] & 0x07;
if (version < 2) {
width = 0;
@@ -5111,6 +5131,7 @@
factor = MPT_ULTRA160;
else
factor = MPT_ULTRA320;
+ offset = pspi_data->maxSyncOffset;
/* If RAID, never disable QAS
* else if non RAID, do not disable
@@ -5120,8 +5141,6 @@
*/
if ((target->raidVolume == 1) || ((byte56 &
0x02) != 0))
noQas = 0;
-
- offset = pspi_data->maxSyncOffset;
} else {
factor = MPT_ASYNC;
offset = 0;
@@ -5180,35 +5199,31 @@
/* Disable unused features.
*/
- target->negoFlags = pspi_data->noQas;
if (!width)
target->negoFlags |= MPT_TARGET_NO_NEGO_WIDE;
if (!offset)
target->negoFlags |= MPT_TARGET_NO_NEGO_SYNC;
- if (noQas)
- target->negoFlags |= MPT_TARGET_NO_NEGO_QAS;
-
/* GEM, processor WORKAROUND
*/
- if (((target->inq_data[0] & 0x1F) == 0x03) ||
((target->inq_data[0] & 0x1F) > 0x08)){
+ if (((target->inq_data[0] & 0x1F) == 0x03) ||
((target->inq_data[0] & 0x1F) > 0x08)) {
target->negoFlags |= (MPT_TARGET_NO_NEGO_WIDE |
MPT_TARGET_NO_NEGO_SYNC);
pspi_data->dvStatus[id] |= MPT_SCSICFG_BLK_NEGO;
- }
-
- /* Disable QAS if mixed configuration case
- */
- if ((noQas) && (!pspi_data->noQas) && ((target->inq_data[0]
& 0x1F) != 0x03)){
- VirtDevice *vdev;
- int ii;
-
- ddvtprintk((KERN_INFO "Disabling QAS!\n"));
- pspi_data->noQas = MPT_TARGET_NO_NEGO_QAS;
- for (ii = 0; ii < id; ii++) {
- vdev = hd->Targets[id];
- if (vdev != NULL)
- vdev->negoFlags |=
MPT_TARGET_NO_NEGO_QAS;
+ } else {
+ if (noQas && (pspi_data->noQas == 0)) {
+ pspi_data->noQas |= MPT_TARGET_NO_NEGO_QAS;
+ target->negoFlags |= MPT_TARGET_NO_NEGO_QAS;
+
+ /* Disable QAS in a mixed configuration case
+ */
+
+// ddvtprintk((KERN_INFO "Disabling QAS!\n"));
+ for (ii = 0; ii < id; ii++) {
+ if ( (vdev = hd->Targets[ii]) ) {
+ vdev->negoFlags |=
MPT_TARGET_NO_NEGO_QAS;
+ }
+ }
}
}
}
@@ -5334,9 +5349,9 @@
mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int target_id, int
flags)
{
MPT_ADAPTER *ioc = hd->ioc;
- Config_t *pReq = NULL;
- SCSIDevicePage1_t *pData = NULL;
- VirtDevice *pTarget = NULL;
+ Config_t *pReq;
+ SCSIDevicePage1_t *pData;
+ VirtDevice *pTarget;
MPT_FRAME_HDR *mf;
dma_addr_t dataDma;
u16 req_idx;
@@ -5432,7 +5447,6 @@
factor = pTarget->minSyncFactor;
offset = pTarget->maxOffset;
negoFlags = pTarget->negoFlags;
- pTarget = NULL;
}
if (flags & MPT_SCSICFG_BLK_NEGO)
@@ -5515,6 +5529,86 @@
}
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=*/
+/* mptscsih_writeIOCPage4 - write IOC Page 4
+ * @hd: Pointer to a SCSI Host Structure
+ * @target_id: write IOC Page4 for this ID & Bus
+ *
+ * Return: -EAGAIN if unable to obtain a Message Frame
+ * or 0 if success.
+ *
+ * Remark: We do not wait for a return, write pages sequentially.
+ */
+static int
+mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus)
+{
+ MPT_ADAPTER *ioc = hd->ioc;
+ Config_t *pReq;
+ IOCPage4_t *IOCPage4Ptr;
+ MPT_FRAME_HDR *mf;
+ dma_addr_t dataDma;
+ u16 req_idx;
+ u32 frameOffset;
+ u32 flagsLength;
+ int ii;
+
+ /* Get a MF for this command.
+ */
+ if ((mf = mpt_get_msg_frame(ScsiDoneCtx, ioc->id)) == NULL) {
+ dprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg
frames!\n",
+ ioc->name));
+ return -EAGAIN;
+ }
+
+ ddvprintk((MYIOC_s_INFO_FMT "writeIOCPage4 (mf=%p, id=%d)\n",
+ ioc->name, mf, target_id));
+
+ /* Set the request and the data pointers.
+ * Place data at end of MF.
+ */
+ pReq = (Config_t *)mf;
+
+ req_idx = le16_to_cpu(mf->u.frame.hwhdr.msgctxu.fld.req_idx);
+ frameOffset = ioc->req_sz - sizeof(IOCPage4_t);
+
+ /* Complete the request frame (same for all requests).
+ */
+ pReq->Action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
+ pReq->Reserved = 0;
+ pReq->ChainOffset = 0;
+ pReq->Function = MPI_FUNCTION_CONFIG;
+ pReq->Reserved1[0] = 0;
+ pReq->Reserved1[1] = 0;
+ pReq->Reserved1[2] = 0;
+ pReq->MsgFlags = 0;
+ for (ii=0; ii < 8; ii++) {
+ pReq->Reserved2[ii] = 0;
+ }
+
+ IOCPage4Ptr = ioc->spi_data.pIocPg4;
+ dataDma = ioc->spi_data.IocPg4_dma;
+ ii = IOCPage4Ptr->ActiveSEP++;
+ IOCPage4Ptr->SEP[ii].SEPTargetID = target_id;
+ IOCPage4Ptr->SEP[ii].SEPBus = bus;
+ pReq->Header = IOCPage4Ptr->Header;
+ pReq->PageAddress = cpu_to_le32(target_id | (bus << 8 ));
+
+ /* Add a SGE to the config request.
+ */
+ flagsLength = MPT_SGE_FLAGS_SSIMPLE_WRITE |
+ (IOCPage4Ptr->Header.PageLength + ii) * 4;
+
+ mpt_add_sge((char *)&pReq->PageBufferSGE, flagsLength, dataDma);
+
+ dsprintk((MYIOC_s_INFO_FMT
+ "writeIOCPage4: pgaddr 0x%x\n",
+ ioc->name, (target_id | (bus<<8))));
+
+ mptscsih_put_msgframe(ScsiDoneCtx, ioc->id, mf);
+
+ return 0;
+}
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-=*/
/* mptscsih_taskmgmt_timeout - Call back for timeout on a
* task management request.
* @data: Pointer to MPT_SCSI_HOST recast as an unsigned long
@@ -6138,7 +6232,7 @@
mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, int portnum)
{
MPT_ADAPTER *ioc= hd->ioc;
- VirtDevice *pTarget = NULL;
+ VirtDevice *pTarget;
SCSIDevicePage1_t *pcfg1Data = NULL;
INTERNAL_CMD iocmd;
CONFIGPARMS cfg;
@@ -6146,7 +6240,8 @@
ConfigPageHeader_t header1;
int bus = 0;
int id = 0;
- int lun = 0;
+ int lun;
+ int indexed_lun, lun_index;
int hostId = ioc->pfacts[portnum].PortSCSIID;
int max_id;
int requested, configuration, data;
@@ -6237,12 +6332,13 @@
/* If target Ptr NULL or if this target is NOT a disk, skip.
*/
- // if (pTarget && ((pTarget->inq_data[0] & 0x1F) == 0)) {
if ((pTarget) && (pTarget->tflags &
MPT_TARGET_FLAGS_Q_YES)){
for (lun=0; lun <= MPT_LAST_LUN; lun++) {
/* If LUN present, issue the command
*/
- if (pTarget->luns & (1<<lun)) {
+ lun_index = (lun >> 5); /* 32 luns per
lun_index */
+ indexed_lun = (lun % 32);
+ if (pTarget->luns[lun_index] &
(1<<indexed_lun)) {
iocmd.lun = lun;
(void) mptscsih_do_cmd(hd, &iocmd);
}
@@ -6283,8 +6379,8 @@
static void
mptscsih_domainValidation(void *arg)
{
- MPT_SCSI_HOST *hd = NULL;
- MPT_ADAPTER *ioc = NULL;
+ MPT_SCSI_HOST *hd;
+ MPT_ADAPTER *ioc;
unsigned long flags;
int id, maxid, dvStatus, did;
int ii, isPhysDisk;
@@ -6441,7 +6537,7 @@
*/
static void mptscsih_qas_check(MPT_SCSI_HOST *hd, int id)
{
- VirtDevice *pTarget = NULL;
+ VirtDevice *pTarget;
int ii;
if (hd->Targets == NULL)
@@ -6495,12 +6591,12 @@
mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
{
MPT_ADAPTER *ioc = hd->ioc;
- VirtDevice *pTarget = NULL;
- SCSIDevicePage1_t *pcfg1Data = NULL;
- SCSIDevicePage0_t *pcfg0Data = NULL;
- u8 *pbuf1 = NULL;
- u8 *pbuf2 = NULL;
- u8 *pDvBuf = NULL;
+ VirtDevice *pTarget;
+ SCSIDevicePage1_t *pcfg1Data;
+ SCSIDevicePage0_t *pcfg0Data;
+ u8 *pbuf1;
+ u8 *pbuf2;
+ u8 *pDvBuf;
dma_addr_t dvbuf_dma = -1;
dma_addr_t buf1_dma = -1;
dma_addr_t buf2_dma = -1;
@@ -6653,7 +6749,8 @@
if (nfactor < pspi_data->minSyncFactor )
nfactor = pspi_data->minSyncFactor;
- if (!(pspi_data->nvram[id] &
MPT_NVRAM_ID_SCAN_ENABLE)) {
+ if (!(pspi_data->nvram[id] &
MPT_NVRAM_ID_SCAN_ENABLE) ||
+ (pspi_data->PortFlags ==
MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV) ) {
ddvprintk((MYIOC_s_NOTE_FMT "DV Skipped:
bus, id, lun (%d, %d, %d)\n",
ioc->name, bus, id, lun));
@@ -6921,6 +7018,9 @@
if (inq0 != 0)
goto target_done;
+ if ( ioc->spi_data.PortFlags ==
MPI_SCSIPORTPAGE2_PORT_FLAGS_BASIC_DV_ONLY )
+ goto target_done;
+
/* Start the Enhanced Test.
* 0) issue TUR to clear out check conditions
* 1) read capacity of echo (regular) buffer
@@ -7377,9 +7477,9 @@
static void
mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
{
- VirtDevice *pTarget = NULL;
- SCSIDevicePage0_t *pPage0 = NULL;
- SCSIDevicePage1_t *pPage1 = NULL;
+ VirtDevice *pTarget;
+ SCSIDevicePage0_t *pPage0;
+ SCSIDevicePage1_t *pPage1;
int val = 0, data, configuration;
u8 width = 0;
u8 offset = 0;
@@ -7762,9 +7862,9 @@
/* Commandline Parsing routines and defines.
*
* insmod format:
- * insmod mptscsih mptscsih="width:1 dv:n factor:0x09"
+ * insmod mptscsih mptscsih="width:1 dv:n factor:0x09 saf-te:1"
* boot format:
- * mptscsih=width:1,dv:n,factor:0x8
+ * mptscsih=width:1,dv:n,factor:0x8,saf-te:1
*
*/
#ifdef MODULE
@@ -7777,11 +7877,13 @@
"dv:"
"width:"
"factor:"
- ; /* DONNOT REMOVE THIS ';' */
+ "saf-te:"
+ ; /* DO NOT REMOVE THIS ';' */
#define OPT_DV 1
#define OPT_MAX_WIDTH 2
#define OPT_MIN_SYNC_FACTOR 3
+#define OPT_SAF_TE 4
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
static int
@@ -7838,6 +7940,10 @@
driver_setup.min_sync_fac = val;
break;
+ case OPT_SAF_TE:
+ driver_setup.saf_te = val;
+ break;
+
default:
printk("mptscsih_setup: unexpected boot option
'%.*s' ignored\n", (int)(pc-cur+1), cur);
break;
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/mptscsih.h
linux-2.4.25-pre7/drivers/message/fusion/mptscsih.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/mptscsih.h
2004-01-27 11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/mptscsih.h 2004-01-27
10:42:50.000000000 -0700
@@ -18,7 +18,7 @@
* Copyright (c) 1999-2002 LSI Logic Corporation
* Originally By: Steven J. Ralston
* (mailto:sjralston1@netscape.net)
- * (mailto:lstephens@lsil.com)
+ * (mailto:mpt_linux_developer@lsil.com)
*
* $Id: mptscsih.h,v 1.1.2.2 2003/05/07 14:08:35 pdelaney Exp $
*/
@@ -116,12 +116,14 @@
#define MPTSCSIH_DOMAIN_VALIDATION 1
#define MPTSCSIH_MAX_WIDTH 1
#define MPTSCSIH_MIN_SYNC 0x08
+#define MPTSCSIH_SAF_TE 0
struct mptscsih_driver_setup
{
u8 dv;
u8 max_width;
u8 min_sync_fac;
+ u8 saf_te;
};
@@ -130,6 +132,7 @@
MPTSCSIH_DOMAIN_VALIDATION, \
MPTSCSIH_MAX_WIDTH, \
MPTSCSIH_MIN_SYNC, \
+ MPTSCSIH_SAF_TE, \
}
diff -uarN linux-2.4.25-pre7-reference/drivers/message/fusion/scsi3.h
linux-2.4.25-pre7/drivers/message/fusion/scsi3.h
--- linux-2.4.25-pre7-reference/drivers/message/fusion/scsi3.h 2004-01-27
11:55:55.000000000 -0700
+++ linux-2.4.25-pre7/drivers/message/fusion/scsi3.h 2004-01-27
10:42:50.000000000 -0700
@@ -7,7 +7,7 @@
* Copyright (c) 1996-2002 Steven J. Ralston
* Written By: Steven J. Ralston (19960517)
* (mailto:sjralston1@netscape.net)
- * (mailto:lstephens@lsil.com)
+ * (mailto:mpt_linux_developer@lsil.com)
*
* $Id: scsi3.h,v 1.9 2002/02/27 18:45:02 sralston Exp $
*/
^ permalink raw reply
* Re: [LARTC] HTB/SFQ dequeueing in pairs
From: Andy Furniss @ 2004-01-27 23:06 UTC (permalink / raw)
To: lartc
In-Reply-To: <4015A8B9.1010100@dsl.pipex.com>
I got this reply from don & would rather answer on list so more people
have a chance to correct any of my misconceptions :-)
[this message off list - feel free to forward it, but leave out my address]
I wanted to see where from a slot the packets got dropped when the queue
was full. (e)sfq drops from the longest slot to make space for an
incoming packet, so it's not tail drop as such, but the results show me
it does drop from the tail of the slot - which if you are trying to
shape inbound, is a PITA as tcp "slow" start grows exponentially and
What's PITA ?
Pain in the arse.
overflows into my ISP/telecos buffer, causing a latency bump. I think it
would be alot nicer if It head dropped to make the sender go into
congestion control quicker.
The fact that the queue grows means that the packets are delayed, and
that's supposed to influence the speed of tcp.
Yes but as I understsnd it during slow start the senders cwin doubles
per rtt and doesn't stop until it's sent enough to fill my advertised
window (which linux grows to 32k quite quickly) or a packet is lost and
three dup acks are recieved, at which time it goes into congestion
controll and shrinks it's cwin.
Head drop seems absurd, since most of the packets behind the dropped
packet will be wasted - the tcp on the other side will only keep a few
packets past the one that's missing.
I think the opposite is the case, the fact the packet is tail dropped
means I don't start sending dups for the time it takes to get to the
head of the queue. The sender meanwhile is transmitting alot of packets,
most of which I drop after they have already used up some of my bandwidth.
I noticed that the packets were being released in pairs, which probably
doesn't help either.
I don't see that it should hurt.
The sender during slow start is increasing exponentally per ack
recieved, it would be nicer to space them out.
How big are the packets? Are there other packets in other buckets or
in other queues? Also how are the packets being generated?
I'd expect for something like ftp where you generate a steady stream
of large packets, they would be released one at a time, since your
quantum is approx the size of one large packet.
On the other hand if you generate two small packets at a time then
maybe the queue is not the bottleneck.
It could also be something in the device driver.
You can probably solve this problem by adding printk's to tell you
when various things happen.
This was a test - the packets are big and there is no other traffic. I
am in the early days of experimenting. In real use I would be using
something based on alexander clouters jdg-script with his RED settings -
but even if I throttle to 65% down, with my "low" bandwidth, running
a bittorrent - or just browsing heavy jpg sites will baulk my latency
too much to play half life. Though most users may be quite happy with
the results. Whatever queue I use for downstream is having to live
behind a fifo whose bandwidth isn't that much more than what I would
like to shape to, so may not behave as the text book says. If I had 2M
down, I would not have a problem - what is a 300ms bump would only be
50ms and I could live with that.
Andy.
_______________________________________________
LARTC mailing list / LARTC@mailman.ds9a.nl
http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/
^ permalink raw reply
* anthropomorphism olav arise
From: Nestor Holder @ 2004-01-27 23:16 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
europium minsky melodramatic oracle remedial
conscionable honey clever bipolar arthritis mesh arcsin lengthen
desperado shelton auberge floridian drank same compel colorado compliment archibald
[-- Attachment #2: Type: text/html, Size: 3844 bytes --]
^ permalink raw reply
* Re: [patch] Re: Kernels > 2.6.1-mm3 do not boot. - SOLVED
From: Andrew Morton @ 2004-01-27 23:16 UTC (permalink / raw)
To: Andi Kleen; +Cc: ak, eric, stoffel, Valdis.Kletnieks, bunk, cova, linux-kernel
In-Reply-To: <20040127223009.GA81095@colin2.muc.de>
Andi Kleen <ak@muc.de> wrote:
>
> > I've moved the enabling of -funit-at-a-time out of Makefile and down into
> > arch/i386/Makefile, and I changed to require gcc-3.4 or higher.
> >
> > So if you want to use -funit-at-a-time on gcc-3.3/hammer you can do so.
>
> Please undo that and apply this patch instead. It fixes the bug that
> broke booting with older gcc 3.3-hammer compilers (confirmed by
> two people on l-k). It was plain luck that it worked with the other
> compilers.
I'll turn it on for gcc-3.3 and higher. We can change that if someone has
tested earlier compilers.
Also, I do think this should remain a per-arch decision. Other
architectures could well have similar problems to this and we don't want to
be mysteriously breaking their kernels for them.
^ permalink raw reply
* [LARTC] R2Q
From: Mihai Vlad @ 2004-01-27 23:18 UTC (permalink / raw)
To: lartc
In-Reply-To: <marc-lartc-102179583208377@msgid-missing>
Here is a quote from docum.org:
-------------------------------------------------------------------------
Counting packets with quantum can be strange. If we have a low rate class
(rate = 5kbit), default quantum = 5000 / 10 = 500 bytes. But most packets
are more then 500 bytes. Htb version 1 and 2 uses DRR, so a packet larger
then 1000 bytes will be sent and it will remember how much it sent and wait
until the packet is paid back before another packet is send. So if you send
1000 byte, next time the class is polled, you will not be allowed to send.
Htb3 uses the WRR scheduler. When a packet with size > quantum is sent, it
will be sent and an error that the quantum is too small will be logged. But
there is no pay back. The WRR scheduler is faster then the DRR scheduler. So
make sure quantum is bigger then the default packet size. For 15 kbyte/s and
default r2q, quantum is 1500 and this is exactly the maximum packet size. If
you want to tune htb for rates smaller then 15 kbyte/s, you can manually set
the r2q and/or quantum.
----------------------------------------------------------------------------
Assuming the 5kbit example (kbit not kbytes) and that the R2Q is 10, we can
compute the quantum like this:
5 kbit = 5000 bit
5000 bit / 10 = 500 byte
Is it bytes or bits?
I guess the first term (the rate) is measured in bits and the quantum in
bytes.
Taking into account the second example (15 kbyte), we compute the quantum
like this:
15 kbyte = 15000 byte
15000 byte / 10 = 1500 byte
Is it bytes or bits?
So, in order to have a fully functional HTB 3 script I need to have each of
my class rates bigger than 15 kbyte? This is about 120 kbit.
What happens if I need lower rates like 8 kbit?
Do I need to set up the quantum manually?
Please don't laugh if I am talking nonsense, but I cannot figure it out...
Thanks,
Mihai
_______________________________________________
LARTC mailing list / LARTC@mailman.ds9a.nl
http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/
^ permalink raw reply
* Re: [PATCH] 2.4.25-pre7 SCSI fusion driver - version - 2.05.11.01
From: Christoph Hellwig @ 2004-01-27 23:19 UTC (permalink / raw)
To: Moore, Eric Dean; +Cc: linux-scsi, marcelo.tosatti
In-Reply-To: <0E3FA95632D6D047BA649F95DAB60E5703D19EE4@exa-atlanta.se.lsil.com>
On Tue, Jan 27, 2004 at 06:04:34PM -0500, Moore, Eric Dean wrote:
> +
> +#if (defined(__sparc__) && defined(__sparc_v9__)) || defined(__x86_64__) ||
> defined(__ia64__) || defined(__alpha__)
> +#define MPT_CONFIG_COMPAT
> +#endif
alpha doesn't have any 32bit userland..
^ permalink raw reply
* [BK PATCH] USB update for 2.6.2-rc2
From: Greg KH @ 2004-01-27 23:21 UTC (permalink / raw)
To: torvalds, akpm; +Cc: linux-usb-devel, linux-kernel
Hi,
Here are some USB patches for 2.6.2-rc2. Here are the main types of
changes:
- a number of small bugfixes
- a usb gadget update including the ability to enable the
drivers to build properly, and a new gadget filesystem driver.
- a new ohci host controller driver for the omap platform.
Please pull from: bk://kernel.bkbits.net/gregkh/linux/usb-2.6
Patches will be posted to linux-usb-devel as a follow-up thread for
those who want to see them.
thanks,
greg k-h
drivers/usb/Kconfig | 2
drivers/usb/core/hub.c | 5
drivers/usb/core/message.c | 37
drivers/usb/core/usb.c | 24
drivers/usb/core/usb.h | 3
drivers/usb/gadget/Kconfig | 207 +
drivers/usb/gadget/Makefile | 5
drivers/usb/gadget/ether.c | 98
drivers/usb/gadget/file_storage.c | 4169 +++++++++++++++++++++++++++++++++++++
drivers/usb/gadget/net2280.c | 489 ++--
drivers/usb/gadget/net2280.h | 6
drivers/usb/gadget/serial.c | 27
drivers/usb/gadget/zero.c | 10
drivers/usb/host/ohci-hcd.c | 6
drivers/usb/host/ohci-omap.c | 673 +++++
drivers/usb/host/ohci-omap.h | 57
drivers/usb/media/dabusb.c | 12
drivers/usb/misc/Kconfig | 2
drivers/usb/misc/auerswald.c | 4
drivers/usb/misc/tiglusb.c | 24
drivers/usb/serial/kobil_sct.c | 2
drivers/usb/serial/whiteheat.c | 27
drivers/usb/storage/scsiglue.c | 39
drivers/usb/storage/unusual_devs.h | 12
include/linux/usb.h | 1
sound/usb/usbaudio.c | 6
26 files changed, 5574 insertions(+), 373 deletions(-)
-----
Alan Stern:
o USB: Update sound/usb/usbaudio.c
o USB: Fix DMA coherence when reading device descriptor
o USB: Don't dereference NULL actconfig
o USB Storage: unusual_devs update
Arjan van de Ven:
o usb: remove some sleep_on's
Dave Jones:
o USB: fix suspicious pointer usage in kobil_sct driver
David Brownell:
o USB gadget: serial driver config update
o USB gadget: ethernet config updates
o USB gadget: zero config updates
o USB gadget: config/build updates
o USB gadget: add File-backed Storage Gadget (FSG)
o USB gadget: net2280 controller updates
Greg Kroah-Hartman:
o USB: add ohci support for OMAP controller
o USB: fix up whiteheat syntax errors from previous patch
o USB: fix up emi drivers Kconfig dependancy
o USB storage: remove info sysfs file as it violates the sysfs 1 value per file rule
Herbert Xu:
o USB Storage: revert freecom dvd-rw fx-50 usb-ide patch
Oliver Neukum:
o USB: fix dma to stack in ti driver
o USB: fix whiteheat doing DMA to stack
^ permalink raw reply
* Re: NGROUPS 2.6.2rc2
From: Dax Kelson @ 2004-01-27 23:25 UTC (permalink / raw)
To: thockin; +Cc: torvalds, Linux Kernel mailing list, rusty
In-Reply-To: <20040127225311.GA9155@sun.com>
On Tue, 2004-01-27 at 15:53, Tim Hockin wrote:
> What think? Can we get rid of this limit at long last? :)
Aren't the Samba folks asking for this as well? People using Samba v3
to replace NT4 domains where commonly users belong to many more than 32
groups.
Dax
^ permalink raw reply
* [LARTC] tncg and bandwidth limiting
From: Scott Baker @ 2004-01-27 23:24 UTC (permalink / raw)
To: lartc
I'm trying to do some very simple rate-shaping on an interface. I want to
limit my 100baseT interface to 7 megs both ingress and egress of the
interface. I've been hacking my way through the documentation and some
examples and I've come up with the following configuration for tcng that
seems to do what I want.
I'm curious if some of the other experts out there wouldn't have a "better"
way to do what I'm doing. I'd like to do HTB ingress as well, but it
complains that the the ingress qdisc doesn't allow inside classes or
something like that. I think this will work for me, I just want to make
sure this is the best way to do things.
----------------------------
dev INTERFACE {
egress {
class ( <$all> ) if 1;
htb () {
class ( rate 100Mbps, ceil 100Mbps ) ;
$all = class ( rate 7Mbps, ceil 7Mbps ) ;
}
$o = bucket(rate 7Mbps, burst 200kB, mpu 200B);
class (2) if (conform $o && count $o) || drop;
}
}
/* tcng syntax English equivalent tc syntax
----------- -------------------- ---------
bps bits per second bit
Bps bytes per second bps (!)
kbps kilobits per second kbit
kBps kilobytes per second kbps
Mbps megabits per second ???
*/
Scott Baker - Network Engineer - RHCE
bakers @ web-ster . com - 503.266.8253
_______________________________________________
LARTC mailing list / LARTC@mailman.ds9a.nl
http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/
^ permalink raw reply
* Re: Nvidia drivers and 2.6.x kernel
From: Charles Shannon Hendrix @ 2004-01-27 22:49 UTC (permalink / raw)
To: Linux Kernel
In-Reply-To: <200401261024.28998.chakkerz@optusnet.com.au>
Mon, 26 Jan 2004 @ 10:24 +1100, Christian Unger said:
> So ... i'm out of ideas ... i don't get why it ain't doing for me what it is
> doing for everyone else. I am wondering IF something screwed up when i
> upgraded Slackware 9.1 from 9.0 ... and in the interest of testing that
> theory might do a rm -f / later and start from scratch. I haven't decided if
> 2.6 is worth that much yet though.
nVidia has released drivers supporting kernel 2.6 on their website.
They run nicely for me.
Hmmm... why do people say "they" when talking about a "driver"?
--
shannon "AT" widomaker.com -- ["An Irishman is never drunk as long as he
can hold onto one blade of grass and not fall off the face of the earth."]
^ permalink raw reply
* Re: [uml-devel] Kernel idles in loop after loading IPv4
From: Steven James @ 2004-01-27 23:28 UTC (permalink / raw)
To: Phil Nadeau; +Cc: user-mode-linux-devel
In-Reply-To: <1075236841.15950.10.camel@rocket.innercite.com>
Greetings,
I ran into that as well, but didn't have time to do much about it. As a
further datapoint, if I disable all net support and pass it
init=/bin/bash, I get the bash prompt (ubd filesystems do get
checked/mounted) but then it goes into the idle loop and stays there.
G'day,
sjames
-------------------------steven james, director of research, linux labs
... ........ ..... .... 230 peachtree st nw ste 2701
the original linux labs atlanta.ga.us 30303
-since 1995 http://www.linuxlabs.com
office 404.577.7747 fax 404.577.7743
-----------------------------------------------------------------------
On Tue, 27 Jan 2004, Phil Nadeau wrote:
> Hello UML developers,
>
> I'm trying to use UML to set up a simulator for a high-availability
> cluster. I encounter the following unexpected behavior -
>
> On any kernel that I compile with IPv4 support, the kernel will stop
> intializing drivers after loading IPv4 support. The last message I see
> from the kernel is:
> NET: Registered protocol family 2
>
> Compiling with debug allows me to single-step through the kernel. I've
> traced execution from inet_init(), to synchronize_net(), to
> synchronize_kernel(), to a call to wait_for_completion(), to
> switch_to_tt(), after which the kernel spends all its time in the idle
> loop. This happens whether I'm using SKAS or TT mode.
>
> Host kernel is 2.6.1 with Stephen William's 2.6.1 SKAS patch (thanks
> Stephen). Guest kernel is 2.6.1 with the latest patch from Sourceforge
> (January 15th), without modules, and with nearly everything disabled at
> compile except core functionality and IPv4.
>
> I've tried to find similar cases in the FAQ's and the list archives, but
> I'm not seeing anything. It seems like the kernel is waiting for an
> event related to IPv4 initialization that it never gets, but I'm not
> familiar enough with the kernel proper to know what that might be. Does
> anyone have any ideas?
>
> Thanks in advance.
>
> --
> Phil Nadeau
> Software Services Manager
> phil.nadeau@innercite.com
> (916)932-3200, (800)921-5513
>
>
>
> -------------------------------------------------------
> The SF.Net email is sponsored by EclipseCon 2004
> Premiere Conference on Open Tools Development and Integration
> See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
> http://www.eclipsecon.org/osdn
> _______________________________________________
> User-mode-linux-devel mailing list
> User-mode-linux-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
>
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply
* double fault in scheduler()
From: Doug Reiland @ 2004-01-27 23:30 UTC (permalink / raw)
To: linux-kernel
There seems to be a window in scheduler() where we have switch to the new
process's mm, but are running on the old process's stack. This stack might
not be mapped in the new process.
_________________________________________________________________
Get a FREE online virus check for your PC here, from McAfee.
http://clinic.mcafee.com/clinic/ibuy/campaign.asp?cid=3963
^ permalink raw reply
* Re: [patch] Re: Kernels > 2.6.1-mm3 do not boot. - SOLVED
From: Andi Kleen @ 2004-01-27 23:29 UTC (permalink / raw)
To: Andrew Morton
Cc: Andi Kleen, eric, stoffel, Valdis.Kletnieks, bunk, cova,
linux-kernel
In-Reply-To: <20040127151644.1fb378c2.akpm@osdl.org>
> I'll turn it on for gcc-3.3 and higher. We can change that if someone has
> tested earlier compilers.
Earlier compilers never supported -funit-at-a-time. The option
was first implemented in gcc 3.3-hammer and later merged into 3.4.
> Also, I do think this should remain a per-arch decision. Other
> architectures could well have similar problems to this and we don't want to
> be mysteriously breaking their kernels for them.
That's fine by me. While you're at it could you enable it for x86-64 too?
-Andi
^ permalink raw reply
* [U-Boot-Users] Endianness for MIPS
From: Ed Okerson @ 2004-01-27 23:32 UTC (permalink / raw)
To: u-boot
In-Reply-To: <603BA0CFF3788E46A0DB0918D9AA95100A0E2E57@sj580004wcom.int.lantronix.com>
Jerry,
I have already made most of the necessary changes for this to work. So
far all but one are checked into CVS. The one that isn't is related to
reading Compact Flash cards. Wolfgang didn't like the way I did it, and I
have not made a new patch the way he wants yet, but it is on the to-do
list.
Ed Okerson
On Tue, 27 Jan 2004, Jerry Walden wrote:
> Hello -
>
> I am working on the DBAU1X00 version, and the readme says that it was
> created for big endian.
>
> My board (based on the Alchemy eval board) is set for little endian.
> Are the changes I will need to make be extensive?
>
> Beyond the obvious - what things (specifically in the source) should I
> watch out for?
>
> Thanks for any help.
>
>
> -------------------------------------------------------
> The SF.Net email is sponsored by EclipseCon 2004
> Premiere Conference on Open Tools Development and Integration
> See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
> http://www.eclipsecon.org/osdn
> _______________________________________________
> U-Boot-Users mailing list
> U-Boot-Users at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/u-boot-users
>
^ permalink raw reply
* [BK PATCH] i2c driver fixes for 2.6.2-rc2
From: Greg KH @ 2004-01-27 23:32 UTC (permalink / raw)
To: torvalds, akpm; +Cc: linux-kernel, sensors
Hi,
Here are some i2c driver fixes for 2.6.2-rc2. It's all a bit of small
bugfixes and documentation updates.
Please pull from: bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
Individual patches will follow, sent to the sensors and linux-kernel
lists.
thanks,
greg k-h
Documentation/i2c/porting-clients | 5 --
drivers/i2c/busses/i2c-parport.h | 7 ++-
drivers/i2c/busses/i2c-philips-par.c | 4 +-
drivers/i2c/busses/i2c-piix4.c | 48 +++++++++++++-----------
drivers/i2c/chips/lm75.c | 12 +++---
drivers/i2c/chips/lm78.c | 12 +++---
drivers/i2c/chips/lm85.c | 69 ++++++++++-------------------------
7 files changed, 67 insertions(+), 90 deletions(-)
-----
Greg Kroah-Hartman:
o I2C: remove printk() calls in lm85, and clean up debug logic
Jean Delvare:
o I2C: Bring lm75 and lm78 in compliance with sysfs naming conventions
o I2C: Add ADM1025EB support to i2c-parport
o I2C: Fix bus reset in i2c-philips-par
o I2C: undo documentation change
Mark M. Hoffman:
o I2C: i2c-piix4.c bugfix
^ permalink raw reply
* Re: (driver model) bus kset list manipulation bug
From: Hollis Blanchard @ 2004-01-27 23:31 UTC (permalink / raw)
To: Greg KH; +Cc: Linux Kernel, mochel, Andrew Morton
In-Reply-To: <401026CD.2030600@us.ibm.com>
On Jan 22, 2004, at 1:38 PM, Hollis Blanchard wrote:
>
> I've found a bug in drivers/base/bus.c, where the
> bus_type.devices.list is treated as a list of device structs.
> bus_type.devices is a kset though, so devices.list should contain
> kobjects rather than devices. Here is the diff I've come up with:
>
[big snip]
> @@ -405,7 +405,7 @@
> if (bus) {
> down_write(&dev->bus->subsys.rwsem);
> pr_debug("bus %s: add device
> %s\n",bus->name,dev->bus_id);
> - list_add_tail(&dev->bus_list,&dev->bus->devices.list);
> +
> list_add_tail(&dev->kobj.entry,&dev->bus->devices.list);
> device_attach(dev);
> up_write(&dev->bus->subsys.rwsem);
Here's the problem: dev->kobj is already in use; it's part of the
global devices_subsys kset.
devices_subsys looks like it's only used for two things: global hotplug
policy and suspend. Of the 3 hotplug functions it provides
(dev_hotplug_filter, dev_hotplug_name, and dev_hotplug), 2 of them
refer to bus data or code anyways.
I'm very surprised to see it's used by device_shutdown(). I thought one
of the points of the device tree was to do depth-first-suspend, so e.g
we don't try to suspend a PCI bridge and *then* try to suspend children
of that bridge. Instead we're walking a global list in the reverse
order they were registered. I guess this works because busses are
discovered from the root down, so going backwards will give you the
deepest first.
I see three options, and I like the last best:
- add another kobject to struct device. This will allow a device to be
registered with the global devices_subsys as well as a bus.devices kset
simultaneously.
- change the kset "bus_type.devices" to a normal "list_head*" (which is
how it's being used today, incorrectly). This will preclude some of the
nice kobject/kset functionality however (e.g. see last paragraph
below).
- remove devices_subsys. The hotplug policy is already entirely
bus-specific anyways. The suspend code can be made to use bus
structures as well instead of a global device list (can it?).
The point of all of this is I want to be able to call
device_find("mydevice", &my_bus_type)
device_find() uses kset_find_obj() on the bus_type.devices kset, and
that doesn't work because bus_type.devices isn't a real kset, and it's
not a real kset because you can't register device kobjects in it, and
you can't because those kobjects have already been registered with
devices_subsys. I could call
device_find("mydevice", &devices_subsys.kset)
instead, but I already know what bus my device is on; no need to search
them all...
--
Hollis Blanchard
IBM Linux Technology Center
^ permalink raw reply
* [PATCH] i2c driver fixes for 2.6.2-rc2
From: Greg KH @ 2004-01-27 23:34 UTC (permalink / raw)
To: linux-kernel, sensors
In-Reply-To: <20040127233242.GA28891@kroah.com>
ChangeSet 1.1474.148.1, 2004/01/23 17:14:22-08:00, mhoffman@lightlink.com
[PATCH] I2C: i2c-piix4.c bugfix
This patch fixes a "Trying to release non-existent resource" error that
occurs during rmmod when the device isn't actually present. It includes
some other cleanups too: error paths, whitespace, magic numbers, __devinit.
drivers/i2c/busses/i2c-piix4.c | 48 +++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
--- a/drivers/i2c/busses/i2c-piix4.c Tue Jan 27 15:27:30 2004
+++ b/drivers/i2c/busses/i2c-piix4.c Tue Jan 27 15:27:30 2004
@@ -68,6 +68,9 @@
#define SMBSLVEVT (0xA + piix4_smba)
#define SMBSLVDAT (0xC + piix4_smba)
+/* count for request_region */
+#define SMBIOSIZE 8
+
/* PCI Address Constants */
#define SMBBA 0x090
#define SMBHSTCFG 0x0D2
@@ -112,14 +115,13 @@
static int piix4_transaction(void);
-
static unsigned short piix4_smba = 0;
static struct i2c_adapter piix4_adapter;
/*
* Get DMI information.
*/
-static int ibm_dmi_probe(void)
+static int __devinit ibm_dmi_probe(void)
{
#ifdef CONFIG_X86
extern int is_unsafe_smbus;
@@ -129,9 +131,9 @@
#endif
}
-static int piix4_setup(struct pci_dev *PIIX4_dev, const struct pci_device_id *id)
+static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
+ const struct pci_device_id *id)
{
- int error_return = 0;
unsigned char temp;
/* match up the function */
@@ -144,8 +146,7 @@
dev_err(&PIIX4_dev->dev, "IBM Laptop detected; this module "
"may corrupt your serial eeprom! Refusing to load "
"module!\n");
- error_return = -EPERM;
- goto END;
+ return -EPERM;
}
/* Determine the address of the SMBus areas */
@@ -163,11 +164,10 @@
}
}
- if (!request_region(piix4_smba, 8, "piix4-smbus")) {
+ if (!request_region(piix4_smba, SMBIOSIZE, "piix4-smbus")) {
dev_err(&PIIX4_dev->dev, "SMB region 0x%x already in use!\n",
piix4_smba);
- error_return = -ENODEV;
- goto END;
+ return -ENODEV;
}
pci_read_config_byte(PIIX4_dev, SMBHSTCFG, &temp);
@@ -214,8 +214,9 @@
} else {
dev_err(&PIIX4_dev->dev,
"Host SMBus controller not enabled!\n");
- error_return = -ENODEV;
- goto END;
+ release_region(piix4_smba, SMBIOSIZE);
+ piix4_smba = 0;
+ return -ENODEV;
}
}
@@ -231,8 +232,7 @@
dev_dbg(&PIIX4_dev->dev, "SMBREV = 0x%X\n", temp);
dev_dbg(&PIIX4_dev->dev, "SMBA = 0x%X\n", piix4_smba);
-END:
- return error_return;
+ return 0;
}
/* Another internally used function */
@@ -465,7 +465,8 @@
{ 0, }
};
-static int __devinit piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
+static int __devinit piix4_probe(struct pci_dev *dev,
+ const struct pci_device_id *id)
{
int retval;
@@ -479,17 +480,24 @@
snprintf(piix4_adapter.name, I2C_NAME_SIZE,
"SMBus PIIX4 adapter at %04x", piix4_smba);
- retval = i2c_add_adapter(&piix4_adapter);
+ if ((retval = i2c_add_adapter(&piix4_adapter))) {
+ dev_err(&dev->dev, "Couldn't register adapter!\n");
+ release_region(piix4_smba, SMBIOSIZE);
+ piix4_smba = 0;
+ }
return retval;
}
static void __devexit piix4_remove(struct pci_dev *dev)
{
- i2c_del_adapter(&piix4_adapter);
+ if (piix4_smba) {
+ i2c_del_adapter(&piix4_adapter);
+ release_region(piix4_smba, SMBIOSIZE);
+ piix4_smba = 0;
+ }
}
-
static struct pci_driver piix4_driver = {
.name = "piix4-smbus",
.id_table = piix4_ids,
@@ -502,15 +510,13 @@
return pci_module_init(&piix4_driver);
}
-
static void __exit i2c_piix4_exit(void)
{
pci_unregister_driver(&piix4_driver);
- release_region(piix4_smba, 8);
}
-MODULE_AUTHOR
- ("Frodo Looijaard <frodol@dds.nl> and Philip Edelbrock <phil@netroedge.com>");
+MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and "
+ "Philip Edelbrock <phil@netroedge.com>");
MODULE_DESCRIPTION("PIIX4 SMBus driver");
MODULE_LICENSE("GPL");
^ permalink raw reply
* [PATCH] simple fix
From: Giuliano Pochini @ 2004-01-27 23:36 UTC (permalink / raw)
To: LinuxPPC-dev
Small patch against linuxppc-2.5-benh rsync tree pulled half hour ago (GMT+1).
--- fs/hfs/extent.c_old Wed Jan 28 00:31:30 2004
+++ fs/hfs/extent.c Wed Jan 28 00:31:56 2004
@@ -470,8 +470,8 @@
if (inode->i_size > HFS_I(inode)->phys_size) {
struct address_space *mapping = inode->i_mapping;
struct page *page;
- size = inode->i_size - 1;
int res;
+ size = inode->i_size - 1;
page = grab_cache_page(mapping, size >> PAGE_CACHE_SHIFT);
if (!page)
--
Giuliano.
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply
* Re: [PATCH] i2c driver fixes for 2.6.2-rc2
From: Greg KH @ 2004-01-27 23:34 UTC (permalink / raw)
To: linux-kernel, sensors
In-Reply-To: <1075246453781@kroah.com>
ChangeSet 1.1474.148.6, 2004/01/27 14:46:05-08:00, greg@kroah.com
[PATCH] I2C: remove printk() calls in lm85, and clean up debug logic.
drivers/i2c/chips/lm85.c | 69 ++++++++++++++---------------------------------
1 files changed, 21 insertions(+), 48 deletions(-)
diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c
--- a/drivers/i2c/chips/lm85.c Tue Jan 27 15:26:35 2004
+++ b/drivers/i2c/chips/lm85.c Tue Jan 27 15:26:35 2004
@@ -48,9 +48,6 @@
/* Insmod parameters */
SENSORS_INSMOD_4(lm85b, lm85c, adm1027, adt7463);
-/* Enable debug if true */
-static int lm85debug = 0;
-
/* The LM85 registers */
#define LM85_REG_IN(nr) (0x20 + (nr))
@@ -802,19 +799,15 @@
company = lm85_read_value(new_client, LM85_REG_COMPANY);
verstep = lm85_read_value(new_client, LM85_REG_VERSTEP);
- if (lm85debug) {
- printk("lm85: Detecting device at %d,0x%02x with"
+ dev_dbg(&adapter->dev, "Detecting device at %d,0x%02x with"
" COMPANY: 0x%02x and VERSTEP: 0x%02x\n",
i2c_adapter_id(new_client->adapter), new_client->addr,
company, verstep);
- }
/* If auto-detecting, Determine the chip type. */
if (kind <= 0) {
- if (lm85debug) {
- printk("lm85: Autodetecting device at %d,0x%02x ...\n",
+ dev_dbg(&adapter->dev, "Autodetecting device at %d,0x%02x ...\n",
i2c_adapter_id(adapter), address );
- }
if( company == LM85_COMPANY_NATIONAL
&& verstep == LM85_VERSTEP_LM85C ) {
kind = lm85c ;
@@ -823,8 +816,8 @@
kind = lm85b ;
} else if( company == LM85_COMPANY_NATIONAL
&& (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) {
- printk("lm85: Unrecgonized version/stepping 0x%02x"
- " Defaulting to LM85.\n", verstep );
+ dev_err(&adapter->dev, "Unrecgonized version/stepping 0x%02x"
+ " Defaulting to LM85.\n", verstep);
kind = any_chip ;
} else if( company == LM85_COMPANY_ANALOG_DEV
&& verstep == LM85_VERSTEP_ADM1027 ) {
@@ -834,21 +827,19 @@
kind = adt7463 ;
} else if( company == LM85_COMPANY_ANALOG_DEV
&& (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) {
- printk("lm85: Unrecgonized version/stepping 0x%02x"
- " Defaulting to ADM1027.\n", verstep );
+ dev_err(&adapter->dev, "Unrecgonized version/stepping 0x%02x"
+ " Defaulting to ADM1027.\n", verstep);
kind = adm1027 ;
} else if( kind == 0 && (verstep & 0xf0) == 0x60) {
- printk("lm85: Generic LM85 Version 6 detected\n");
+ dev_err(&adapter->dev, "Generic LM85 Version 6 detected\n");
/* Leave kind as "any_chip" */
} else {
- if (lm85debug) {
- printk("lm85: Autodetection failed\n");
- }
+ dev_dbg(&adapter->dev, "Autodetection failed\n");
/* Not an LM85 ... */
if( kind == 0 ) { /* User used force=x,y */
- printk("lm85: Generic LM85 Version 6 not"
- " found at %d,0x%02x. Try force_lm85c.\n",
- i2c_adapter_id(adapter), address );
+ dev_err(&adapter->dev, "Generic LM85 Version 6 not"
+ " found at %d,0x%02x. Try force_lm85c.\n",
+ i2c_adapter_id(adapter), address );
}
err = 0 ;
goto ERROR1;
@@ -879,12 +870,10 @@
data->valid = 0;
init_MUTEX(&data->update_lock);
- if (lm85debug) {
- printk("lm85: Assigning ID %d to %s at %d,0x%02x\n",
+ dev_dbg(&adapter->dev, "Assigning ID %d to %s at %d,0x%02x\n",
new_client->id, new_client->name,
i2c_adapter_id(new_client->adapter),
new_client->addr);
- }
/* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client)))
@@ -1021,31 +1010,24 @@
int value;
struct lm85_data *data = i2c_get_clientdata(client);
- if (lm85debug) {
- printk("lm85(%d): Initializing device\n", client->id);
- }
+ dev_dbg(&client->dev, "Initializing device\n");
/* Warn if part was not "READY" */
value = lm85_read_value(client, LM85_REG_CONFIG);
- if (lm85debug) {
- printk("lm85(%d): LM85_REG_CONFIG is: 0x%02x\n", client->id, value );
- }
+ dev_dbg(&client->dev, "LM85_REG_CONFIG is: 0x%02x\n", value);
if( value & 0x02 ) {
- printk("lm85(%d): Client (%d,0x%02x) config is locked.\n",
- client->id,
+ dev_err(&client->dev, "Client (%d,0x%02x) config is locked.\n",
i2c_adapter_id(client->adapter), client->addr );
};
if( ! (value & 0x04) ) {
- printk("lm85(%d): Client (%d,0x%02x) is not ready.\n",
- client->id,
+ dev_err(&client->dev, "Client (%d,0x%02x) is not ready.\n",
i2c_adapter_id(client->adapter), client->addr );
};
if( value & 0x10
&& ( data->type == adm1027
|| data->type == adt7463 ) ) {
- printk("lm85(%d): Client (%d,0x%02x) VxI mode is set. "
+ dev_err(&client->dev, "Client (%d,0x%02x) VxI mode is set. "
"Please report this to the lm85 maintainer.\n",
- client->id,
i2c_adapter_id(client->adapter), client->addr );
};
@@ -1061,11 +1043,8 @@
value = lm85_read_value(client, LM85_REG_CONFIG);
/* Try to clear LOCK, Set START, save everything else */
value = (value & ~ 0x02) | 0x01 ;
- if (lm85debug) {
- printk("lm85(%d): Setting CONFIG to: 0x%02x\n", client->id, value );
- }
+ dev_dbg(&client->dev, "Setting CONFIG to: 0x%02x\n", value);
lm85_write_value(client, LM85_REG_CONFIG, value);
-
}
void lm85_update_client(struct i2c_client *client)
@@ -1078,10 +1057,8 @@
if ( !data->valid ||
(jiffies - data->last_reading > LM85_DATA_INTERVAL ) ) {
/* Things that change quickly */
-
- if (lm85debug) {
- printk("lm85(%d): Reading sensor values\n", client->id);
- }
+ dev_dbg(&client->dev, "Reading sensor values\n");
+
/* Have to read extended bits first to "freeze" the
* more significant bits that are read later.
*/
@@ -1125,10 +1102,8 @@
if ( !data->valid ||
(jiffies - data->last_config > LM85_CONFIG_INTERVAL) ) {
/* Things that don't change often */
+ dev_dbg(&client->dev, "Reading config values\n");
- if (lm85debug) {
- printk("lm85(%d): Reading config values\n", client->id);
- }
for (i = 0; i <= 4; ++i) {
data->in_min[i] =
lm85_read_value(client, LM85_REG_IN_MIN(i));
@@ -1234,8 +1209,6 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Philip Pokorny <ppokorny@penguincomputing.com>, Margit Schubert-While <margitsw@t-online.de>");
MODULE_DESCRIPTION("LM85-B, LM85-C driver");
-MODULE_PARM(lm85debug, "i");
-MODULE_PARM_DESC(lm85debug, "Enable debugging statements");
module_init(sm_lm85_init);
module_exit(sm_lm85_exit);
^ permalink raw reply
* Re: Linux on a Motorola MPC5200 ?
From: Sylvain Munaut @ 2004-01-27 23:37 UTC (permalink / raw)
To: Wolfgang Denk; +Cc: linuxppc-embedded
In-Reply-To: <20040127191442.3B541C108D@atlas.denx.de>
Hi
>>well, their 'special DMA fancy stuff' ;) ), ATA, DDR, I2S, AC97 mainly.
>>
>>
>
>ATA: OK as long as you don't enable DMA writes (*)
>
>
>
Are DMA Read supported ? ( I mean possible to just use DMA for the reads
? My application is about 95 % reads ;)
What's the performance impact ?
>DDR: OK (use icecube_5200_DDR configuration in U-Boot); the LOWBOOT
> option is not working yet (we are working on this)
>
>I2S: simultaneous reading and writing is impossible (*)
>AC97: ditto
>
>
>
Ok, not a problem for me I only do audio out.
But just in case, if I do In and Out on different PSC, does this works ?
>(*) to fix these issues we're waiting for a bugfix release of the
> BestComm CAPI which might become availabe by mid February.
>
>
Cool !
>> - I'd really like to run a 2.6 kernel on it. If it's not yet ported to
>>
>>
>
>Forget it. Why would you want to do that? Which features do you
>expect from 2.6 which are not available in 2.4?
>
>
>
>
Well things like *:
- Pluggable I/O Scheduler
- Kernel preemption
- Better IPSec / Encryption support
- udev stuff ( in fact userspace but may depend on some kernel
interface, have to check. Primarly done for the 2.6 AFAIK )
- Native ALSA
And also because when I start a new project I like to use "new" stuff ;)
That's were a majority of new nifty features are ...
(*) I'm not sure they are all only and 2.6 and not backported/already in
2.4, I have to check.
>Our current stuff is on our CVS server, in the linuxppc_2_4_devel
>tree. As far as the 5200 is concerned this includes stuff that was
>submitted but not yet added to the linux-2.4-mpc5xxx tree (but Tom
>promised to add our patches).
>
>
>
I've just downloaded it but ran into a problem when compiling the kernel
with the icecube default config.
In arch/ppc/boot/common/misc-simple.c :
- the decompress_kernel routine is used before being defined/declared
- the decompress_kernel defined there takes 3 args, the one used in
load_kernel func ( same file ), gives 4 args to it ...
Sylvain Munaut
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.