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

Commit c519fe9a authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

bnxt: add dma mapping attributes 



On the SPARC platform we need to use the DMA_ATTR_WEAK_ORDERING attribute
in our Rx path dma mapping in order to get the expected performance out
of the receive path.  Adding it to the Tx path has little effect, so
that's not a part of this patch.

Signed-off-by: default avatarShannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: default avatarTushar Dave <tushar.n.dave@oracle.com>
Reviewed-by: default avatarTom Saeger <tom.saeger@oracle.com>
Acked-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9efa27bf

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+34 −22
Original line number Diff line number Diff line
@@ -582,7 +582,8 @@ static struct page *__bnxt_alloc_rx_page(struct bnxt *bp, dma_addr_t *mapping, 
	if (!page)

		return NULL;



	*mapping = dma_map_page(dev, page, 0, PAGE_SIZE, bp->rx_dir);

	*mapping = dma_map_page_attrs(dev, page, 0, PAGE_SIZE, bp->rx_dir,

				      DMA_ATTR_WEAK_ORDERING);

	if (dma_mapping_error(dev, *mapping)) {

		__free_page(page);

		return NULL;
@@ -601,8 +602,9 @@ static inline u8 *__bnxt_alloc_rx_data(struct bnxt *bp, dma_addr_t *mapping, 
	if (!data)

		return NULL;



	*mapping = dma_map_single(&pdev->dev, data + bp->rx_dma_offset,

				  bp->rx_buf_use_size, bp->rx_dir);

	*mapping = dma_map_single_attrs(&pdev->dev, data + bp->rx_dma_offset,

					bp->rx_buf_use_size, bp->rx_dir,

					DMA_ATTR_WEAK_ORDERING);



	if (dma_mapping_error(&pdev->dev, *mapping)) {

		kfree(data);
@@ -705,8 +707,9 @@ static inline int bnxt_alloc_rx_page(struct bnxt *bp, 
			return -ENOMEM;

	}



	mapping = dma_map_page(&pdev->dev, page, offset, BNXT_RX_PAGE_SIZE,

			       PCI_DMA_FROMDEVICE);

	mapping = dma_map_page_attrs(&pdev->dev, page, offset,

				     BNXT_RX_PAGE_SIZE, PCI_DMA_FROMDEVICE,

				     DMA_ATTR_WEAK_ORDERING);

	if (dma_mapping_error(&pdev->dev, mapping)) {

		__free_page(page);

		return -EIO;
@@ -799,7 +802,8 @@ static struct sk_buff *bnxt_rx_page_skb(struct bnxt *bp, 
		return NULL;

	}

	dma_addr -= bp->rx_dma_offset;

	dma_unmap_page(&bp->pdev->dev, dma_addr, PAGE_SIZE, bp->rx_dir);

	dma_unmap_page_attrs(&bp->pdev->dev, dma_addr, PAGE_SIZE, bp->rx_dir,

			     DMA_ATTR_WEAK_ORDERING);



	if (unlikely(!payload))

		payload = eth_get_headlen(data_ptr, len);
@@ -841,8 +845,8 @@ static struct sk_buff *bnxt_rx_skb(struct bnxt *bp, 
	}



	skb = build_skb(data, 0);

	dma_unmap_single(&bp->pdev->dev, dma_addr, bp->rx_buf_use_size,

			 bp->rx_dir);

	dma_unmap_single_attrs(&bp->pdev->dev, dma_addr, bp->rx_buf_use_size,

			       bp->rx_dir, DMA_ATTR_WEAK_ORDERING);

	if (!skb) {

		kfree(data);

		return NULL;
@@ -909,8 +913,9 @@ static struct sk_buff *bnxt_rx_pages(struct bnxt *bp, struct bnxt_napi *bnapi, 
			return NULL;

		}



		dma_unmap_page(&pdev->dev, mapping, BNXT_RX_PAGE_SIZE,

			       PCI_DMA_FROMDEVICE);

		dma_unmap_page_attrs(&pdev->dev, mapping, BNXT_RX_PAGE_SIZE,

				     PCI_DMA_FROMDEVICE,

				     DMA_ATTR_WEAK_ORDERING);



		skb->data_len += frag_len;

		skb->len += frag_len;
@@ -1329,8 +1334,9 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp, 
		tpa_info->mapping = new_mapping;



		skb = build_skb(data, 0);

		dma_unmap_single(&bp->pdev->dev, mapping, bp->rx_buf_use_size,

				 bp->rx_dir);

		dma_unmap_single_attrs(&bp->pdev->dev, mapping,

				       bp->rx_buf_use_size, bp->rx_dir,

				       DMA_ATTR_WEAK_ORDERING);



		if (!skb) {

			kfree(data);
@@ -1971,9 +1977,11 @@ static void bnxt_free_rx_skbs(struct bnxt *bp) 
				if (!data)

					continue;



				dma_unmap_single(&pdev->dev, tpa_info->mapping,

				dma_unmap_single_attrs(&pdev->dev,

						       tpa_info->mapping,

						       bp->rx_buf_use_size,

						 bp->rx_dir);

						       bp->rx_dir,

						       DMA_ATTR_WEAK_ORDERING);



				tpa_info->data = NULL;
@@ -1993,13 +2001,15 @@ static void bnxt_free_rx_skbs(struct bnxt *bp) 


			if (BNXT_RX_PAGE_MODE(bp)) {

				mapping -= bp->rx_dma_offset;

				dma_unmap_page(&pdev->dev, mapping,

					       PAGE_SIZE, bp->rx_dir);

				dma_unmap_page_attrs(&pdev->dev, mapping,

						     PAGE_SIZE, bp->rx_dir,

						     DMA_ATTR_WEAK_ORDERING);

				__free_page(data);

			} else {

				dma_unmap_single(&pdev->dev, mapping,

				dma_unmap_single_attrs(&pdev->dev, mapping,

						       bp->rx_buf_use_size,

						 bp->rx_dir);

						       bp->rx_dir,

						       DMA_ATTR_WEAK_ORDERING);

				kfree(data);

			}

		}
@@ -2012,8 +2022,10 @@ static void bnxt_free_rx_skbs(struct bnxt *bp) 
			if (!page)

				continue;



			dma_unmap_page(&pdev->dev, rx_agg_buf->mapping,

				       BNXT_RX_PAGE_SIZE, PCI_DMA_FROMDEVICE);

			dma_unmap_page_attrs(&pdev->dev, rx_agg_buf->mapping,

					     BNXT_RX_PAGE_SIZE,

					     PCI_DMA_FROMDEVICE,

					     DMA_ATTR_WEAK_ORDERING);



			rx_agg_buf->page = NULL;

			__clear_bit(j, rxr->rx_agg_bmap);