Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices

Re-enable posted writes for status FIFO.

Besides bringing back a very minor bandwidth tweak from Linux 2.6.15.x
and older, this also fixes an interoperability regression since 2.6.16:

http://bugzilla.kernel.org/show_bug.cgi?id=6356
(sbp2: scsi_add_device failed. IEEE1394 HD is not working anymore.)

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Tested-by: Vanei Heidemann <linux@javanei.com.br>
Tested-by: Martin Putzlocher <mputzi@gmx.de> (chip type unconfirmed)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Stefan Richter and committed by
Linus Torvalds
a54c9d30 679c0cd2

+8 -3
+1 -1
drivers/ieee1394/ohci1394.c
··· 553 553 * register content. 554 554 * To actually enable physical responses is the job of our interrupt 555 555 * handler which programs the physical request filter. */ 556 - reg_write(ohci, OHCI1394_PhyUpperBound, 0xffff0000); 556 + reg_write(ohci, OHCI1394_PhyUpperBound, 0x01000000); 557 557 558 558 DBGMSG("physUpperBoundOffset=%08x", 559 559 reg_read(ohci, OHCI1394_PhyUpperBound));
+7 -2
drivers/ieee1394/sbp2.c
··· 835 835 836 836 /* Register the status FIFO address range. We could use the same FIFO 837 837 * for targets at different nodes. However we need different FIFOs per 838 - * target in order to support multi-unit devices. */ 838 + * target in order to support multi-unit devices. 839 + * The FIFO is located out of the local host controller's physical range 840 + * but, if possible, within the posted write area. Status writes will 841 + * then be performed as unified transactions. This slightly reduces 842 + * bandwidth usage, and some Prolific based devices seem to require it. 843 + */ 839 844 scsi_id->status_fifo_addr = hpsb_allocate_and_register_addrspace( 840 845 &sbp2_highlevel, ud->ne->host, &sbp2_ops, 841 846 sizeof(struct sbp2_status_block), sizeof(quadlet_t), 842 - ~0ULL, ~0ULL); 847 + 0x010000000000ULL, CSR1212_ALL_SPACE_END); 843 848 if (!scsi_id->status_fifo_addr) { 844 849 SBP2_ERR("failed to allocate status FIFO address range"); 845 850 goto failed_alloc;