lkml.org 
[lkml]   [2006]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] x86-64: check for valid DMA data direction in the DMA API
    Date
    From
    # HG changeset patch
    # User Muli Ben-Yehuda <mulix@mulix.org>
    # Node ID 2e00371db0e917d63984e01d04742bdf7ef6df2e
    # Parent d87c92af50a18516da5b2384b73adaf71b87923e
    x86-64: check for valid DMA data direction in the DMA API

    Check for a valid DMA data direction before calling the specific
    dma_ops implementation.

    We used to do it in Calgary, Andi requested that it be moved to
    generic code.

    Signed-off-by: Muli Ben-Yehuda <mulix@mulix.org>
    Signed-off-by: Jon Mason <jdmason@us.ibm.com>

    diff -r d87c92af50a1 -r 2e00371db0e9 include/asm-x86_64/dma-mapping.h
    --- a/include/asm-x86_64/dma-mapping.h Sun Mar 26 00:52:23 2006 +0800
    +++ b/include/asm-x86_64/dma-mapping.h Sat Mar 25 22:11:26 2006 +0200
    @@ -56,6 +56,13 @@ extern struct dma_mapping_ops* dma_ops;
    extern struct dma_mapping_ops* dma_ops;
    extern int iommu_merge;

    +static inline int valid_dma_direction(int dma_direction)
    +{
    + return ((dma_direction == DMA_BIDIRECTIONAL) ||
    + (dma_direction == DMA_TO_DEVICE) ||
    + (dma_direction == DMA_FROM_DEVICE));
    +}
    +
    static inline int dma_mapping_error(dma_addr_t dma_addr)
    {
    if (dma_ops->mapping_error)
    @@ -73,6 +80,7 @@ dma_map_single(struct device *hwdev, voi
    dma_map_single(struct device *hwdev, void *ptr, size_t size,
    int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    return dma_ops->map_single(hwdev, ptr, size, direction);
    }

    @@ -80,6 +88,7 @@ dma_unmap_single(struct device *dev, dma
    dma_unmap_single(struct device *dev, dma_addr_t addr,size_t size,
    int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    dma_ops->unmap_single(dev, addr, size, direction);
    }

    @@ -92,6 +101,7 @@ dma_sync_single_for_cpu(struct device *h
    dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
    size_t size, int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    if (dma_ops->sync_single_for_cpu)
    dma_ops->sync_single_for_cpu(hwdev, dma_handle, size,
    direction);
    @@ -102,6 +112,7 @@ dma_sync_single_for_device(struct device
    dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle,
    size_t size, int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    if (dma_ops->sync_single_for_device)
    dma_ops->sync_single_for_device(hwdev, dma_handle, size,
    direction);
    @@ -112,6 +123,7 @@ dma_sync_single_range_for_cpu(struct dev
    dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
    unsigned long offset, size_t size, int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    if (dma_ops->sync_single_range_for_cpu) {
    dma_ops->sync_single_range_for_cpu(hwdev, dma_handle, offset, size, direction);
    }
    @@ -123,6 +135,7 @@ dma_sync_single_range_for_device(struct
    dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle,
    unsigned long offset, size_t size, int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    if (dma_ops->sync_single_range_for_device)
    dma_ops->sync_single_range_for_device(hwdev, dma_handle,
    offset, size, direction);
    @@ -134,6 +147,7 @@ dma_sync_sg_for_cpu(struct device *hwdev
    dma_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
    int nelems, int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    if (dma_ops->sync_sg_for_cpu)
    dma_ops->sync_sg_for_cpu(hwdev, sg, nelems, direction);
    flush_write_buffers();
    @@ -143,6 +157,7 @@ dma_sync_sg_for_device(struct device *hw
    dma_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
    int nelems, int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    if (dma_ops->sync_sg_for_device) {
    dma_ops->sync_sg_for_device(hwdev, sg, nelems, direction);
    }
    @@ -153,6 +168,7 @@ static inline int
    static inline int
    dma_map_sg(struct device *hwdev, struct scatterlist *sg, int nents, int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    return dma_ops->map_sg(hwdev, sg, nents, direction);
    }

    @@ -160,6 +176,7 @@ dma_unmap_sg(struct device *hwdev, struc
    dma_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
    int direction)
    {
    + BUG_ON(!valid_dma_direction(direction));
    dma_ops->unmap_sg(hwdev, sg, nents, direction);
    }

    -
    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-03-25 22:44    [W:0.028 / U:31.792 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site