aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-02-28 14:54:43 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-04-18 11:55:33 -0400
commit080de8c2c57e3199eee837fe8b6d35a43679f8c1 (patch)
treeb376f9ce74db61393ef1cb62e9663c71f0ba45b9 /drivers/firewire
parent17cff9ff871bb5081cade4f99a9e9382b9f1c01c (diff)
firewire: fw-ohci: add option for remote debugging
This way firewire-ohci can be used for remote debugging like ohci1394. Version with amendment from Fri, 11 Apr 2008 00:08:08 +0200. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Acked-by: Bernhard Kaindl <bk@suse.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-ohci.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 07d6053ff57e..5da7c6715e1e 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1097,6 +1097,11 @@ static void bus_reset_tasklet(unsigned long data)
1097 reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header); 1097 reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header);
1098 } 1098 }
1099 1099
1100#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA
1101 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
1102 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
1103#endif
1104
1100 spin_unlock_irqrestore(&ohci->lock, flags); 1105 spin_unlock_irqrestore(&ohci->lock, flags);
1101 1106
1102 if (free_rom) 1107 if (free_rom)
@@ -1435,6 +1440,9 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet)
1435static int 1440static int
1436ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) 1441ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation)
1437{ 1442{
1443#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA
1444 return 0;
1445#else
1438 struct fw_ohci *ohci = fw_ohci(card); 1446 struct fw_ohci *ohci = fw_ohci(card);
1439 unsigned long flags; 1447 unsigned long flags;
1440 int n, retval = 0; 1448 int n, retval = 0;
@@ -1466,6 +1474,7 @@ ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation)
1466 out: 1474 out:
1467 spin_unlock_irqrestore(&ohci->lock, flags); 1475 spin_unlock_irqrestore(&ohci->lock, flags);
1468 return retval; 1476 return retval;
1477#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */
1469} 1478}
1470 1479
1471static u64 1480static u64