Skip to content

L
linux
Commit 67122b7d authored by James Bottomley's avatar James Bottomley
Browse files
Options

[PATCH] MPT Fusion driver 2.05.00.05 update 

From: 	Moore, Eric Dean <emoore@lsil.com>

2.05.00.05 changes
* error handling fixes, e.g. use of host_lock 

2.05.00.04 changes
* removed __init from mptscsih_setup
* removed __init from get_setup_token
* changed copyright from 2002 to 2003
* added new mailto, and removed Pam.Delaney
* added some fix for 32bit emulation when unloading mptctl module
parent a20480b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 46 deletions
drivers/message/fusion/isense.c
View file @ 67122b7d
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
* Error Report logging output. This module implements SCSI-3 * Error Report logging output. This module implements SCSI-3
* Opcode lookup and a sorted table of SCSI-3 ASC/ASCQ strings. * Opcode lookup and a sorted table of SCSI-3 ASC/ASCQ strings.
* *
* Copyright (c) 1991-2002 Steven J. Ralston * Copyright (c) 1991-2003 Steven J. Ralston
* Written By: Steven J. Ralston * Written By: Steven J. Ralston
* (yes I wrote some of the orig. code back in 1991!) * (yes I wrote some of the orig. code back in 1991!)
* (mailto:sjralston1@netscape.net) * (mailto:sjralston1@netscape.net)
* (mailto:Pam.Delaney@lsil.com) * (mailto:mpt_linux_developer@lsil.com)
* *
* $Id: isense.c,v 1.33 2002/02/27 18:44:19 sralston Exp $ * $Id: isense.c,v 1.33 2002/02/27 18:44:19 sralston Exp $
*/ */
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
#endif #endif
#define MODULEAUTHOR "Steven J. Ralston" #define MODULEAUTHOR "Steven J. Ralston"
#define COPYRIGHT "Copyright (c) 2001-2002 " MODULEAUTHOR #define COPYRIGHT "Copyright (c) 2001-2003 " MODULEAUTHOR
#include "mptbase.h" #include "mptbase.h"
#include "isense.h" #include "isense.h"
......
drivers/message/fusion/mptbase.c
View file @ 67122b7d
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
* for gobs of hard work fixing and optimizing LAN code. * for gobs of hard work fixing and optimizing LAN code.
* THANK YOU! * THANK YOU!
* *
* Copyright (c) 1999-2002 LSI Logic Corporation * Copyright (c) 1999-2003 LSI Logic Corporation
* Originally By: Steven J. Ralston * Originally By: Steven J. Ralston
* (mailto:sjralston1@netscape.net) * (mailto:sjralston1@netscape.net)
* (mailto:Pam.Delaney@lsil.com) * (mailto:mpt_linux_developer@lsil.com)
* *
* $Id: mptbase.c,v 1.126 2002/12/16 15:28:45 pdelaney Exp $ * $Id: mptbase.c,v 1.126 2002/12/16 15:28:45 pdelaney Exp $
*/ */
...@@ -3138,7 +3138,7 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag) ...@@ -3138,7 +3138,7 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag)
{ {
int hard_reset_done = 0; int hard_reset_done = 0;
u32 ioc_state; u32 ioc_state;
int cnt = 0; int cntdn, cnt = 0;
dprintk((KERN_WARNING MYNAM ": KickStarting %s!\n", ioc->name)); dprintk((KERN_WARNING MYNAM ": KickStarting %s!\n", ioc->name));
if ((int)ioc->chip_type > (int)FC929) { if ((int)ioc->chip_type > (int)FC929) {
...@@ -3161,7 +3161,8 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag) ...@@ -3161,7 +3161,8 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag)
dprintk((MYIOC_s_INFO_FMT "Diagnostic reset successful!\n", dprintk((MYIOC_s_INFO_FMT "Diagnostic reset successful!\n",
ioc->name)); ioc->name));
for (cnt=0; cnt<HZ*20; cnt++) { cntdn = ((sleepFlag == CAN_SLEEP) ? HZ : 1000) * 20; /* 20 seconds */
for (cnt=0; cnt<cntdn; cnt++) {
if ((ioc_state = mpt_GetIocState(ioc, 1)) == MPI_IOC_STATE_READY) { if ((ioc_state = mpt_GetIocState(ioc, 1)) == MPI_IOC_STATE_READY) {
dprintk((MYIOC_s_INFO_FMT "KickStart successful! (cnt=%d)\n", dprintk((MYIOC_s_INFO_FMT "KickStart successful! (cnt=%d)\n",
ioc->name, cnt)); ioc->name, cnt));
......
drivers/message/fusion/mptbase.h
View file @ 67122b7d
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
* Credits: * Credits:
* (see mptbase.c) * (see mptbase.c)
* *
* Copyright (c) 1999-2002 LSI Logic Corporation * Copyright (c) 1999-2003 LSI Logic Corporation
* Originally By: Steven J. Ralston * Originally By: Steven J. Ralston
* (mailto:sjralston1@netscape.net) * (mailto:sjralston1@netscape.net)
* (mailto:Pam.Delaney@lsil.com) * (mailto:mpt_linux_developer@lsil.com)
* *
* $Id: mptbase.h,v 1.144 2003/01/28 21:31:56 pdelaney Exp $ * $Id: mptbase.h,v 1.144 2003/01/28 21:31:56 pdelaney Exp $
*/ */
...@@ -77,11 +77,11 @@ ...@@ -77,11 +77,11 @@
#endif #endif
#ifndef COPYRIGHT #ifndef COPYRIGHT
#define COPYRIGHT "Copyright (c) 1999-2002 " MODULEAUTHOR #define COPYRIGHT "Copyright (c) 1999-2003 " MODULEAUTHOR
#endif #endif
#define MPT_LINUX_VERSION_COMMON "2.05.00.03" #define MPT_LINUX_VERSION_COMMON "2.05.00.05"
#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-2.05.00.03" #define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-2.05.00.05"
#define WHAT_MAGIC_STRING "@" "(" "#" ")" #define WHAT_MAGIC_STRING "@" "(" "#" ")"
#define show_mptmod_ver(s,ver) \ #define show_mptmod_ver(s,ver) \
......
drivers/message/fusion/mptctl.c
View file @ 67122b7d
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
* *
* (see also mptbase.c) * (see also mptbase.c)
* *
* Copyright (c) 1999-2002 LSI Logic Corporation * Copyright (c) 1999-2003 LSI Logic Corporation
* Originally By: Steven J. Ralston, Noah Romer * Originally By: Steven J. Ralston, Noah Romer
* (mailto:sjralston1@netscape.net) * (mailto:sjralston1@netscape.net)
* (mailto:Pam.Delaney@lsil.com) * (mailto:mpt_linux_developer@lsil.com)
* *
* $Id: mptctl.c,v 1.63 2002/12/03 21:26:33 pdelaney Exp $ * $Id: mptctl.c,v 1.63 2002/12/03 21:26:33 pdelaney Exp $
*/ */
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
#include "../../scsi/scsi.h" #include "../../scsi/scsi.h"
#include "../../scsi/hosts.h" #include "../../scsi/hosts.h"
#define COPYRIGHT "Copyright (c) 1999-2001 LSI Logic Corporation" #define COPYRIGHT "Copyright (c) 1999-2003 LSI Logic Corporation"
#define MODULEAUTHOR "Steven J. Ralston, Noah Romer, Pamela Delaney" #define MODULEAUTHOR "Steven J. Ralston, Noah Romer, Pamela Delaney"
#include "mptbase.h" #include "mptbase.h"
#include "mptctl.h" #include "mptctl.h"
...@@ -2985,6 +2985,21 @@ void mptctl_exit(void) ...@@ -2985,6 +2985,21 @@ void mptctl_exit(void)
mpt_deregister(mptctl_id); mpt_deregister(mptctl_id);
printk(KERN_INFO MYNAM ": Deregistered from Fusion MPT base driver\n"); printk(KERN_INFO MYNAM ": Deregistered from Fusion MPT base driver\n");
#ifdef 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 */ /* Free allocated memory */
for (i=0; i<MPT_MAX_ADAPTERS; i++) { for (i=0; i<MPT_MAX_ADAPTERS; i++) {
ioc = NULL; ioc = NULL;
......
drivers/message/fusion/mptctl.h
View file @ 67122b7d
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* *
* (see also mptbase.c) * (see also mptbase.c)
* *
* Copyright (c) 1999-2002 LSI Logic Corporation * Copyright (c) 1999-2003 LSI Logic Corporation
* Originally By: Steven J. Ralston * Originally By: Steven J. Ralston
* (mailto:sjralston1@netscape.net) * (mailto:sjralston1@netscape.net)
* (mailto:Pam.Delaney@lsil.com) * (mailto:mpt_linux_developer@lsil.com)
* *
* $Id: mptctl.h,v 1.13 2002/12/03 21:26:33 pdelaney Exp $ * $Id: mptctl.h,v 1.13 2002/12/03 21:26:33 pdelaney Exp $
*/ */
......
drivers/message/fusion/mptlan.c
View file @ 67122b7d
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
* *
* (see also mptbase.c) * (see also mptbase.c)
* *
* Copyright (c) 2000-2002 LSI Logic Corporation * Copyright (c) 2000-2003 LSI Logic Corporation
* Originally By: Noah Romer * Originally By: Noah Romer
* (mailto:mpt_linux_developer@lsil.com)
* *
* $Id: mptlan.c,v 1.53 2002/10/17 20:15:58 pdelaney Exp $ * $Id: mptlan.c,v 1.53 2002/10/17 20:15:58 pdelaney Exp $
*/ */
......
drivers/message/fusion/mptscsih.c
View file @ 67122b7d
This diff is collapsed.
drivers/message/fusion/mptscsih.h
View file @ 67122b7d
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* *
* (see also mptbase.c) * (see also mptbase.c)
* *
* Copyright (c) 1999-2002 LSI Logic Corporation * Copyright (c) 1999-2003 LSI Logic Corporation
* Originally By: Steven J. Ralston * Originally By: Steven J. Ralston
* (mailto:netscape.net) * (mailto:netscape.net)
* (mailto:Pam.Delaney@lsil.com) * (mailto:mpt_linux_developer@lsil.com)
* *
* $Id: mptscsih.h,v 1.21 2002/12/03 21:26:35 pdelaney Exp $ * $Id: mptscsih.h,v 1.21 2002/12/03 21:26:35 pdelaney Exp $
*/ */
......
drivers/message/fusion/scsi3.h
View file @ 67122b7d
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
* (Ultimately) SCSI-3 definitions; for now, inheriting * (Ultimately) SCSI-3 definitions; for now, inheriting
* SCSI-2 definitions. * SCSI-2 definitions.
* *
* Copyright (c) 1996-2002 Steven J. Ralston * Copyright (c) 1996-2003 Steven J. Ralston
* Written By: Steven J. Ralston (19960517) * Written By: Steven J. Ralston (19960517)
* (mailto:sjralston1@netscape.net) * (mailto:sjralston1@netscape.net)
* (mailto:Pam.Delaney@lsil.com) * (mailto:mpt_linux_developer@lsil.com)
* *
* $Id: scsi3.h,v 1.9 2002/02/27 18:45:02 sralston Exp $ * $Id: scsi3.h,v 1.9 2002/02/27 18:45:02 sralston Exp $
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7