Commit 884d2b84 authored by David Wu's avatar David Wu Committed by David S. Miller
Browse files

net: stmmac: Add GFP_DMA32 for rx buffers if no 64 capability 



Use page_pool_alloc_pages instead of page_pool_dev_alloc_pages, which
can give the gfp parameter, in the case of not supporting 64-bit width,
using 32-bit address memory can reduce a copy from swiotlb.

Signed-off-by: default avatarDavid Wu <david.wu@rock-chips.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d33dae51

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+12 −4
Original line number Diff line number Diff line
@@ -1461,16 +1461,20 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p, 
{

	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];

	struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];

	gfp_t gfp = (GFP_ATOMIC | __GFP_NOWARN);



	if (priv->dma_cap.addr64 <= 32)

		gfp |= GFP_DMA32;



	if (!buf->page) {

		buf->page = page_pool_dev_alloc_pages(rx_q->page_pool);

		buf->page = page_pool_alloc_pages(rx_q->page_pool, gfp);

		if (!buf->page)

			return -ENOMEM;

		buf->page_offset = stmmac_rx_offset(priv);

	}



	if (priv->sph && !buf->sec_page) {

		buf->sec_page = page_pool_dev_alloc_pages(rx_q->page_pool);

		buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);

		if (!buf->sec_page)

			return -ENOMEM;
@@ -4482,6 +4486,10 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue) 
	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];

	int dirty = stmmac_rx_dirty(priv, queue);

	unsigned int entry = rx_q->dirty_rx;

	gfp_t gfp = (GFP_ATOMIC | __GFP_NOWARN);



	if (priv->dma_cap.addr64 <= 32)

		gfp |= GFP_DMA32;



	while (dirty-- > 0) {

		struct stmmac_rx_buffer *buf = &rx_q->buf_pool[entry];
@@ -4494,13 +4502,13 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue) 
			p = rx_q->dma_rx + entry;



		if (!buf->page) {

			buf->page = page_pool_dev_alloc_pages(rx_q->page_pool);

			buf->page = page_pool_alloc_pages(rx_q->page_pool, gfp);

			if (!buf->page)

				break;

		}



		if (priv->sph && !buf->sec_page) {

			buf->sec_page = page_pool_dev_alloc_pages(rx_q->page_pool);

			buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);

			if (!buf->sec_page)

				break;