lkml.org 
[lkml]   [2008]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[GIT PULL] IEEE 1394 regression fix
    Linus, please pull from the for-linus branch at

    git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus

    to receive the following IEEE 1394/ FireWire subsystem update.

    It's telling. I didn't run-time test the ieee1394 part of the post
    2.6.24 patch queue on anything but i386...

    Stefan Richter (1):
    ieee1394: sbp2: fix bogus s/g access change


    drivers/ieee1394/sbp2.c | 5 ++---
    1 files changed, 2 insertions(+), 3 deletions(-)

    commit 5fcf500058d5f06720302c5ce138c7bca93f7655
    Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Date: Fri Feb 1 22:31:10 2008 +0100

    ieee1394: sbp2: fix bogus s/g access change

    sg_dma_len(sg) is invalid before the s/g list is DMA-mapped.

    This fixes a post 2.6.24 regression which prevents access to SBP-2
    devices on several architectures, introduced by "ieee1394: sbp2: s/g
    list access cosmetics", commit 825f1df545ab0289185373b0eaf06fb0b3487422.

    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

    diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
    index 2b889d9..28e155a 100644
    --- a/drivers/ieee1394/sbp2.c
    +++ b/drivers/ieee1394/sbp2.c
    @@ -1465,10 +1465,9 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,
    orb->misc |= ORB_SET_DIRECTION(orb_direction);

    /* special case if only one element (and less than 64KB in size) */
    - if ((scsi_use_sg == 1) &&
    - (sg_dma_len(sg) <= SBP2_MAX_SG_ELEMENT_LENGTH)) {
    + if (scsi_use_sg == 1 && sg->length <= SBP2_MAX_SG_ELEMENT_LENGTH) {

    - cmd->dma_size = sg_dma_len(sg);
    + cmd->dma_size = sg->length;
    cmd->dma_type = CMD_DMA_PAGE;
    cmd->cmd_dma = dma_map_page(hi->host->device.parent,
    sg_page(sg), sg->offset,
    --
    Stefan Richter
    -=====-==--- --=- ---=-
    http://arcgraph.de/sr/


    \
     
     \ /
      Last update: 2008-02-02 14:07    [W:0.024 / U:0.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site