Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: don't respond to broadcast write requests
  firewire: clean up fw_card reference counting
  firewire: clean up some includes
  firewire: remove unused struct members
  firewire: implement broadcast_channel CSR for 1394a compliance
  ieee1394: dump mmapped iso buffers in core files
  ieee1394: raw1394: Push the BKL down into the driver ioctls
  ieee1394: video1394: reorder module init, prepare BKL removal
  ieee1394: reduce log noise about config ROM CRC errors

6 files changed, 53 insertions, 20 deletions

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/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);