1 files changed, 36 insertions, 32 deletions

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 14bb7b7b5dd7..b1c11775839c 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -64,6 +64,7 @@ struct client {
         struct idr resource_idr;
         struct list_head event_list;
         wait_queue_head_t wait;
+        wait_queue_head_t tx_flush_wait;
         u64 bus_reset_closure;
 
         struct fw_iso_context *iso_context;
@@ -140,7 +141,6 @@ struct iso_resource {
         int generation;
         u64 channels;
         s32 bandwidth;
-        __be32 transaction_data[2];
         struct iso_resource_event *e_alloc, *e_dealloc;
 };
 
@@ -149,7 +149,7 @@ static void release_iso_resource(struct client *, struct client_resource *);
 static void schedule_iso_resource(struct iso_resource *r, unsigned long delay)
 {
         client_get(r->client);
-        if (!schedule_delayed_work(&r->work, delay))
+        if (!queue_delayed_work(fw_workqueue, &r->work, delay))
                 client_put(r->client);
 }
 
@@ -251,6 +251,7 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
         idr_init(&client->resource_idr);
         INIT_LIST_HEAD(&client->event_list);
         init_waitqueue_head(&client->wait);
+        init_waitqueue_head(&client->tx_flush_wait);
         INIT_LIST_HEAD(&client->phy_receiver_link);
         kref_init(&client->kref);
 
@@ -520,10 +521,6 @@ static int release_client_resource(struct client *client, u32 handle,
 static void release_transaction(struct client *client,
                                 struct client_resource *resource)
 {
-        struct outbound_transaction_resource *r = container_of(resource,
-                        struct outbound_transaction_resource, resource);
-
-        fw_cancel_transaction(client->device->card, &r->transaction);
 }
 
 static void complete_transaction(struct fw_card *card, int rcode,
@@ -540,22 +537,9 @@ static void complete_transaction(struct fw_card *card, int rcode,
                 memcpy(rsp->data, payload, rsp->length);
 
         spin_lock_irqsave(&client->lock, flags);
-        /*
-         * 1. If called while in shutdown, the idr tree must be left untouched.
-         *    The idr handle will be removed and the client reference will be
-         *    dropped later.
-         * 2. If the call chain was release_client_resource ->
-         *    release_transaction -> complete_transaction (instead of a normal
-         *    conclusion of the transaction), i.e. if this resource was already
-         *    unregistered from the idr, the client reference will be dropped
-         *    by release_client_resource and we must not drop it here.
-         */
-        if (!client->in_shutdown &&
-            idr_find(&client->resource_idr, e->r.resource.handle)) {
-                idr_remove(&client->resource_idr, e->r.resource.handle);
-                /* Drop the idr's reference */
-                client_put(client);
-        }
+        idr_remove(&client->resource_idr, e->r.resource.handle);
+        if (client->in_shutdown)
+                wake_up(&client->tx_flush_wait);
         spin_unlock_irqrestore(&client->lock, flags);
 
         rsp->type = FW_CDEV_EVENT_RESPONSE;
@@ -575,7 +559,7 @@ static void complete_transaction(struct fw_card *card, int rcode,
                 queue_event(client, &e->event, rsp, sizeof(*rsp) + rsp->length,
                             NULL, 0);
 
-        /* Drop the transaction callback's reference */
+        /* Drop the idr's reference */
         client_put(client);
 }
 
@@ -614,9 +598,6 @@ static int init_request(struct client *client,
         if (ret < 0)
                 goto failed;
 
-        /* Get a reference for the transaction callback */
-        client_get(client);
-
         fw_send_request(client->device->card, &e->r.transaction,
                         request->tcode, destination_id, request->generation,
                         speed, request->offset, e->response.data,
@@ -1126,6 +1107,7 @@ static int ioctl_queue_iso(struct client *client, union ioctl_arg *arg)
                 payload += u.packet.payload_length;
                 count++;
         }
+        fw_iso_context_queue_flush(ctx);
 
         a->size    -= uptr_to_u64(p) - a->packets;
         a->packets  = uptr_to_u64(p);
@@ -1223,7 +1205,8 @@ static void iso_resource_work(struct work_struct *work)
         todo = r->todo;
         /* Allow 1000ms grace period for other reallocations. */
         if (todo == ISO_RES_ALLOC &&
-            time_is_after_jiffies(client->device->card->reset_jiffies + HZ)) {
+            time_before64(get_jiffies_64(),
+                          client->device->card->reset_jiffies + HZ)) {
                 schedule_iso_resource(r, DIV_ROUND_UP(HZ, 3));
                 skip = true;
         } else {
@@ -1246,8 +1229,7 @@ static void iso_resource_work(struct work_struct *work)
                         r->channels, &channel, &bandwidth,
                         todo == ISO_RES_ALLOC ||
                         todo == ISO_RES_REALLOC ||
-                        todo == ISO_RES_ALLOC_ONCE,
-                        r->transaction_data);
+                        todo == ISO_RES_ALLOC_ONCE);
         /*
          * Is this generation outdated already?  As long as this resource sticks
          * in the idr, it will be scheduled again for a newer generation or at
@@ -1501,9 +1483,10 @@ static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg)
         e->client               = client;
         e->p.speed              = SCODE_100;
         e->p.generation         = a->generation;
-        e->p.header[0]          = a->data[0];
-        e->p.header[1]          = a->data[1];
-        e->p.header_length      = 8;
+        e->p.header[0]          = TCODE_LINK_INTERNAL << 4;
+        e->p.header[1]          = a->data[0];
+        e->p.header[2]          = a->data[1];
+        e->p.header_length      = 12;
         e->p.callback           = outbound_phy_packet_callback;
         e->phy_packet.closure   = a->closure;
         e->phy_packet.type      = FW_CDEV_EVENT_PHY_PACKET_SENT;
@@ -1677,6 +1660,25 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
         return ret;
 }
 
+static int is_outbound_transaction_resource(int id, void *p, void *data)
+{
+        struct client_resource *resource = p;
+
+        return resource->release == release_transaction;
+}
+
+static int has_outbound_transactions(struct client *client)
+{
+        int ret;
+
+        spin_lock_irq(&client->lock);
+        ret = idr_for_each(&client->resource_idr,
+                           is_outbound_transaction_resource, NULL);
+        spin_unlock_irq(&client->lock);
+
+        return ret;
+}
+
 static int shutdown_resource(int id, void *p, void *data)
 {
         struct client_resource *resource = p;
@@ -1712,6 +1714,8 @@ static int fw_device_op_release(struct inode *inode, struct file *file)
         client->in_shutdown = true;
         spin_unlock_irq(&client->lock);
 
+        wait_event(client->tx_flush_wait, !has_outbound_transactions(client));
+
         idr_for_each(&client->resource_idr, shutdown_resource, client);
         idr_remove_all(&client->resource_idr);
         idr_destroy(&client->resource_idr);