Parent repository is bk://linux-scsi.bkbits.net/scsi-misc-2.6
======== ChangeSet 1.1636 ========
D 1.1636 04/03/02 18:04:15-08:00 akpm@mnm.(none) 37842 37839 0/0/1
P ChangeSet
C Merge mnm.(none):/usr/src/bk25 into mnm.(none):/usr/src/bk-scsi
------------------------------------------------
diff -Nru a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig
--- a/drivers/message/fusion/Kconfig Tue Mar 2 18:07:00 2004
+++ b/drivers/message/fusion/Kconfig Tue Mar 2 18:07:00 2004
@@ -14,41 +14,6 @@
[1] LAN is not supported on parallel SCSI medium.
- These drivers require a Fusion MPT compatible PCI adapter installed
- in the host system. MPT adapters contain specialized I/O processors
- to handle I/O workload, and more importantly to offload this work
- from the host CPU(s).
-
- If you have Fusion MPT hardware and want to use it, you can say
- Y or M here to add MPT (base + ScsiHost) drivers.
- <Y> = build lib (fusion), and link [static] into the kernel [2]
- proper
- <M> = compiled as [dynamic] modules [3] named: (mptbase,
- mptscsih)
-
- [2] In order enable capability to boot the linux kernel
- natively from a Fusion MPT target device, you MUST
- answer Y here! (currently requires CONFIG_BLK_DEV_SD)
- [3] To compile this support as modules, choose M here.
-
- If unsure, say N.
-
- If you say Y or M here you will get a choice of these
- additional protocol and support module options: Module Name:
- <M> Enhanced SCSI error reporting (isense)
- <M> Fusion MPT misc device (ioctl) driver (mptctl)
- <M> Fusion MPT LAN driver (mptlan)
-
- ---
- Fusion MPT is trademark of LSI Logic Corporation, and its
- architecture is based on LSI Logic's Message Passing Interface (MPI)
- specification.
-
-config FUSION_BOOT
- bool
- depends on FUSION=y
- default y
-
config FUSION_MAX_SGE
int "Maximum number of scatter gather entries"
depends on FUSION
@@ -62,7 +27,6 @@
necessary (or recommended) unless the user will be running
large I/O's via the raw interface.
-# How can we force these options to module or nothing?
config FUSION_ISENSE
tristate "Enhanced SCSI error reporting"
depends on MODULES && FUSION && m
@@ -132,17 +96,4 @@
If unsure whether you really want or need this, say N.
- NOTES: This feature is NOT available nor supported for linux-2.2.x
- kernels. You must be building a linux-2.3.x or linux-2.4.x kernel
- in order to configure this option.
- Support for building this feature into the linux kernel is not
- yet available.
-
-# if [ "$CONFIG_FUSION_LAN" != "n" ]; then
-# define_bool CONFIG_NET_FC y
-# fi
-# These <should> be define_tristate, but we leave them define_bool
-# for backward compatibility with pre-linux-2.2.15 kernels.
-# (Bugzilla:fibrebugs, #384)
endmenu
-
diff -Nru a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
--- a/drivers/message/fusion/mptbase.c Tue Mar 2 18:07:00 2004
+++ b/drivers/message/fusion/mptbase.c Tue Mar 2 18:07:00 2004
@@ -1515,17 +1515,18 @@
|| (ioc->chip_type == C1035) || (ioc->chip_type == FC929X))
mpt_detect_bound_ports(ioc, pdev);
- if ((r = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_BRINGUP, CAN_SLEEP)) != 0) {
- printk(KERN_WARNING MYNAM ": WARNING - %s did not initialize properly! (%d)\n",
- ioc->name, r);
- }
+ if ((r = mpt_do_ioc_recovery(ioc,
+ MPT_HOSTEVENT_IOC_BRINGUP, CAN_SLEEP)) != 0) {
+ printk(KERN_WARNING MYNAM
+ ": WARNING - %s did not initialize properly! (%d)\n",
+ ioc->name, r);
- if(r != 0 ) {
Q_DEL_ITEM(ioc);
mpt_adapters[ioc->id] = NULL;
free_irq(ioc->pci_irq, ioc);
iounmap(mem);
kfree(ioc);
+ pci_set_drvdata(pdev, NULL);
return r;
}
diff -Nru a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
--- a/drivers/message/fusion/mptbase.h Tue Mar 2 18:07:00 2004
+++ b/drivers/message/fusion/mptbase.h Tue Mar 2 18:07:00 2004
@@ -80,8 +80,8 @@
#define COPYRIGHT "Copyright (c) 1999-2003 " MODULEAUTHOR
#endif
-#define MPT_LINUX_VERSION_COMMON "3.00.03"
-#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-3.00.03"
+#define MPT_LINUX_VERSION_COMMON "3.00.04"
+#define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-3.00.04"
#define WHAT_MAGIC_STRING "@" "(" "#" ")"
#define show_mptmod_ver(s,ver) \
diff -Nru a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
--- a/drivers/message/fusion/mptscsih.c Tue Mar 2 18:07:00 2004
+++ b/drivers/message/fusion/mptscsih.c Tue Mar 2 18:07:00 2004
@@ -200,8 +200,8 @@
static int __init mptscsih_init (void);
static void __exit mptscsih_exit (void);
-static int __devinit mptscsih_probe (struct pci_dev *, const struct pci_device_id *);
-static void __devexit mptscsih_remove(struct pci_dev *);
+static int mptscsih_probe (struct pci_dev *, const struct pci_device_id *);
+static void mptscsih_remove(struct pci_dev *);
static void mptscsih_shutdown(struct device *);
#ifdef CONFIG_PM
static int mptscsih_suspend(struct pci_dev *pdev, u32 state);
@@ -1405,7 +1405,7 @@
*
*/
-static int __devinit
+static int
mptscsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
struct Scsi_Host *sh = NULL;
@@ -1718,7 +1718,7 @@
*
*
*/
-static void __devexit
+static void
mptscsih_remove(struct pci_dev *pdev)
{
MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
@@ -1920,7 +1920,7 @@
static struct mpt_pci_driver mptscsih_driver = {
.probe = mptscsih_probe,
- .remove = __devexit_p(mptscsih_remove),
+ .remove = mptscsih_remove,
.shutdown = mptscsih_shutdown,
#ifdef CONFIG_PM
.suspend = mptscsih_suspend,
diff -Nru a/drivers/scsi/ini9100u.c b/drivers/scsi/ini9100u.c
--- a/drivers/scsi/ini9100u.c Tue Mar 2 18:07:00 2004
+++ b/drivers/scsi/ini9100u.c Tue Mar 2 18:07:00 2004
@@ -180,15 +180,6 @@
static char *setup_str = (char *) NULL;
-static irqreturn_t i91u_intr0(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr1(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr2(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr3(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr4(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr5(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr6(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr7(int irq, void *dev_id, struct pt_regs *);
-
static void i91u_panic(char *msg);
static void i91uSCBPost(BYTE * pHcb, BYTE * pScb);
@@ -278,7 +269,7 @@
unsigned long flags;
spin_lock_irqsave(dev->host_lock, flags);
- tul_isr((HCS *)hreg->base);
+ tul_isr((HCS *)dev->base);
spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
}
diff -Nru a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
--- a/drivers/scsi/scsi.c Tue Mar 2 18:07:00 2004
+++ b/drivers/scsi/scsi.c Tue Mar 2 18:07:00 2004
@@ -104,7 +104,7 @@
"Communications ",
"Unknown ",
"Unknown ",
- "Unknown ",
+ "RAID ",
"Enclosure ",
};
diff -Nru a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
--- a/drivers/scsi/scsi_devinfo.c Tue Mar 2 18:07:00 2004
+++ b/drivers/scsi/scsi_devinfo.c Tue Mar 2 18:07:00 2004
@@ -178,9 +178,6 @@
{"SGI", "RAID3", "*", BLIST_SPARSELUN},
{"SGI", "RAID5", "*", BLIST_SPARSELUN},
{"SGI", "TP9100", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
- {"SGI", "TP9300", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
- {"SGI", "TP9400", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
- {"SGI", "TP9500", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
{"MYLEX", "DACARMRB", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
{"XYRATEX", "RS", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
{ NULL, NULL, NULL, 0 },
diff -Nru a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
--- a/drivers/scsi/scsi_sysfs.c Tue Mar 2 18:07:00 2004
+++ b/drivers/scsi/scsi_sysfs.c Tue Mar 2 18:07:00 2004
@@ -58,21 +58,24 @@
* shost_show_function: macro to create an attr function that can be used to
* show a non-bit field.
*/
-#define shost_show_function(field, format_string) \
+#define shost_show_function(name, field, format_string) \
static ssize_t \
-show_##field (struct class_device *class_dev, char *buf) \
+show_##name (struct class_device *class_dev, char *buf) \
{ \
struct Scsi_Host *shost = class_to_shost(class_dev); \
- return snprintf (buf, 20, format_string, shost->field); \
+ return snprintf (buf, 20, format_string, shost->field); \
}
/*
* shost_rd_attr: macro to create a function and attribute variable for a
* read only field.
*/
-#define shost_rd_attr(field, format_string) \
- shost_show_function(field, format_string) \
-static CLASS_DEVICE_ATTR(field, S_IRUGO, show_##field, NULL)
+#define shost_rd_attr2(name, field, format_string) \
+ shost_show_function(name, field, format_string) \
+static CLASS_DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
+
+#define shost_rd_attr(field, format_string) \
+shost_rd_attr2(field, field, format_string)
/*
* Create the actual show/store functions and data structures.
@@ -96,6 +99,7 @@
shost_rd_attr(cmd_per_lun, "%hd\n");
shost_rd_attr(sg_tablesize, "%hu\n");
shost_rd_attr(unchecked_isa_dma, "%d\n");
+shost_rd_attr2(proc_name, hostt->proc_name, "%s\n");
static struct class_device_attribute *scsi_sysfs_shost_attrs[] = {
&class_device_attr_unique_id,
@@ -103,6 +107,7 @@
&class_device_attr_cmd_per_lun,
&class_device_attr_sg_tablesize,
&class_device_attr_unchecked_isa_dma,
+ &class_device_attr_proc_name,
&class_device_attr_scan,
NULL
};
diff -Nru a/include/scsi/scsi.h b/include/scsi/scsi.h
--- a/include/scsi/scsi.h Tue Mar 2 18:07:00 2004
+++ b/include/scsi/scsi.h Tue Mar 2 18:07:00 2004
@@ -200,6 +200,7 @@
#define TYPE_MEDIUM_CHANGER 0x08
#define TYPE_COMM 0x09 /* Communications device */
#define TYPE_ENCLOSURE 0x0d /* Enclosure Services Device */
+#define TYPE_RAID 0x0c
#define TYPE_NO_LUN 0x7f
/*