lkml.org 
[lkml]   [2006]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 06/11] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Stefan Richter <stefanr@s5r6.in-berlin.de>

    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: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---

    drivers/ieee1394/ohci1394.c | 2 +-
    drivers/ieee1394/sbp2.c | 9 +++++++--
    2 files changed, 8 insertions(+), 3 deletions(-)

    --- linux-2.6.16.19.orig/drivers/ieee1394/ohci1394.c
    +++ linux-2.6.16.19/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.19.orig/drivers/ieee1394/sbp2.c
    +++ linux-2.6.16.19/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;
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-06-02 21:55    [W:0.021 / U:32.160 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site