All of lore.kernel.org
 help / color / mirror / Atom feed
From: WingMan Kwok <w-kwok2@ti.com>
To: <davem@davemloft.net>, <m-karicheri2@ti.com>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: WingMan Kwok <w-kwok2@ti.com>, "Reece R. Pollack" <x0183204@ti.com>
Subject: [PATCH 2/2] net: netcp: Allocate RX packet buffers using __GFP_DMA
Date: Wed, 29 Jul 2015 11:10:53 -0400	[thread overview]
Message-ID: <1438182653-2136-2-git-send-email-w-kwok2@ti.com> (raw)
In-Reply-To: <1438182653-2136-1-git-send-email-w-kwok2@ti.com>

The Keystone II DMA hardware can only access addresses in the
lower 2 GiB of SDRAM. This patch makes sure the RX buffers are
allocated using the __GFP_DMA flag so they meet this requirement.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
Signed-off-by: Reece R. Pollack <x0183204@ti.com>
---
 drivers/net/ethernet/ti/netcp_core.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 2d07701..39c68df 100644
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -820,11 +820,13 @@ static void netcp_allocate_rx_buf(struct netcp_intf *netcp, int fdq)
 				SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
 
 		if (primary_buf_len <= PAGE_SIZE) {
-			bufptr = netdev_alloc_frag(primary_buf_len);
+			bufptr = __netdev_alloc_frag(primary_buf_len,
+						     GFP_ATOMIC | __GFP_COLD |
+						     __GFP_DMA);
 			pad[1] = primary_buf_len;
 		} else {
 			bufptr = kmalloc(primary_buf_len, GFP_ATOMIC |
-					 GFP_DMA32 | __GFP_COLD);
+					 __GFP_COLD | __GFP_DMA);
 			pad[1] = 0;
 		}
 
@@ -838,9 +840,10 @@ static void netcp_allocate_rx_buf(struct netcp_intf *netcp, int fdq)
 
 	} else {
 		/* Allocate a secondary receive queue entry */
-		page = alloc_page(GFP_ATOMIC | GFP_DMA32 | __GFP_COLD);
+		page = alloc_page(GFP_ATOMIC | __GFP_COLD | __GFP_DMA);
 		if (unlikely(!page)) {
-			dev_warn_ratelimited(netcp->ndev_dev, "Secondary page alloc failed\n");
+			dev_warn_ratelimited(netcp->ndev_dev,
+					     "Secondary page alloc failed\n");
 			goto fail;
 		}
 		buf_len = PAGE_SIZE;
-- 
1.7.9.5


  reply	other threads:[~2015-07-29 15:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-29 15:10 [PATCH 1/2] net: Export __netdev_alloc_frag() to allow gfp_mask flags WingMan Kwok
2015-07-29 15:10 ` WingMan Kwok [this message]
2015-07-29 20:59   ` [PATCH 2/2] net: netcp: Allocate RX packet buffers using __GFP_DMA Eric Dumazet
2015-07-29 21:22     ` Murali Karicheri
2015-07-29 16:31 ` [PATCH 1/2] net: Export __netdev_alloc_frag() to allow gfp_mask flags Eric Dumazet
2015-07-29 20:22   ` Murali Karicheri
2015-07-29 20:37     ` Eric Dumazet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438182653-2136-2-git-send-email-w-kwok2@ti.com \
    --to=w-kwok2@ti.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m-karicheri2@ti.com \
    --cc=netdev@vger.kernel.org \
    --cc=x0183204@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.