From: Chris Wright Date: Tue, 30 May 2006 23:46:47 +0000 (-0700) Subject: ohci1394, sbp2 fix for scsi_add_device failed with PL-3507 based devices X-Git-Tag: v2.6.16.19~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f64034102eca2f8ed4233ea35bc30af8310cb8cd;p=thirdparty%2Fkernel%2Fstable-queue.git ohci1394, sbp2 fix for scsi_add_device failed with PL-3507 based devices --- diff --git a/queue-2.6.16/ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch b/queue-2.6.16/ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch new file mode 100644 index 00000000000..99b1bbe1411 --- /dev/null +++ b/queue-2.6.16/ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch @@ -0,0 +1,55 @@ +From stable-bounces@linux.kernel.org Sat May 27 05:15:34 2006 +Date: Sat, 27 May 2006 14:11:18 +0200 (CEST) +From: Stefan Richter +To: stable@kernel.org +Cc: linux-kernel@vger.kernel.org +Subject: 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 +Tested-by: Vanei Heidemann +Tested-by: Martin Putzlocher (chip type unconfirmed) +Signed-off-by: Chris Wright +--- + + drivers/ieee1394/ohci1394.c | 2 +- + drivers/ieee1394/sbp2.c | 9 +++++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +--- linux-2.6.16.18.orig/drivers/ieee1394/ohci1394.c ++++ linux-2.6.16.18/drivers/ieee1394/ohci1394.c +@@ -2525,7 +2525,7 @@ static irqreturn_t ohci_irq_handler(int + if (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); +--- linux-2.6.16.18.orig/drivers/ieee1394/sbp2.c ++++ linux-2.6.16.18/drivers/ieee1394/sbp2.c +@@ -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; diff --git a/queue-2.6.16/series b/queue-2.6.16/series index aa58f66102e..4b5280a918f 100644 --- a/queue-2.6.16/series +++ b/queue-2.6.16/series @@ -3,3 +3,4 @@ altix-correct-ioc3-port-order.patch cpuset-might-sleep-checking-zones-allowed-fix.patch powermac-force-only-suspend-to-disk-to-be-valid.patch input-psmouse-fix-new-device-detection-logic.patch +ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch