Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 348bc2a6 authored by Linas Vepstas's avatar Linas Vepstas Committed by Jeff Garzik
Browse files

[PATCH] powerpc/cell spidernet DMA direction fix 



The ring buffer descriptors are DMA-accessed bidirectionally,
but are not declared in this way.  Fix this.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: James K Lewis <jklewis@us.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 66c09716

drivers/net/spider_net.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -301,7 +301,7 @@ static int 
spider_net_init_chain(struct spider_net_card *card,

spider_net_init_chain(struct spider_net_card *card,

		       struct spider_net_descr_chain *chain,

		       struct spider_net_descr_chain *chain,

		       struct spider_net_descr *start_descr,

		       struct spider_net_descr *start_descr,

		       int direction, int no)

		       int no)

{

{

	int i;

	int i;

	struct spider_net_descr *descr;

	struct spider_net_descr *descr;
@@ -316,7 +316,7 @@ spider_net_init_chain(struct spider_net_card *card, 




		buf = pci_map_single(card->pdev, descr,

		buf = pci_map_single(card->pdev, descr,

				     SPIDER_NET_DESCR_SIZE,

				     SPIDER_NET_DESCR_SIZE,

				     direction);

				     PCI_DMA_BIDIRECTIONAL);





		if (pci_dma_mapping_error(buf))

		if (pci_dma_mapping_error(buf))

			goto iommu_error;

			goto iommu_error;
@@ -330,11 +330,6 @@ spider_net_init_chain(struct spider_net_card *card, 
	(descr-1)->next = start_descr;

	(descr-1)->next = start_descr;

	start_descr->prev = descr-1;

	start_descr->prev = descr-1;





	descr = start_descr;

	if (direction == PCI_DMA_FROMDEVICE)

		for (i=0; i < no; i++, descr++)

			descr->next_descr_addr = descr->next->bus_addr;



	spin_lock_init(&chain->lock);

	spin_lock_init(&chain->lock);

	chain->head = start_descr;

	chain->head = start_descr;

	chain->tail = start_descr;

	chain->tail = start_descr;
@@ -347,7 +342,7 @@ spider_net_init_chain(struct spider_net_card *card, 
		if (descr->bus_addr)

		if (descr->bus_addr)

			pci_unmap_single(card->pdev, descr->bus_addr,

			pci_unmap_single(card->pdev, descr->bus_addr,

					 SPIDER_NET_DESCR_SIZE,

					 SPIDER_NET_DESCR_SIZE,

					 direction);

					 PCI_DMA_BIDIRECTIONAL);

	return -ENOMEM;

	return -ENOMEM;

}

}
@@ -368,7 +363,7 @@ spider_net_free_rx_chain_contents(struct spider_net_card *card) 
			dev_kfree_skb(descr->skb);

			dev_kfree_skb(descr->skb);

			pci_unmap_single(card->pdev, descr->buf_addr,

			pci_unmap_single(card->pdev, descr->buf_addr,

					 SPIDER_NET_MAX_FRAME,

					 SPIDER_NET_MAX_FRAME,

					 PCI_DMA_FROMDEVICE);

					 PCI_DMA_BIDIRECTIONAL);

		}

		}

		descr = descr->next;

		descr = descr->next;

	}

	}
@@ -1662,11 +1657,12 @@ int 
spider_net_open(struct net_device *netdev)

spider_net_open(struct net_device *netdev)

{

{

	struct spider_net_card *card = netdev_priv(netdev);

	struct spider_net_card *card = netdev_priv(netdev);

	int result;

	struct spider_net_descr *descr;

	int i, result;





	result = -ENOMEM;

	result = -ENOMEM;

	if (spider_net_init_chain(card, &card->tx_chain, card->descr,

	if (spider_net_init_chain(card, &card->tx_chain, card->descr,

			PCI_DMA_TODEVICE, card->num_tx_desc))

	                          card->num_tx_desc))

		goto alloc_tx_failed;

		goto alloc_tx_failed;





	card->low_watermark = NULL;

	card->low_watermark = NULL;
@@ -1674,9 +1670,13 @@ spider_net_open(struct net_device *netdev) 
	/* rx_chain is after tx_chain, so offset is descr + tx_count */

	/* rx_chain is after tx_chain, so offset is descr + tx_count */

	if (spider_net_init_chain(card, &card->rx_chain,

	if (spider_net_init_chain(card, &card->rx_chain,

	                          card->descr + card->num_tx_desc,

	                          card->descr + card->num_tx_desc,

			PCI_DMA_FROMDEVICE, card->num_rx_desc))

	                          card->num_rx_desc))

		goto alloc_rx_failed;

		goto alloc_rx_failed;





	descr = card->rx_chain.head;

	for (i=0; i < card->num_rx_desc; i++, descr++)

		descr->next_descr_addr = descr->next->bus_addr;



	/* allocate rx skbs */

	/* allocate rx skbs */

	if (spider_net_alloc_rx_skbs(card))

	if (spider_net_alloc_rx_skbs(card))

		goto alloc_skbs_failed;

		goto alloc_skbs_failed;