lkml.org 
[lkml]   [2018]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 10/31] enic: set DMA mask to 47 bit
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Govindarajulu Varadarajan <gvaradar@cisco.com>

    [ Upstream commit 322eaa06d55ebc1402a4a8d140945cff536638b4 ]

    In commit 624dbf55a359b ("driver/net: enic: Try DMA 64 first, then
    failover to DMA") DMA mask was changed from 40 bits to 64 bits.
    Hardware actually supports only 47 bits.

    Fixes: 624dbf55a359b ("driver/net: enic: Try DMA 64 first, then failover to DMA")
    Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/cisco/enic/enic_main.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/net/ethernet/cisco/enic/enic_main.c
    +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
    @@ -2541,11 +2541,11 @@ static int enic_probe(struct pci_dev *pd
    pci_set_master(pdev);

    /* Query PCI controller on system for DMA addressing
    - * limitation for the device. Try 64-bit first, and
    + * limitation for the device. Try 47-bit first, and
    * fail to 32-bit.
    */

    - err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
    + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(47));
    if (err) {
    err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
    if (err) {
    @@ -2559,10 +2559,10 @@ static int enic_probe(struct pci_dev *pd
    goto err_out_release_regions;
    }
    } else {
    - err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
    + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(47));
    if (err) {
    dev_err(dev, "Unable to obtain %u-bit DMA "
    - "for consistent allocations, aborting\n", 64);
    + "for consistent allocations, aborting\n", 47);
    goto err_out_release_regions;
    }
    using_dac = 1;

    \
     
     \ /
      Last update: 2018-06-12 19:31    [W:2.290 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site