lkml.org 
[lkml]   [2012]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 16/82] solos-pci: Fix DMA support
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: David Woodhouse <dwmw2@infradead.org>

    commit b4bd8ad9bb311e8536f726f7a633620ccd358cde upstream.

    DMA support has finally made its way to the top of the TODO list, having
    realised that a Geode using MMIO can't keep up with two ADSL2+ lines
    each running at 21Mb/s.

    This patch fixes a couple of bugs in the DMA support in the driver, so
    once the corresponding FPGA update is complete and tested everything
    should work properly.

    We weren't storing the currently-transmitting skb, so we were never
    unmapping it and never freeing/popping it when the TX was done.
    And the addition of pci_set_master() is fairly self-explanatory.

    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/atm/solos-pci.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/atm/solos-pci.c
    +++ b/drivers/atm/solos-pci.c
    @@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_car
    } else if (skb && card->using_dma) {
    SKB_CB(skb)->dma_addr = pci_map_single(card->dev, skb->data,
    skb->len, PCI_DMA_TODEVICE);
    + card->tx_skb[port] = skb;
    iowrite32(SKB_CB(skb)->dma_addr,
    card->config_regs + TX_DMA_ADDR(port));
    }
    @@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *de
    db_fpga_upgrade = db_firmware_upgrade = 0;
    }

    - if (card->fpga_version >= DMA_SUPPORTED){
    + if (card->fpga_version >= DMA_SUPPORTED) {
    + pci_set_master(dev);
    card->using_dma = 1;
    } else {
    card->using_dma = 0;



    \
     
     \ /
      Last update: 2012-06-07 08:43    [W:4.172 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site