lkml.org 
[lkml]   [2013]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC 06/51] DMA-API: net: intel/ixgb: fix 32-bit DMA mask handling
    Date
    The fallback to 32-bit DMA mask is rather odd:
    err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
    if (!err) {
    err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
    if (!err)
    pci_using_dac = 1;
    } else {
    err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
    if (err) {
    err = dma_set_coherent_mask(&pdev->dev,
    DMA_BIT_MASK(32));
    if (err) {
    pr_err("No usable DMA configuration, aborting\n");
    goto err_dma_mask;
    }
    }
    }
    This means we only set the coherent DMA mask in the fallback path if
    the DMA mask set failed, which is silly. This fixes it to set the
    coherent DMA mask only if dma_set_mask() succeeded, and to error out
    if either fails.

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    ---
    drivers/net/ethernet/intel/ixgb/ixgb_main.c | 16 +++++-----------
    1 files changed, 5 insertions(+), 11 deletions(-)

    diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
    index fce3e92..cf7358c 100644
    --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
    +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
    @@ -408,20 +408,14 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
    return err;

    pci_using_dac = 0;
    - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
    + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
    if (!err) {
    - err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
    - if (!err)
    - pci_using_dac = 1;
    + pci_using_dac = 1;
    } else {
    - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
    + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
    if (err) {
    - err = dma_set_coherent_mask(&pdev->dev,
    - DMA_BIT_MASK(32));
    - if (err) {
    - pr_err("No usable DMA configuration, aborting\n");
    - goto err_dma_mask;
    - }
    + pr_err("No usable DMA configuration, aborting\n");
    + goto err_dma_mask;
    }
    }

    --
    1.7.4.4


    \
     
     \ /
      Last update: 2013-08-02 00:01    [W:4.661 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site