Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 40 insertions, 19 deletions

diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index be0492398ef9..29d2423fae6d 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -75,6 +75,15 @@ static size_t config_rom_length = 1 + 4 + 1 + 1;
 #define BIB_IRMC                ((1) << 31)
 #define NODE_CAPABILITIES       0x0c0083c0 /* per IEEE 1394 clause 8.3.2.6.5.2 */
 
+/*
+ * IEEE-1394 specifies a default SPLIT_TIMEOUT value of 800 cycles (100 ms),
+ * but we have to make it longer because there are many devices whose firmware
+ * is just too slow for that.
+ */
+#define DEFAULT_SPLIT_TIMEOUT   (2 * 8000)
+
+#define CANON_OUI               0x000085
+
 static void generate_config_rom(struct fw_card *card, __be32 *config_rom)
 {
         struct fw_descriptor *desc;
@@ -219,8 +228,8 @@ void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset)
 
         /* Use an arbitrary short delay to combine multiple reset requests. */
         fw_card_get(card);
-        if (!schedule_delayed_work(&card->br_work,
-                                   delayed ? DIV_ROUND_UP(HZ, 100) : 0))
+        if (!queue_delayed_work(fw_workqueue, &card->br_work,
+                                delayed ? DIV_ROUND_UP(HZ, 100) : 0))
                 fw_card_put(card);
 }
 EXPORT_SYMBOL(fw_schedule_bus_reset);
@@ -231,8 +240,8 @@ static void br_work(struct work_struct *work)
 
         /* Delay for 2s after last reset per IEEE 1394 clause 8.2.1. */
         if (card->reset_jiffies != 0 &&
-            time_is_after_jiffies(card->reset_jiffies + 2 * HZ)) {
-                if (!schedule_delayed_work(&card->br_work, 2 * HZ))
+            time_before64(get_jiffies_64(), card->reset_jiffies + 2 * HZ)) {
+                if (!queue_delayed_work(fw_workqueue, &card->br_work, 2 * HZ))
                         fw_card_put(card);
                 return;
         }
@@ -249,8 +258,7 @@ static void allocate_broadcast_channel(struct fw_card *card, int generation)
 
         if (!card->broadcast_channel_allocated) {
                 fw_iso_resource_manage(card, generation, 1ULL << 31,
-                                       &channel, &bandwidth, true,
-                                       card->bm_transaction_data);
+                                       &channel, &bandwidth, true);
                 if (channel != 31) {
                         fw_notify("failed to allocate broadcast channel\n");
                         return;
@@ -284,6 +292,8 @@ static void bm_work(struct work_struct *work)
         bool root_device_is_running;
         bool root_device_is_cmc;
         bool irm_is_1394_1995_only;
+        bool keep_this_irm;
+        __be32 transaction_data[2];
 
         spin_lock_irq(&card->lock);
 
@@ -305,11 +315,16 @@ static void bm_work(struct work_struct *work)
         irm_is_1394_1995_only = irm_device && irm_device->config_rom &&
                         (irm_device->config_rom[2] & 0x000000f0) == 0;
 
+        /* Canon MV5i works unreliably if it is not root node. */
+        keep_this_irm = irm_device && irm_device->config_rom &&
+                        irm_device->config_rom[3] >> 8 == CANON_OUI;
+
         root_id  = root_node->node_id;
         irm_id   = card->irm_node->node_id;
         local_id = card->local_node->node_id;
 
-        grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 8));
+        grace = time_after64(get_jiffies_64(),
+                             card->reset_jiffies + DIV_ROUND_UP(HZ, 8));
 
         if ((is_next_generation(generation, card->bm_generation) &&
              !card->bm_abdicate) ||
@@ -333,28 +348,28 @@ static void bm_work(struct work_struct *work)
                         goto pick_me;
                 }
 
-                if (irm_is_1394_1995_only) {
+                if (irm_is_1394_1995_only && !keep_this_irm) {
                         new_root_id = local_id;
                         fw_notify("%s, making local node (%02x) root.\n",
                                   "IRM is not 1394a compliant", new_root_id);
                         goto pick_me;
                 }
 
-                card->bm_transaction_data[0] = cpu_to_be32(0x3f);
-                card->bm_transaction_data[1] = cpu_to_be32(local_id);
+                transaction_data[0] = cpu_to_be32(0x3f);
+                transaction_data[1] = cpu_to_be32(local_id);
 
                 spin_unlock_irq(&card->lock);
 
                 rcode = fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP,
                                 irm_id, generation, SCODE_100,
                                 CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
-                                card->bm_transaction_data, 8);
+                                transaction_data, 8);
 
                 if (rcode == RCODE_GENERATION)
                         /* Another bus reset, BM work has been rescheduled. */
                         goto out;
 
-                bm_id = be32_to_cpu(card->bm_transaction_data[0]);
+                bm_id = be32_to_cpu(transaction_data[0]);
 
                 spin_lock_irq(&card->lock);
                 if (rcode == RCODE_COMPLETE && generation == card->generation)
@@ -382,7 +397,7 @@ static void bm_work(struct work_struct *work)
 
                 spin_lock_irq(&card->lock);
 
-                if (rcode != RCODE_COMPLETE) {
+                if (rcode != RCODE_COMPLETE && !keep_this_irm) {
                         /*
                          * The lock request failed, maybe the IRM
                          * isn't really IRM capable after all. Let's
@@ -475,11 +490,11 @@ static void bm_work(struct work_struct *work)
                 /*
                  * Make sure that the cycle master sends cycle start packets.
                  */
-                card->bm_transaction_data[0] = cpu_to_be32(CSR_STATE_BIT_CMSTR);
+                transaction_data[0] = cpu_to_be32(CSR_STATE_BIT_CMSTR);
                 rcode = fw_run_transaction(card, TCODE_WRITE_QUADLET_REQUEST,
                                 root_id, generation, SCODE_100,
                                 CSR_REGISTER_BASE + CSR_STATE_SET,
-                                card->bm_transaction_data, 4);
+                                transaction_data, 4);
                 if (rcode == RCODE_GENERATION)
                         goto out;
         }
@@ -504,10 +519,11 @@ void fw_card_initialize(struct fw_card *card,
         card->device = device;
         card->current_tlabel = 0;
         card->tlabel_mask = 0;
-        card->split_timeout_hi = 0;
-        card->split_timeout_lo = 800 << 19;
-        card->split_timeout_cycles = 800;
-        card->split_timeout_jiffies = DIV_ROUND_UP(HZ, 10);
+        card->split_timeout_hi = DEFAULT_SPLIT_TIMEOUT / 8000;
+        card->split_timeout_lo = (DEFAULT_SPLIT_TIMEOUT % 8000) << 19;
+        card->split_timeout_cycles = DEFAULT_SPLIT_TIMEOUT;
+        card->split_timeout_jiffies =
+                        DIV_ROUND_UP(DEFAULT_SPLIT_TIMEOUT * HZ, 8000);
         card->color = 0;
         card->broadcast_channel = BROADCAST_CHANNEL_INITIAL;
 
@@ -614,6 +630,10 @@ static int dummy_queue_iso(struct fw_iso_context *ctx, struct fw_iso_packet *p,
         return -ENODEV;
 }
 
+static void dummy_flush_queue_iso(struct fw_iso_context *ctx)
+{
+}
+
 static const struct fw_card_driver dummy_driver_template = {
         .read_phy_reg           = dummy_read_phy_reg,
         .update_phy_reg         = dummy_update_phy_reg,
@@ -625,6 +645,7 @@ static const struct fw_card_driver dummy_driver_template = {
         .start_iso              = dummy_start_iso,
         .set_iso_channels       = dummy_set_iso_channels,
         .queue_iso              = dummy_queue_iso,
+        .flush_queue_iso        = dummy_flush_queue_iso,
 };
 
 void fw_card_release(struct kref *kref)