ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices
PATCH 1/1 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 <[email protected]>
Tested-by Vanei Heidemann <[email protected]>
---
rediff for -stable, from commit a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e
drivers/ieee1394/ohci1394.c +1 -1
@@ -2525,7 +2525,7 @@ static irqreturn_t ohci_irq_handler(intif (phys_dma) {reg_write (ohci,OHCI1394_PhyReqFilterHiSet,0xffffffff );reg_write (ohci,OHCI1394_PhyReqFilterLoSet,0xffffffff ); -reg_write (ohci,OHCI1394_PhyUpperBound,0xffff0000 ); +reg_write (ohci,OHCI1394_PhyUpperBound,0x01000000 ); }else {reg_write (ohci,OHCI1394_PhyReqFilterHiSet,0x00000000 );reg_write (ohci,OHCI1394_PhyReqFilterLoSet,0x00000000 );
drivers/ieee1394/sbp2.c +7 -2
@@ -754,11 +754,16 @@ static struct scsi_id_instance_data *sbp/* Register the status FIFO address range. We could use the same FIFO * for targets at different nodes. However we need different FIFOs per -* target in order to support multi-unit devices. */ +* target in order to support multi-unit devices. +* The FIFO is located out of the local host controller's physical range +* but, if possible, within the posted write area. Status writes will +* then be performed as unified transactions. This slightly reduces +* bandwidth usage, and some Prolific based devices seem to require it. +*/ scsi_id->status_fifo_addr =hpsb_allocate_and_register_addrspace ( &sbp2_highlevel, ud->ne->host, &sbp2_ops,sizeof (struct sbp2_status_block ),sizeof (quadlet_t), - ~0ULL , ~0ULL ); +0x010000000000ULL ,CSR1212_ALL_SPACE_END );if (!scsi_id->status_fifo_addr) {SBP2_ERR ("failed to allocate status FIFO address range" ); goto failed_alloc;