Merge branch 'next' into for-linus

Prepare first round of input updates for 3.17.

4 files changed, 15 insertions, 8 deletions

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 7a701a58bbf0..145974f9662b 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,5 +1,6 @@
 menu "IEEE 1394 (FireWire) support"
-        depends on PCI || BROKEN
+        depends on HAS_DMA
+        depends on PCI || COMPILE_TEST
         # firewire-core does not depend on PCI but is
         # not useful without PCI controller driver
 
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
index c98764aeeec6..e1480ff683d2 100644
--- a/drivers/firewire/core.h
+++ b/drivers/firewire/core.h
@@ -118,7 +118,6 @@ int fw_card_add(struct fw_card *card,
                 u32 max_receive, u32 link_speed, u64 guid);
 void fw_core_remove_card(struct fw_card *card);
 int fw_compute_block_crc(__be32 *block);
-void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset);
 void fw_schedule_bm_work(struct fw_card *card, unsigned long delay);
 
 /* -cdev */
@@ -237,8 +236,8 @@ static inline bool is_next_generation(int new_generation, int old_generation)
 
 #define LOCAL_BUS 0xffc0
 
-/* arbitrarily chosen maximum range for physical DMA: 128 TB */
-#define FW_MAX_PHYSICAL_RANGE           (128ULL << 40)
+/* OHCI-1394's default upper bound for physical DMA: 4 GB */
+#define FW_MAX_PHYSICAL_RANGE           (1ULL << 32)
 
 void fw_core_handle_request(struct fw_card *card, struct fw_packet *request);
 void fw_core_handle_response(struct fw_card *card, struct fw_packet *packet);
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 4af0a7bad7f2..c3986452194d 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1462,8 +1462,8 @@ static int fwnet_probe(struct fw_unit *unit,
 
         net = alloc_netdev(sizeof(*dev), "firewire%d", fwnet_init_dev);
         if (net == NULL) {
-                ret = -ENOMEM;
-                goto out;
+                mutex_unlock(&fwnet_device_mutex);
+                return -ENOMEM;
         }
 
         allocated_netdev = true;
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 8db663219560..57985410f12f 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -282,6 +282,7 @@ static char ohci_driver_name[] = KBUILD_MODNAME;
 #define PCI_DEVICE_ID_TI_TSB82AA2       0x8025
 #define PCI_DEVICE_ID_VIA_VT630X        0x3044
 #define PCI_REV_ID_VIA_VT6306           0x46
+#define PCI_DEVICE_ID_VIA_VT6315        0x3403
 
 #define QUIRK_CYCLE_TIMER               0x1
 #define QUIRK_RESET_PACKET              0x2
@@ -334,6 +335,12 @@ static const struct {
         {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT630X, PCI_REV_ID_VIA_VT6306,
                 QUIRK_CYCLE_TIMER | QUIRK_IR_WAKE},
 
+        {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, 0,
+                QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},
+
+        {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, PCI_ANY_ID,
+                0},
+
         {PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID,
                 QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},
 };
@@ -3498,7 +3505,7 @@ static int ohci_flush_iso_completions(struct fw_iso_context *base)
                 }
 
                 clear_bit_unlock(0, &ctx->flushing_completions);
-                smp_mb__after_clear_bit();
+                smp_mb__after_atomic();
         }
 
         tasklet_enable(&ctx->context.tasklet);
@@ -3716,7 +3723,7 @@ static int pci_probe(struct pci_dev *dev,
                     version >> 16, version & 0xff, ohci->card.index,
                     ohci->n_ir, ohci->n_it, ohci->quirks,
                     reg_read(ohci, OHCI1394_PhyUpperBound) ?
-                        ", >4 GB phys DMA" : "");
+                        ", physUB" : "");
 
         return 0;