Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

solos-pci: Fix DMA support

commit b4bd8ad 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 <>
Signed-off-by: David S. Miller <>
Signed-off-by: Ben Hutchings <>
  • Loading branch information...
commit 190fcdc0cc35d3eb01a97d9558c6132be0a97475 1 parent e837ca1
@dwmw2 dwmw2 authored Ben Hutchings committed
Showing with 3 additions and 1 deletion.
  1. +3 −1 drivers/atm/solos-pci.c
4 drivers/atm/solos-pci.c
@@ -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;
card->config_regs + TX_DMA_ADDR(port));
@@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
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;
Please sign in to comment.
Something went wrong with that request. Please try again.