9 files changed, 148 insertions, 86 deletions

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 545663ef820b..95f45f9b8e5e 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -4,7 +4,7 @@ menu "IEEE 1394 (FireWire) support"
 source "drivers/firewire/Kconfig"
 
 config IEEE1394
-        tristate "IEEE 1394 (FireWire) support"
+        tristate "Stable FireWire stack"
         depends on PCI || BROKEN
         help
           IEEE 1394 describes a high performance serial bus, which is also
@@ -19,30 +19,45 @@ config IEEE1394
           To compile this driver as a module, say M here: the
           module will be called ieee1394.
 
-comment "Subsystem Options"
-        depends on IEEE1394
-
-config IEEE1394_VERBOSEDEBUG
-        bool "Excessive debugging output"
-        depends on IEEE1394
+config IEEE1394_OHCI1394
+        tristate "OHCI-1394 controllers"
+        depends on PCI && IEEE1394
         help
-          If you say Y here, you will get very verbose debugging logs from
-          the subsystem which includes a dump of the header of every sent
-          and received packet.  This can amount to a high amount of data
-          collected in a very short time which is usually also saved to
-          disk by the system logging daemons.
+          Enable this driver if you have an IEEE 1394 controller based on the
+          OHCI-1394 specification. The current driver is only tested with OHCI
+          chipsets made by Texas Instruments and NEC. Most third-party vendors
+          use one of these chipsets.  It should work with any OHCI-1394
+          compliant card, however.
 
-          Say Y if you really want or need the debugging output, everyone
-          else says N.
+          To compile this driver as a module, say M here: the
+          module will be called ohci1394.
 
-comment "Controllers"
-        depends on IEEE1394
+          NOTE:
 
-comment "Texas Instruments PCILynx requires I2C"
+          You should only build either ohci1394 or the new firewire-ohci driver,
+          but not both.  If you nevertheless want to install both, you should
+          configure them only as modules and blacklist the driver(s) which you
+          don't want to have auto-loaded.  Add either
+
+              blacklist firewire-ohci
+          or
+              blacklist ohci1394
+              blacklist video1394
+              blacklist dv1394
+
+          to /etc/modprobe.conf or /etc/modprobe.d/* and update modprobe.conf
+          depending on your distribution.  The latter two modules should be
+          blacklisted together with ohci1394 because they depend on ohci1394.
+
+          If you have an old modprobe which doesn't implement the blacklist
+          directive, use "install modulename /bin/true" for the modules to be
+          blacklisted.
+
+comment "PCILynx controller requires I2C"
         depends on IEEE1394 && I2C=n
 
 config IEEE1394_PCILYNX
-        tristate "Texas Instruments PCILynx support"
+        tristate "PCILynx controller"
         depends on PCI && IEEE1394 && I2C
         select I2C_ALGOBIT
         help
@@ -57,35 +72,11 @@ config IEEE1394_PCILYNX
           PowerMacs G3 B&W contain the PCILynx controller.  Therefore
           almost everybody can say N here.
 
-config IEEE1394_OHCI1394
-        tristate "OHCI-1394 support"
-        depends on PCI && IEEE1394
-        help
-          Enable this driver if you have an IEEE 1394 controller based on the
-          OHCI-1394 specification. The current driver is only tested with OHCI
-          chipsets made by Texas Instruments and NEC. Most third-party vendors
-          use one of these chipsets.  It should work with any OHCI-1394
-          compliant card, however.
-
-          To compile this driver as a module, say M here: the
-          module will be called ohci1394.
-
-comment "Protocols"
-        depends on IEEE1394
-
-config IEEE1394_VIDEO1394
-        tristate "OHCI-1394 Video support"
-        depends on IEEE1394 && IEEE1394_OHCI1394
-        help
-          This option enables video device usage for OHCI-1394 cards.  Enable
-          this option only if you have an IEEE 1394 video device connected to
-          an OHCI-1394 card.
-
 comment "SBP-2 support (for storage devices) requires SCSI"
         depends on IEEE1394 && SCSI=n
 
 config IEEE1394_SBP2
-        tristate "SBP-2 support (Harddisks etc.)"
+        tristate "Storage devices (SBP-2 protocol)"
         depends on IEEE1394 && SCSI
         help
           This option enables you to use SBP-2 devices connected to an IEEE
@@ -127,24 +118,47 @@ config IEEE1394_ETH1394
 
           The module is called eth1394 although it does not emulate Ethernet.
 
+config IEEE1394_RAWIO
+        tristate "raw1394 userspace interface"
+        depends on IEEE1394
+        help
+          This option adds support for the raw1394 device file which enables
+          direct communication of user programs with IEEE 1394 devices
+          (isochronous and asynchronous).  Almost all application programs
+          which access FireWire require this option.
+
+          To compile this driver as a module, say M here: the module will be
+          called raw1394.
+
+config IEEE1394_VIDEO1394
+        tristate "video1394 userspace interface"
+        depends on IEEE1394 && IEEE1394_OHCI1394
+        help
+          This option adds support for the video1394 device files which enable
+          isochronous communication of user programs with IEEE 1394 devices,
+          especially video capture or export.  This interface is used by all
+          libdc1394 based programs and by several other programs, in addition to
+          the raw1394 interface.  It is generally not required for DV capture.
+
+          To compile this driver as a module, say M here: the module will be
+          called video1394.
+
 config IEEE1394_DV1394
-        tristate "OHCI-DV I/O support (deprecated)"
+        tristate "dv1394 userspace interface (deprecated)"
         depends on IEEE1394 && IEEE1394_OHCI1394
         help
           The dv1394 driver is unsupported and may be removed from Linux in a
           future release.  Its functionality is now provided by raw1394 together
           with libraries such as libiec61883.
 
-config IEEE1394_RAWIO
-        tristate "Raw IEEE1394 I/O support"
+config IEEE1394_VERBOSEDEBUG
+        bool "Excessive debugging output"
         depends on IEEE1394
         help
-          This option adds support for the raw1394 device file which enables
-          direct communication of user programs with the IEEE 1394 bus and thus
-          with the attached peripherals.  Almost all application programs which
-          access FireWire require this option.
+          If you say Y here, you will get very verbose debugging logs from the
+          ieee1394 drivers, including sent and received packet headers.  This
+          will quickly result in large amounts of data sent to the system log.
 
-          To compile this driver as a module, say M here: the module will be
-          called raw1394.
+          Say Y if you really need the debugging output.  Everyone else says N.
 
 endmenu
diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index e8122def164d..9f95337139e3 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -1049,6 +1049,24 @@ int csr1212_read(struct csr1212_csr *csr, u32 offset, void *buffer, u32 len)
         return -ENOENT;
 }
 
+/*
+ * Apparently there are many different wrong implementations of the CRC
+ * algorithm.  We don't fail, we just warn... approximately once per GUID.
+ */
+static void
+csr1212_check_crc(const u32 *buffer, size_t length, u16 crc, __be32 *guid)
+{
+        static u64 last_bad_eui64;
+        u64 eui64 = ((u64)be32_to_cpu(guid[0]) << 32) | be32_to_cpu(guid[1]);
+
+        if (csr1212_crc16(buffer, length) == crc ||
+            csr1212_msft_crc16(buffer, length) == crc ||
+            eui64 == last_bad_eui64)
+                return;
+
+        printk(KERN_DEBUG "ieee1394: config ROM CRC error\n");
+        last_bad_eui64 = eui64;
+}
 
 /* Parse a chunk of data as a Config ROM */
 
@@ -1092,11 +1110,8 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr)
                         return ret;
         }
 
-        /* Apparently there are many different wrong implementations of the CRC
-         * algorithm.  We don't fail, we just warn. */
-        if ((csr1212_crc16(bi->data, bi->crc_length) != bi->crc) &&
-            (csr1212_msft_crc16(bi->data, bi->crc_length) != bi->crc))
-                printk(KERN_DEBUG "IEEE 1394 device has ROM CRC error\n");
+        csr1212_check_crc(bi->data, bi->crc_length, bi->crc,
+                          &csr->bus_info_data[3]);
 
         cr = CSR1212_MALLOC(sizeof(*cr));
         if (!cr)
@@ -1205,11 +1220,8 @@ int csr1212_parse_keyval(struct csr1212_keyval *kv,
                 &cache->data[bytes_to_quads(kv->offset - cache->offset)];
         kvi_len = be16_to_cpu(kvi->length);
 
-        /* Apparently there are many different wrong implementations of the CRC
-         * algorithm.  We don't fail, we just warn. */
-        if ((csr1212_crc16(kvi->data, kvi_len) != kvi->crc) &&
-            (csr1212_msft_crc16(kvi->data, kvi_len) != kvi->crc))
-                printk(KERN_DEBUG "IEEE 1394 device has ROM CRC error\n");
+        /* GUID is wrong in here in case of extended ROM.  We don't care. */
+        csr1212_check_crc(kvi->data, kvi_len, kvi->crc, &cache->data[3]);
 
         switch (kv->key.type) {
         case CSR1212_KV_TYPE_DIRECTORY:
diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c
index 73685e7dc7e4..1aba8c13fe8f 100644
--- a/drivers/ieee1394/dma.c
+++ b/drivers/ieee1394/dma.c
@@ -274,7 +274,7 @@ int dma_region_mmap(struct dma_region *dma, struct file *file,
         vma->vm_ops = &dma_region_vm_ops;
         vma->vm_private_data = dma;
         vma->vm_file = file;
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_RESERVED | VM_ALWAYSDUMP;
 
         return 0;
 }
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index fa2bfec0fca2..918ffc4fc8ac 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -228,10 +228,8 @@ void hpsb_register_highlevel(struct hpsb_highlevel *hl)
 {
         unsigned long flags;
 
+        hpsb_init_highlevel(hl);
         INIT_LIST_HEAD(&hl->addr_list);
-        INIT_LIST_HEAD(&hl->host_info_list);
-
-        rwlock_init(&hl->host_info_lock);
 
         down_write(&hl_drivers_sem);
         list_add_tail(&hl->hl_list, &hl_drivers);
diff --git a/drivers/ieee1394/highlevel.h b/drivers/ieee1394/highlevel.h
index eb9fe321e09a..bc5d0854c17e 100644
--- a/drivers/ieee1394/highlevel.h
+++ b/drivers/ieee1394/highlevel.h
@@ -2,7 +2,7 @@
 #define IEEE1394_HIGHLEVEL_H
 
 #include <linux/list.h>
-#include <linux/spinlock_types.h>
+#include <linux/spinlock.h>
 #include <linux/types.h>
 
 struct module;
@@ -103,6 +103,17 @@ int highlevel_lock64(struct hpsb_host *host, int nodeid, octlet_t *store,
 void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction,
                            void *data, size_t length);
 
+/**
+ * hpsb_init_highlevel - initialize a struct hpsb_highlevel
+ *
+ * This is only necessary if hpsb_get_hostinfo_bykey can be called
+ * before hpsb_register_highlevel.
+ */
+static inline void hpsb_init_highlevel(struct hpsb_highlevel *hl)
+{
+        rwlock_init(&hl->host_info_lock);
+        INIT_LIST_HEAD(&hl->host_info_list);
+}
 void hpsb_register_highlevel(struct hpsb_highlevel *hl);
 void hpsb_unregister_highlevel(struct hpsb_highlevel *hl);
 
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index ec2a0adbedb2..96f2847b0405 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -2549,8 +2549,8 @@ static int raw1394_mmap(struct file *file, struct vm_area_struct *vma)
 }
 
 /* ioctl is only used for rawiso operations */
-static int raw1394_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg)
+static long do_raw1394_ioctl(struct file *file, unsigned int cmd,
+                                                        unsigned long arg)
 {
         struct file_info *fi = file->private_data;
         void __user *argp = (void __user *)arg;
@@ -2656,6 +2656,16 @@ static int raw1394_ioctl(struct inode *inode, struct file *file,
         return -EINVAL;
 }
 
+static long raw1394_ioctl(struct file *file, unsigned int cmd,
+                                                        unsigned long arg)
+{
+        long ret;
+        lock_kernel();
+        ret = do_raw1394_ioctl(file, cmd, arg);
+        unlock_kernel();
+        return ret;
+}
+
 #ifdef CONFIG_COMPAT
 struct raw1394_iso_packets32 {
         __u32 n_packets;
@@ -2690,7 +2700,7 @@ static long raw1394_iso_xmit_recv_packets32(struct file *file, unsigned int cmd,
             !copy_from_user(&infos32, &arg->infos, sizeof infos32)) {
                 infos = compat_ptr(infos32);
                 if (!copy_to_user(&dst->infos, &infos, sizeof infos))
-                        err = raw1394_ioctl(NULL, file, cmd, (unsigned long)dst);
+                        err = do_raw1394_ioctl(file, cmd, (unsigned long)dst);
         }
         return err;
 }
@@ -2731,7 +2741,7 @@ static long raw1394_compat_ioctl(struct file *file,
         case RAW1394_IOC_ISO_GET_STATUS:
         case RAW1394_IOC_ISO_SHUTDOWN:
         case RAW1394_IOC_ISO_QUEUE_ACTIVITY:
-                err = raw1394_ioctl(NULL, file, cmd, arg);
+                err = do_raw1394_ioctl(file, cmd, arg);
                 break;
         /* These request have different format. */
         case RAW1394_IOC_ISO_RECV_PACKETS32:
@@ -2984,7 +2994,7 @@ static const struct file_operations raw1394_fops = {
         .read = raw1394_read,
         .write = raw1394_write,
         .mmap = raw1394_mmap,
-        .ioctl = raw1394_ioctl,
+        .unlocked_ioctl = raw1394_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = raw1394_compat_ioctl,
 #endif
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 16b9d0ad154e..9cbf3154d243 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -186,6 +186,11 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device "
  * - delay inquiry
  *   Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry.
  *
+ * - power condition
+ *   Set the power condition field in the START STOP UNIT commands sent by
+ *   sd_mod on suspend, resume, and shutdown (if manage_start_stop is on).
+ *   Some disks need this to spin down or to resume properly.
+ *
  * - override internal blacklist
  *   Instead of adding to the built-in blacklist, use only the workarounds
  *   specified in the module load parameter.
@@ -199,6 +204,8 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0"
         ", skip mode page 8 = "   __stringify(SBP2_WORKAROUND_MODE_SENSE_8)
         ", fix capacity = "       __stringify(SBP2_WORKAROUND_FIX_CAPACITY)
         ", delay inquiry = "      __stringify(SBP2_WORKAROUND_DELAY_INQUIRY)
+        ", set power condition in start stop unit = "
+                                  __stringify(SBP2_WORKAROUND_POWER_CONDITION)
         ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
         ", or a combination)");
 
@@ -359,18 +366,25 @@ static const struct {
                 .firmware_revision      = 0x002800,
                 .model_id               = 0x001010,
                 .workarounds            = SBP2_WORKAROUND_INQUIRY_36 |
-                                          SBP2_WORKAROUND_MODE_SENSE_8,
+                                          SBP2_WORKAROUND_MODE_SENSE_8 |
+                                          SBP2_WORKAROUND_POWER_CONDITION,
         },
         /* DViCO Momobay FX-3A with TSB42AA9A bridge */ {
                 .firmware_revision      = 0x002800,
                 .model_id               = 0x000000,
-                .workarounds            = SBP2_WORKAROUND_DELAY_INQUIRY,
+                .workarounds            = SBP2_WORKAROUND_DELAY_INQUIRY |
+                                          SBP2_WORKAROUND_POWER_CONDITION,
         },
         /* Initio bridges, actually only needed for some older ones */ {
                 .firmware_revision      = 0x000200,
                 .model_id               = SBP2_ROM_VALUE_WILDCARD,
                 .workarounds            = SBP2_WORKAROUND_INQUIRY_36,
         },
+        /* PL-3507 bridge with Prolific firmware */ {
+                .firmware_revision      = 0x012800,
+                .model_id               = SBP2_ROM_VALUE_WILDCARD,
+                .workarounds            = SBP2_WORKAROUND_POWER_CONDITION,
+        },
         /* Symbios bridge */ {
                 .firmware_revision      = 0xa0b800,
                 .model_id               = SBP2_ROM_VALUE_WILDCARD,
@@ -1539,15 +1553,13 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,
 
 static void sbp2_create_command_orb(struct sbp2_lu *lu,
                                     struct sbp2_command_info *cmd,
-                                    unchar *scsi_cmd,
-                                    unsigned int scsi_use_sg,
-                                    unsigned int scsi_request_bufflen,
-                                    struct scatterlist *sg,
-                                    enum dma_data_direction dma_dir)
+                                    struct scsi_cmnd *SCpnt)
 {
         struct sbp2_fwhost_info *hi = lu->hi;
         struct sbp2_command_orb *orb = &cmd->command_orb;
         u32 orb_direction;
+        unsigned int scsi_request_bufflen = scsi_bufflen(SCpnt);
+        enum dma_data_direction dma_dir = SCpnt->sc_data_direction;
 
         /*
          * Set-up our command ORB.
@@ -1580,13 +1592,14 @@ static void sbp2_create_command_orb(struct sbp2_lu *lu,
                 orb->data_descriptor_lo = 0x0;
                 orb->misc |= ORB_SET_DIRECTION(1);
         } else
-                sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_use_sg, sg,
+                sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_sg_count(SCpnt),
+                                         scsi_sglist(SCpnt),
                                          orb_direction, dma_dir);
 
         sbp2util_cpu_to_be32_buffer(orb, sizeof(*orb));
 
-        memset(orb->cdb, 0, 12);
-        memcpy(orb->cdb, scsi_cmd, COMMAND_SIZE(*scsi_cmd));
+        memset(orb->cdb, 0, sizeof(orb->cdb));
+        memcpy(orb->cdb, SCpnt->cmnd, SCpnt->cmd_len);
 }
 
 static void sbp2_link_orb_command(struct sbp2_lu *lu,
@@ -1669,16 +1682,13 @@ static void sbp2_link_orb_command(struct sbp2_lu *lu,
 static int sbp2_send_command(struct sbp2_lu *lu, struct scsi_cmnd *SCpnt,
                              void (*done)(struct scsi_cmnd *))
 {
-        unchar *scsi_cmd = (unchar *)SCpnt->cmnd;
         struct sbp2_command_info *cmd;
 
         cmd = sbp2util_allocate_command_orb(lu, SCpnt, done);
         if (!cmd)
                 return -EIO;
 
-        sbp2_create_command_orb(lu, cmd, scsi_cmd, scsi_sg_count(SCpnt),
-                                scsi_bufflen(SCpnt), scsi_sglist(SCpnt),
-                                SCpnt->sc_data_direction);
+        sbp2_create_command_orb(lu, cmd, SCpnt);
         sbp2_link_orb_command(lu, cmd);
 
         return 0;
@@ -1999,6 +2009,8 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev)
 
         sdev->use_10_for_rw = 1;
 
+        if (sbp2_exclusive_login)
+                sdev->manage_start_stop = 1;
         if (sdev->type == TYPE_ROM)
                 sdev->use_10_for_ms = 1;
         if (sdev->type == TYPE_DISK &&
@@ -2006,6 +2018,8 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev)
                 sdev->skip_ms_page_8 = 1;
         if (lu->workarounds & SBP2_WORKAROUND_FIX_CAPACITY)
                 sdev->fix_capacity = 1;
+        if (lu->workarounds & SBP2_WORKAROUND_POWER_CONDITION)
+                sdev->start_stop_pwr_cond = 1;
         if (lu->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
                 blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
         return 0;
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index 80d8e097b065..875428bc8d29 100644
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -345,6 +345,7 @@ enum sbp2lu_state_types {
 #define SBP2_WORKAROUND_FIX_CAPACITY    0x8
 #define SBP2_WORKAROUND_DELAY_INQUIRY   0x10
 #define SBP2_INQUIRY_DELAY              12
+#define SBP2_WORKAROUND_POWER_CONDITION 0x20
 #define SBP2_WORKAROUND_OVERRIDE        0x100
 
 #endif /* SBP2_H */
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index e24772d336e1..069b9f6bf16d 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1503,6 +1503,8 @@ static int __init video1394_init_module (void)
 {
         int ret;
 
+        hpsb_init_highlevel(&video1394_highlevel);
+
         cdev_init(&video1394_cdev, &video1394_fops);
         video1394_cdev.owner = THIS_MODULE;
         ret = cdev_add(&video1394_cdev, IEEE1394_VIDEO1394_DEV, 16);