Skip to contentSkip to conversation

firewire: fw-ohci: clear LinkControl register when enabling the chip

PATCH New Stefan Richter 3 participants 6 messages May 31, 2008 – Jun 13, 2008 Firewire

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firewire: fw-ohci: clear LinkControl register when enabling the chip

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 (and all other bits while we are at 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.

---
 drivers/firewire/fw-ohci.c |    1 +
 1 file changed, 1 insertion(+)
drivers/firewire/fw-ohci.c +1 -0
Index: linux/drivers/firewire/fw-ohci.c
===================================================================
@@ -1473,6 +1473,7 @@ static int ohci_enable(struct fw_card *c
 	reg_write(ohci, OHCI1394_HCControlClear,
 		  OHCI1394_HCControl_noByteSwapData);
 
+	reg_write(ohci, OHCI1394_LinkControlClear, ~0);
 	reg_write(ohci, OHCI1394_LinkControlSet,
 		  OHCI1394_LinkControl_rcvSelfID |
 		  OHCI1394_LinkControl_cycleTimerEnable |
Signature · 3 lines
Stefan Richter
-=====-==--- -==- ----=
http://arcgraph.de/sr/
#1 lore raw

PATCH 1/1 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.

---

Supersedes patch "fw-ohci: clear LinkControl register when enabling the chip". Changed from ~0 to OHCI1394_LinkControl_rcvPhyPkt bit only.

 drivers/firewire/fw-ohci.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/firewire/fw-ohci.c +2 -0
Index: linux/drivers/firewire/fw-ohci.c
===================================================================
@@ -1473,6 +1473,8 @@ static int ohci_enable(struct fw_card *c
 	reg_write(ohci, OHCI1394_HCControlClear,
 		  OHCI1394_HCControl_noByteSwapData);
 
+	reg_write(ohci, OHCI1394_LinkControlClear,
+		  OHCI1394_LinkControl_rcvPhyPkt);
 	reg_write(ohci, OHCI1394_LinkControlSet,
 		  OHCI1394_LinkControl_rcvSelfID |
 		  OHCI1394_LinkControl_cycleTimerEnable |
Signature · 3 lines
Stefan Richter
-=====-==--- -==- --=-=
http://arcgraph.de/sr/
#2 lore raw

PATCH 1/1 firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID

OHCI 1.1 clause 5.10 requires that selfIDBufferPtr is valid when a 1 is written into LinkControl.rcvSelfID.

This driver bug has so far not been known to cause harm because most chips obviously accept a later selfIDBufferPtr write.

---
 drivers/firewire/fw-ohci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firewire/fw-ohci.c +1 -1
Index: linux/drivers/firewire/fw-ohci.c
===================================================================
@@ -1473,6 +1473,7 @@ static int ohci_enable(struct fw_card *c
 	reg_write(ohci, OHCI1394_HCControlClear,
 		  OHCI1394_HCControl_noByteSwapData);
 
+	reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->self_id_bus);
 	reg_write(ohci, OHCI1394_LinkControlClear,
 		  OHCI1394_LinkControl_rcvPhyPkt);
 	reg_write(ohci, OHCI1394_LinkControlSet,
@@ -1488,7 +1489,6 @@ static int ohci_enable(struct fw_card *c
 	ar_context_run(&ohci->ar_request_ctx);
 	ar_context_run(&ohci->ar_response_ctx);
 
-	reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->self_id_bus);
 	reg_write(ohci, OHCI1394_PhyUpperBound, 0x00010000);
 	reg_write(ohci, OHCI1394_IntEventClear, ~0);
 	reg_write(ohci, OHCI1394_IntMaskClear, ~0);
Signature · 3 lines
Stefan Richter
-=====-==--- -==- --=-=
http://arcgraph.de/sr/
#3 lore raw

Re: [PATCH] firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID

Quoted 7 lines · Stefan Richter

OHCI 1.1 clause 5.10 requires that selfIDBufferPtr is valid when a 1 is written into LinkControl.rcvSelfID.

This driver bug has so far not been known to cause harm because most chips obviously accept a later selfIDBufferPtr write.

I vaguely recall discussing this one before. Doesn't seem to have caused any problems in practice, but yeah, should go ahead and be more spec compliant here.

Signature · 2 lines
Jarod Wilson
[email protected]
#4 lore raw

Re: [PATCH] firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID

In reply to Stefan Richter
Quoted 7 lines · Stefan Richter

OHCI 1.1 clause 5.10 requires that selfIDBufferPtr is valid when a 1 is written into LinkControl.rcvSelfID.

This driver bug has so far not been known to cause harm because most chips obviously accept a later selfIDBufferPtr write.

Yeah, good point. I think it also caused no harm because we set it up before enabling the link. But your change definitely looks good.

#5 lore raw

Re: [PATCH] firewire: fw-ohci: disable PHY packet reception into AR context

In reply to Stefan Richter
Quoted 9 lines · Stefan Richter

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.

Good catch.

Signature · 2 lines
Jarod Wilson
[email protected]