Commit b4bd8ad9 authored May 24, 2012 by David Woodhouse Committed by David S. Miller May 24, 2012

solos-pci: Fix DMA support



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>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f935f3f8

drivers/atm/solos-pci.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_card *card)
		} 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));
		}
		@@ -1153,6 +1154,7 @@ static int fpga_probe(struct pci_dev dev, const struct pci_device_id id)
		}

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