firewire: wait until PHY configuration packet was transmitted (fix bus reset loop)

We now exit fw_send_phy_config /after/ the PHY config packet has been
transmitted, instead of before.  A subsequent fw_core_initiate_bus_reset
will therefore not overlap with the transmission.  This is meant to make
the send PHY config packet + reset bus routine more deterministic.

Fixes bus reset loop and eventual panic with
  - VIA VT6307 + IOGEAR hub + Unibrain Fire-i camera
    http://bugzilla.kernel.org/show_bug.cgi?id=10128
  - JMicron card

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson@redhat.com>

1 files changed, 25 insertions, 26 deletions

diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 3682e75a09e1..051be78deaba 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -18,6 +18,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <linux/completion.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -294,42 +295,40 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
 }
 EXPORT_SYMBOL(fw_send_request);
 
+struct fw_phy_packet {
+        struct fw_packet packet;
+        struct completion done;
+};
+
 static void
 transmit_phy_packet_callback(struct fw_packet *packet,
                              struct fw_card *card, int status)
 {
-        kfree(packet);
-}
-
-static void send_phy_packet(struct fw_card *card, u32 data, int generation)
-{
-        struct fw_packet *packet;
+        struct fw_phy_packet *p =
+                        container_of(packet, struct fw_phy_packet, packet);
 
-        packet = kzalloc(sizeof(*packet), GFP_ATOMIC);
-        if (packet == NULL)
-                return;
-
-        packet->header[0] = data;
-        packet->header[1] = ~data;
-        packet->header_length = 8;
-        packet->payload_length = 0;
-        packet->speed = SCODE_100;
-        packet->generation = generation;
-        packet->callback = transmit_phy_packet_callback;
-
-        card->driver->send_request(card, packet);
+        complete(&p->done);
 }
 
 void fw_send_phy_config(struct fw_card *card,
                         int node_id, int generation, int gap_count)
 {
-        u32 q;
-
-        q = PHY_IDENTIFIER(PHY_PACKET_CONFIG) |
-                PHY_CONFIG_ROOT_ID(node_id) |
-                PHY_CONFIG_GAP_COUNT(gap_count);
-
-        send_phy_packet(card, q, generation);
+        struct fw_phy_packet p;
+        u32 data = PHY_IDENTIFIER(PHY_PACKET_CONFIG) |
+                   PHY_CONFIG_ROOT_ID(node_id) |
+                   PHY_CONFIG_GAP_COUNT(gap_count);
+
+        p.packet.header[0] = data;
+        p.packet.header[1] = ~data;
+        p.packet.header_length = 8;
+        p.packet.payload_length = 0;
+        p.packet.speed = SCODE_100;
+        p.packet.generation = generation;
+        p.packet.callback = transmit_phy_packet_callback;
+        init_completion(&p.done);
+
+        card->driver->send_request(card, &p.packet);
+        wait_for_completion(&p.done);
 }
 
 void fw_flush_transactions(struct fw_card *card)