lkml.org 
[lkml]   [2007]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[22/50] Fix DAC960 driver on machines which dont support 64-bit DMA

    From: Matthew Wilcox <matthew@wil.cx>

    commit 868047fcbb85dbb44ddd98c336fef83236a2c06a in mainline.

    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8942

    Use PCI_DMA_* constants instead of own private definitions Fall back to
    32-bit DMA mask if a 64-bit one fails

    Signed-off-by: Matthew Wilcox <matthew@wil.cx>
    Acked-by: Jeff Garzik <jeff@garzik.org>
    Tested-by: Lars <polynomial-c@gmx.de>
    Cc: Alessandro Polverini <alex@nibbles.it>
    Cc: <dac@conglom-o.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/block/DAC960.c | 17 ++++++++++-------
    drivers/block/DAC960.h | 7 -------
    2 files changed, 10 insertions(+), 14 deletions(-)

    --- a/drivers/block/DAC960.c
    +++ b/drivers/block/DAC960.c
    @@ -17,8 +17,8 @@
    */


    -#define DAC960_DriverVersion "2.5.48"
    -#define DAC960_DriverDate "14 May 2006"
    +#define DAC960_DriverVersion "2.5.49"
    +#define DAC960_DriverDate "21 Aug 2007"


    #include <linux/module.h>
    @@ -1165,9 +1165,9 @@ static bool DAC960_V1_EnableMemoryMailbo
    int i;


    - if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V1_PciDmaMask))
    + if (pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
    return DAC960_Failure(Controller, "DMA mask out of range");
    - Controller->BounceBufferLimit = DAC690_V1_PciDmaMask;
    + Controller->BounceBufferLimit = DMA_32BIT_MASK;

    if ((hw_type == DAC960_PD_Controller) || (hw_type == DAC960_P_Controller)) {
    CommandMailboxesSize = 0;
    @@ -1368,9 +1368,12 @@ static bool DAC960_V2_EnableMemoryMailbo
    dma_addr_t CommandMailboxDMA;
    DAC960_V2_CommandStatus_T CommandStatus;

    - if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V2_PciDmaMask))
    - return DAC960_Failure(Controller, "DMA mask out of range");
    - Controller->BounceBufferLimit = DAC690_V2_PciDmaMask;
    + if (!pci_set_dma_mask(Controller->PCIDevice, DMA_64BIT_MASK))
    + Controller->BounceBufferLimit = DMA_64BIT_MASK;
    + else if (!pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
    + Controller->BounceBufferLimit = DMA_32BIT_MASK;
    + else
    + return DAC960_Failure(Controller, "DMA mask out of range");

    /* This is a temporary dma mapping, used only in the scope of this function */
    CommandMailbox = pci_alloc_consistent(PCI_Device,
    --- a/drivers/block/DAC960.h
    +++ b/drivers/block/DAC960.h
    @@ -61,13 +61,6 @@
    #define DAC960_V2_MaxPhysicalDevices 272

    /*
    - Define the pci dma mask supported by DAC960 V1 and V2 Firmware Controlers
    - */
    -
    -#define DAC690_V1_PciDmaMask 0xffffffff
    -#define DAC690_V2_PciDmaMask 0xffffffffffffffffULL
    -
    -/*
    Define a 32/64 bit I/O Address data type.
    */

    --
    -
    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: 2007-09-24 18:53    [W:4.750 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site