aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-06-05 14:49:38 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-06-18 18:12:34 -0400
commite896ec4302f45fdaf2fc78aec0093eca5478fe28 (patch)
tree2fe7eb6553d17401477cb8ae27bd0d9bb43386fe
parentccff962943df539c5860aa120eecc189d70a308b (diff)
firewire: fw-ohci: disable PHY packet reception into AR context
We want the rcvPhyPkt bit in LinkControl off before we start using the chip. However, the spec says that the reset value of it is undefined. Hence switch it explicitly off. https://bugzilla.redhat.com/show_bug.cgi?id=244576#c48 shows that for example the nForce2 integrated FireWire controller seems to have it on by default. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jarod Wilson <jwilson@redhat.com>
-rw-r--r--drivers/firewire/fw-ohci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index b062e736b786..481d3f3e2ef7 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1473,6 +1473,8 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
1473 reg_write(ohci, OHCI1394_HCControlClear, 1473 reg_write(ohci, OHCI1394_HCControlClear,
1474 OHCI1394_HCControl_noByteSwapData); 1474 OHCI1394_HCControl_noByteSwapData);
1475 1475
1476 reg_write(ohci, OHCI1394_LinkControlClear,
1477 OHCI1394_LinkControl_rcvPhyPkt);
1476 reg_write(ohci, OHCI1394_LinkControlSet, 1478 reg_write(ohci, OHCI1394_LinkControlSet,
1477 OHCI1394_LinkControl_rcvSelfID | 1479 OHCI1394_LinkControl_rcvSelfID |
1478 OHCI1394_LinkControl_cycleTimerEnable | 1480 OHCI1394_LinkControl_cycleTimerEnable |