Skip to contentSkip to conversation

MPT Fusion driver update

PATCH In review James Bottomley 2 participants 2 messages Nov 7, 2003 – Nov 8, 2003

Subsystems (2)
SCSI LSI Logic MPT fusion drivers (FC/SAS/SPI)
lore
Share & tools
lore

James Bottomley

author
#0 lore raw

PATCH 1/1 MPT Fusion driver update

This one's from: Eric Moore <[email protected]>

Changes in patch
* 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

James

drivers/message/fusion/isense.c +3 -3
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/isense.c linux-2.6.0-test9/drivers/message/fusion/isense.c
@@ -5,11 +5,11 @@
  *      Error Report logging output.  This module implements SCSI-3
  *      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
  *  (yes I wrote some of the orig. code back in 1991!)
  *  (mailto:[email protected])
- *  (mailto:[email protected])
+ *  (mailto:[email protected])
  *
  *  $Id: isense.c,v 1.33 2002/02/27 18:44:19 sralston Exp $
  */

@@ -66,7 +66,7 @@
 #endif
 
 #define MODULEAUTHOR "Steven J. Ralston"
-#define COPYRIGHT "Copyright (c) 2001-2002 " MODULEAUTHOR
+#define COPYRIGHT "Copyright (c) 2001-2003 " MODULEAUTHOR
 #include "mptbase.h"
 
 #include "isense.h"
drivers/message/fusion/mptbase.c +2 -2
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/mptbase.c linux-2.6.0-test9/drivers/message/fusion/mptbase.c
@@ -44,10 +44,10 @@
  *      for gobs of hard work fixing and optimizing LAN code.
  *      THANK YOU!
  *
- *  Copyright (c) 1999-2002 LSI Logic Corporation
+ *  Copyright (c) 1999-2003 LSI Logic Corporation
  *  Originally By: Steven J. Ralston
  *  (mailto:[email protected])
- *  (mailto:[email protected])
+ *  (mailto:[email protected])
  *
  *  $Id: mptbase.c,v 1.126 2002/12/16 15:28:45 pdelaney Exp $
  */
drivers/message/fusion/mptbase.h +5 -5
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/mptbase.h linux-2.6.0-test9/drivers/message/fusion/mptbase.h
@@ -8,10 +8,10 @@
  *  Credits:
  *     (see mptbase.c)
  *
- *  Copyright (c) 1999-2002 LSI Logic Corporation
+ *  Copyright (c) 1999-2003 LSI Logic Corporation
  *  Originally By: Steven J. Ralston
  *  (mailto:[email protected])
- *  (mailto:[email protected])
+ *  (mailto:[email protected])
  *
  *  $Id: mptbase.h,v 1.144 2003/01/28 21:31:56 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.00.03"
-#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-2.05.00.03"
+#define MPT_LINUX_VERSION_COMMON	"2.05.00.04"
+#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-2.05.00.04"
 #define WHAT_MAGIC_STRING		"@" "(" "#" ")"
 
 #define show_mptmod_ver(s,ver)  \
drivers/message/fusion/mptctl.c +18 -3
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/mptctl.c linux-2.6.0-test9/drivers/message/fusion/mptctl.c
@@ -29,10 +29,10 @@
  *
  *      (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
  *  (mailto:[email protected])
- *  (mailto:[email protected])
+ *  (mailto:[email protected])
  *
  *  $Id: mptctl.c,v 1.63 2002/12/03 21:26:33 pdelaney Exp $
  */

@@ -91,7 +91,7 @@
 #include "../../scsi/scsi.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"
 #include "mptbase.h"
 #include "mptctl.h"

@@ -2985,6 +2985,21 @@
 	mpt_deregister(mptctl_id);
 	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 */
 	for (i=0; i<MPT_MAX_ADAPTERS; i++) {
 		ioc = NULL;
drivers/message/fusion/mptctl.h +2 -2
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/mptctl.h linux-2.6.0-test9/drivers/message/fusion/mptctl.h
@@ -15,10 +15,10 @@
  *
  *      (see also mptbase.c)
  *
- *  Copyright (c) 1999-2002 LSI Logic Corporation
+ *  Copyright (c) 1999-2003 LSI Logic Corporation
  *  Originally By: Steven J. Ralston
  *  (mailto:[email protected])
- *  (mailto:[email protected])
+ *  (mailto:[email protected])
  *
  *  $Id: mptctl.h,v 1.13 2002/12/03 21:26:33 pdelaney Exp $
  */
drivers/message/fusion/mptlan.c +2 -1
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/mptlan.c linux-2.6.0-test9/drivers/message/fusion/mptlan.c
@@ -23,8 +23,9 @@
  *
  *      (see also mptbase.c)
  *
- *  Copyright (c) 2000-2002 LSI Logic Corporation
+ *  Copyright (c) 2000-2003 LSI Logic Corporation
  *  Originally By: Noah Romer
+ *  (mailto:[email protected])
  *
  *  $Id: mptlan.c,v 1.53 2002/10/17 20:15:58 pdelaney Exp $
  */
drivers/message/fusion/mptscsih.c +4 -4
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/mptscsih.c linux-2.6.0-test9/drivers/message/fusion/mptscsih.c
@@ -21,10 +21,10 @@
  *
  *      (see mptbase.c)
  *
- *  Copyright (c) 1999-2002 LSI Logic Corporation
+ *  Copyright (c) 1999-2003 LSI Logic Corporation
  *  Original author: Steven J. Ralston
  *  (mailto:[email protected])
- *  (mailto:[email protected])
+ *  (mailto:[email protected])
  *
  *  $Id: mptscsih.c,v 1.104 2002/12/03 21:26:34 pdelaney Exp $
  */

@@ -6900,7 +6900,7 @@
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 static int
-__init get_setup_token(char *p)
+get_setup_token(char *p)
 {
 	char *cur = setup_token;
 	char *pc;

@@ -6918,7 +6918,7 @@
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 static int
-__init mptscsih_setup(char *str)
+mptscsih_setup(char *str)
 {
 	char *cur = str;
 	char *pc, *pv;
drivers/message/fusion/mptscsih.h +2 -2
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/mptscsih.h linux-2.6.0-test9/drivers/message/fusion/mptscsih.h
@@ -15,10 +15,10 @@
  *
  *      (see also mptbase.c)
  *
- *  Copyright (c) 1999-2002 LSI Logic Corporation
+ *  Copyright (c) 1999-2003 LSI Logic Corporation
  *  Originally By: Steven J. Ralston
  *  (mailto:netscape.net)
- *  (mailto:[email protected])
+ *  (mailto:[email protected])
  *
  *  $Id: mptscsih.h,v 1.21 2002/12/03 21:26:35 pdelaney Exp $
  */
drivers/message/fusion/scsi3.h +2 -2
diff -uarN linux-2.6.0-test9-reference/drivers/message/fusion/scsi3.h linux-2.6.0-test9/drivers/message/fusion/scsi3.h
@@ -4,10 +4,10 @@
  *      (Ultimately) SCSI-3 definitions; for now, inheriting
  *      SCSI-2 definitions.
  *
- *  Copyright (c) 1996-2002 Steven J. Ralston
+ *  Copyright (c) 1996-2003 Steven J. Ralston
  *  Written By: Steven J. Ralston (19960517)
  *  (mailto:[email protected])
- *  (mailto:[email protected])
+ *  (mailto:[email protected])
  *
  *  $Id: scsi3.h,v 1.9 2002/02/27 18:45:02 sralston Exp $
  */
#1 lore raw
Quoted 8 lines · James Bottomley

This one's from: Eric Moore <[email protected]>

Changes in patch
* 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

The patch doesn't look bad but doesn't fix the real problems the driver has either..