lkml.org 
[lkml]   [2010]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm 4/7] dma-mapping.h: add dma_set_coherent_mask
    Date
    dma_set_coherent_mask corresponds to pci_set_consistent_dma_mask. This
    is necessary to move to the generic device model DMA API from the PCI
    bus specific API in the long term.

    dma_set_coherent_mask works in the exact same way that
    pci_set_consistent_dma_mask does. So this patch also changes
    pci_set_consistent_dma_mask to call dma_set_coherent_mask.

    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: James Bottomley <James.Bottomley@suse.de>
    Cc: David S. Miller <davem@davemloft.net>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Russell King <linux@arm.linux.org.uk>
    ---
    Documentation/DMA-API.txt | 10 ++++++++++
    drivers/pci/pci.c | 7 +++----
    include/linux/dma-mapping.h | 8 ++++++++
    3 files changed, 21 insertions(+), 4 deletions(-)

    diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
    index bd34a62..d7d9eef 100644
    --- a/Documentation/DMA-API.txt
    +++ b/Documentation/DMA-API.txt
    @@ -167,6 +167,16 @@ parameters if it is.

    Returns: 0 if successful and a negative error if not.

    +int
    +dma_set_coherent_mask(struct device *dev, u64 mask)
    +int
    +pci_set_consistent_dma_mask(struct pci_device *dev, u64 mask)
    +
    +Checks to see if the mask is possible and updates the device
    +parameters if it is.
    +
    +Returns: 0 if successful and a negative error if not.
    +
    u64
    dma_get_required_mask(struct device *dev)

    diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
    index 5c881e9..aacb86f 100644
    --- a/drivers/pci/pci.c
    +++ b/drivers/pci/pci.c
    @@ -2131,12 +2131,11 @@ pci_set_dma_mask(struct pci_dev *dev, u64 mask)
    int
    pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
    {
    - if (!pci_dma_supported(dev, mask))
    - return -EIO;
    + int ret = dma_set_coherent_mask(&dev->dev, mask);
    + if (ret)
    + return ret;

    - dev->dev.coherent_dma_mask = mask;
    dev_dbg(&dev->dev, "using %dbit consistent DMA mask\n", fls64(mask));
    -
    return 0;
    }
    #endif
    diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
    index 86e7dc3..599d8e4 100644
    --- a/include/linux/dma-mapping.h
    +++ b/include/linux/dma-mapping.h
    @@ -127,6 +127,14 @@ static inline u64 dma_get_mask(struct device *dev)
    return DMA_BIT_MASK(32);
    }

    +static inline int dma_set_coherent_mask(struct device *dev, u64 mask)
    +{
    + if (!dma_supported(dev, mask))
    + return -EIO;
    + dev->coherent_dma_mask = mask;
    + return 0;
    +}
    +
    extern u64 dma_get_required_mask(struct device *dev);

    static inline unsigned int dma_get_max_seg_size(struct device *dev)
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2010-02-12 10:39    [W:0.024 / U:61.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site