Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit affc9c24 authored by Stefan Richter's avatar Stefan Richter
Browse files

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, at least before
HCControl.linkEnable is written.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJarod Wilson <jwilson@redhat.com>
Signed-off-by: default avatarKristian Høgsberg <krh@redhat.com>
parent e896ec43

drivers/firewire/fw-ohci.c

+1 −1
Original line number Diff line number Diff line
@@ -1473,6 +1473,7 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length) 
	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 *card, u32 *config_rom, size_t length) 
	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);