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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 12 insertions, 3 deletions

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 1cd637ef62d2..5e6f42789afe 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -42,6 +42,10 @@
 #define CSR_BROADCAST_CHANNEL           0x234
 #define CSR_CONFIG_ROM                  0x400
 #define CSR_CONFIG_ROM_END              0x800
+#define CSR_OMPR                        0x900
+#define CSR_OPCR(i)                     (0x904 + (i) * 4)
+#define CSR_IMPR                        0x980
+#define CSR_IPCR(i)                     (0x984 + (i) * 4)
 #define CSR_FCP_COMMAND                 0xB00
 #define CSR_FCP_RESPONSE                0xD00
 #define CSR_FCP_END                     0xF00
@@ -89,7 +93,7 @@ struct fw_card {
         int current_tlabel;
         u64 tlabel_mask;
         struct list_head transaction_list;
-        unsigned long reset_jiffies;
+        u64 reset_jiffies;
 
         u32 split_timeout_hi;
         u32 split_timeout_lo;
@@ -121,7 +125,6 @@ struct fw_card {
         struct delayed_work bm_work; /* bus manager job */
         int bm_retries;
         int bm_generation;
-        __be32 bm_transaction_data[2];
         int bm_node_id;
         bool bm_abdicate;
 
@@ -302,9 +305,9 @@ struct fw_packet {
 struct fw_transaction {
         int node_id; /* The generation is implied; it is always the current. */
         int tlabel;
-        int timestamp;
         struct list_head link;
         struct fw_card *card;
+        bool is_split_transaction;
         struct timer_list split_timeout_timer;
 
         struct fw_packet packet;
@@ -437,9 +440,15 @@ int fw_iso_context_queue(struct fw_iso_context *ctx,
                          struct fw_iso_packet *packet,
                          struct fw_iso_buffer *buffer,
                          unsigned long payload);
+void fw_iso_context_queue_flush(struct fw_iso_context *ctx);
 int fw_iso_context_start(struct fw_iso_context *ctx,
                          int cycle, int sync, int tags);
 int fw_iso_context_stop(struct fw_iso_context *ctx);
 void fw_iso_context_destroy(struct fw_iso_context *ctx);
+void fw_iso_resource_manage(struct fw_card *card, int generation,
+                            u64 channels_mask, int *channel, int *bandwidth,
+                            bool allocate);
+
+extern struct workqueue_struct *fw_workqueue;
 
 #endif /* _LINUX_FIREWIRE_H */