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, 72 insertions, 33 deletions

diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 5b4c0d9f5173..da873d795aad 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -16,12 +16,15 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <linux/module.h>
-#include <linux/errno.h>
+#include <linux/completion.h>
+#include <linux/crc-itu-t.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/kref.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
-#include <linux/crc-itu-t.h>
+
 #include "fw-transaction.h"
 #include "fw-topology.h"
 #include "fw-device.h"
@@ -396,14 +399,16 @@ fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
 {
         static atomic_t index = ATOMIC_INIT(-1);
 
-        atomic_set(&card->device_count, 0);
         card->index = atomic_inc_return(&index);
         card->driver = driver;
         card->device = device;
         card->current_tlabel = 0;
         card->tlabel_mask = 0;
         card->color = 0;
+        card->broadcast_channel = BROADCAST_CHANNEL_INITIAL;
 
+        kref_init(&card->kref);
+        init_completion(&card->done);
         INIT_LIST_HEAD(&card->transaction_list);
         spin_lock_init(&card->lock);
         setup_timer(&card->flush_timer,
@@ -496,7 +501,6 @@ dummy_enable_phys_dma(struct fw_card *card,
 }
 
 static struct fw_card_driver dummy_driver = {
-        .name            = "dummy",
         .enable          = dummy_enable,
         .update_phy_reg  = dummy_update_phy_reg,
         .set_config_rom  = dummy_set_config_rom,
@@ -507,6 +511,14 @@ static struct fw_card_driver dummy_driver = {
 };
 
 void
+fw_card_release(struct kref *kref)
+{
+        struct fw_card *card = container_of(kref, struct fw_card, kref);
+
+        complete(&card->done);
+}
+
+void
 fw_core_remove_card(struct fw_card *card)
 {
         card->driver->update_phy_reg(card, 4,
@@ -521,12 +533,10 @@ fw_core_remove_card(struct fw_card *card)
         card->driver = &dummy_driver;
 
         fw_destroy_nodes(card);
-        /*
-         * Wait for all device workqueue jobs to finish.  Otherwise the
-         * firewire-core module could be unloaded before the jobs ran.
-         */
-        while (atomic_read(&card->device_count) > 0)
-                msleep(100);
+
+        /* Wait for all users, especially device workqueue jobs, to finish. */
+        fw_card_put(card);
+        wait_for_completion(&card->done);
 
         cancel_delayed_work_sync(&card->work);
         fw_flush_transactions(card);
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index d9c8daf7ae7d..0855fb5568e8 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -168,7 +168,7 @@ static void fw_device_release(struct device *dev)
         fw_node_put(device->node);
         kfree(device->config_rom);
         kfree(device);
-        atomic_dec(&card->device_count);
+        fw_card_put(card);
 }
 
 int fw_device_enable_phys_dma(struct fw_device *device)
@@ -946,8 +946,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
                  */
                 device_initialize(&device->device);
                 atomic_set(&device->state, FW_DEVICE_INITIALIZING);
-                atomic_inc(&card->device_count);
-                device->card = card;
+                device->card = fw_card_get(card);
                 device->node = fw_node_get(node);
                 device->node_id = node->node_id;
                 device->generation = card->generation;
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 5f131f5129da..42305bbac72f 100644
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -62,7 +62,6 @@ struct fw_device {
         bool cmc;
         struct fw_card *card;
         struct device device;
-        struct list_head link;
         struct list_head client_list;
         u32 *config_rom;
         size_t config_rom_length;
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 0b66306af479..333b12544dd1 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -2292,7 +2292,6 @@ ohci_queue_iso(struct fw_iso_context *base,
 }
 
 static const struct fw_card_driver ohci_driver = {
-        .name                   = ohci_driver_name,
         .enable                 = ohci_enable,
         .update_phy_reg         = ohci_update_phy_reg,
         .set_config_rom         = ohci_set_config_rom,
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 03ae8a77c479..40db80752272 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -55,6 +55,9 @@
 #define HEADER_GET_DATA_LENGTH(q)       (((q) >> 16) & 0xffff)
 #define HEADER_GET_EXTENDED_TCODE(q)    (((q) >> 0) & 0xffff)
 
+#define HEADER_DESTINATION_IS_BROADCAST(q) \
+        (((q) & HEADER_DESTINATION(0x3f)) == HEADER_DESTINATION(0x3f))
+
 #define PHY_CONFIG_GAP_COUNT(gap_count) (((gap_count) << 16) | (1 << 22))
 #define PHY_CONFIG_ROOT_ID(node_id)     ((((node_id) & 0x3f) << 24) | (1 << 23))
 #define PHY_IDENTIFIER(id)              ((id) << 30)
@@ -624,12 +627,9 @@ allocate_request(struct fw_packet *p)
 void
 fw_send_response(struct fw_card *card, struct fw_request *request, int rcode)
 {
-        /*
-         * Broadcast packets are reported as ACK_COMPLETE, so this
-         * check is sufficient to ensure we don't send response to
-         * broadcast packets or posted writes.
-         */
-        if (request->ack != ACK_PENDING) {
+        /* unified transaction or broadcast transaction: don't respond */
+        if (request->ack != ACK_PENDING ||
+            HEADER_DESTINATION_IS_BROADCAST(request->request_header[0])) {
                 kfree(request);
                 return;
         }
@@ -817,12 +817,13 @@ handle_registers(struct fw_card *card, struct fw_request *request,
         int reg = offset & ~CSR_REGISTER_BASE;
         unsigned long long bus_time;
         __be32 *data = payload;
+        int rcode = RCODE_COMPLETE;
 
         switch (reg) {
         case CSR_CYCLE_TIME:
         case CSR_BUS_TIME:
                 if (!TCODE_IS_READ_REQUEST(tcode) || length != 4) {
-                        fw_send_response(card, request, RCODE_TYPE_ERROR);
+                        rcode = RCODE_TYPE_ERROR;
                         break;
                 }
 
@@ -831,7 +832,17 @@ handle_registers(struct fw_card *card, struct fw_request *request,
                         *data = cpu_to_be32(bus_time);
                 else
                         *data = cpu_to_be32(bus_time >> 25);
-                fw_send_response(card, request, RCODE_COMPLETE);
+                break;
+
+        case CSR_BROADCAST_CHANNEL:
+                if (tcode == TCODE_READ_QUADLET_REQUEST)
+                        *data = cpu_to_be32(card->broadcast_channel);
+                else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
+                        card->broadcast_channel =
+                            (be32_to_cpu(*data) & BROADCAST_CHANNEL_VALID) |
+                            BROADCAST_CHANNEL_INITIAL;
+                else
+                        rcode = RCODE_TYPE_ERROR;
                 break;
 
         case CSR_BUS_MANAGER_ID:
@@ -850,10 +861,13 @@ handle_registers(struct fw_card *card, struct fw_request *request,
 
         case CSR_BUSY_TIMEOUT:
                 /* FIXME: Implement this. */
+
         default:
-                fw_send_response(card, request, RCODE_ADDRESS_ERROR);
+                rcode = RCODE_ADDRESS_ERROR;
                 break;
         }
+
+        fw_send_response(card, request, rcode);
 }
 
 static struct fw_address_handler registers = {
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 04d3854f6560..2ae1b0d6cb7b 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -19,14 +19,15 @@
 #ifndef __fw_transaction_h
 #define __fw_transaction_h
 
+#include <linux/completion.h>
 #include <linux/device.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/fs.h>
 #include <linux/dma-mapping.h>
 #include <linux/firewire-constants.h>
-#include <asm/atomic.h>
+#include <linux/kref.h>
+#include <linux/list.h>
+#include <linux/spinlock_types.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
 
 #define TCODE_IS_READ_REQUEST(tcode)    (((tcode) & ~1) == 4)
 #define TCODE_IS_BLOCK_PACKET(tcode)    (((tcode) &  1) != 0)
@@ -80,6 +81,9 @@
 #define CSR_SPEED_MAP                   0x2000
 #define CSR_SPEED_MAP_END               0x3000
 
+#define BROADCAST_CHANNEL_INITIAL       (1 << 31 | 31)
+#define BROADCAST_CHANNEL_VALID         (1 << 30)
+
 #define fw_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, ## args)
 #define fw_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
 
@@ -216,7 +220,8 @@ extern struct bus_type fw_bus_type;
 struct fw_card {
         const struct fw_card_driver *driver;
         struct device *device;
-        atomic_t device_count;
+        struct kref kref;
+        struct completion done;
 
         int node_id;
         int generation;
@@ -236,6 +241,7 @@ struct fw_card {
          */
         int self_id_count;
         u32 topology_map[252 + 3];
+        u32 broadcast_channel;
 
         spinlock_t lock; /* Take this lock when handling the lists in
                           * this struct. */
@@ -256,6 +262,20 @@ struct fw_card {
         int bm_generation;
 };
 
+static inline struct fw_card *fw_card_get(struct fw_card *card)
+{
+        kref_get(&card->kref);
+
+        return card;
+}
+
+void fw_card_release(struct kref *kref);
+
+static inline void fw_card_put(struct fw_card *card)
+{
+        kref_put(&card->kref, fw_card_release);
+}
+
 /*
  * The iso packet format allows for an immediate header/payload part
  * stored in 'header' immediately after the packet info plus an
@@ -348,8 +368,6 @@ int
 fw_iso_context_stop(struct fw_iso_context *ctx);
 
 struct fw_card_driver {
-        const char *name;
-
         /*
          * Enable the given card with the given initial config rom.
          * This function is expected to activate the card, and either