From: Stanislaw Gruszka <sgruszka@redhat.com>
To: Francois Romieu <romieu@fr.zoreil.com>, netdev@vger.kernel.org
Cc: Denis Kirjanov <kirjanov@gmail.com>,
Stanislaw Gruszka <sgruszka@redhat.com>
Subject: [PATCH 6/6] r8169: print errors when dma mapping fail
Date: Fri, 15 Oct 2010 14:15:22 +0200 [thread overview]
Message-ID: <1287144922-3297-6-git-send-email-sgruszka@redhat.com> (raw)
In-Reply-To: <1287144922-3297-1-git-send-email-sgruszka@redhat.com>
Print errors because dma mapping failures can cause device to stop
working and will need user intervention to recover.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/r8169.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 0ef49b4..b27b989 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4022,8 +4022,10 @@ static struct sk_buff *rtl8169_alloc_rx_skb(struct rtl8169_private *tp,
skb_reserve(skb, align ? ((pad - 1) & (unsigned long)skb->data) : pad);
mapping = dma_map_single(d, skb->data, rx_buf_sz, DMA_FROM_DEVICE);
- if (dma_mapping_error(d, mapping))
+ if (dma_mapping_error(d, mapping)) {
+ netif_err(tp, drv, tp->dev, "Failed to map RX DMA!\n");
goto err_free_skb_1;
+ }
rtl8169_map_to_asic(desc, mapping, rx_buf_sz);
@@ -4259,8 +4261,11 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,
len = frag->size;
addr = ((void *) page_address(frag->page)) + frag->page_offset;
mapping = dma_map_single(d, addr, len, DMA_TO_DEVICE);
- if (unlikely(dma_mapping_error(d, mapping)))
+ if (unlikely(dma_mapping_error(d, mapping))) {
+ netif_err(tp, drv, tp->dev,
+ "Failed to map TX fragments DMA!\n");
goto err_out;
+ }
/* anti gcc 2.95.3 bugware (sic) */
status = opts1 | len | (RingEnd * !((entry + 1) % NUM_TX_DESC));
@@ -4326,8 +4331,10 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
len = skb_headlen(skb);
mapping = dma_map_single(d, skb->data, len, DMA_TO_DEVICE);
- if (unlikely(dma_mapping_error(d, mapping)))
+ if (unlikely(dma_mapping_error(d, mapping))) {
+ netif_err(tp, drv, dev, "Failed to map TX DMA!\n");
goto err_stop_0;
+ }
tp->tx_skb[entry].len = len;
txd->addr = cpu_to_le64(mapping);
--
1.7.1
next prev parent reply other threads:[~2010-10-15 12:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-15 12:15 [PATCH 1/6] r8169: check dma mapping failures Stanislaw Gruszka
2010-10-15 12:15 ` [PATCH 2/6] r8169: reduce number of functions arguments Stanislaw Gruszka
2010-10-15 12:15 ` [PATCH 3/6] r8169: replace PCI_DMA_{TO,FROM}DEVICE to DMA_{TO,FROM}_DEVICE Stanislaw Gruszka
2010-10-15 12:15 ` [PATCH 4/6] r8169: introduce some more local variables Stanislaw Gruszka
2010-10-15 12:15 ` [PATCH 5/6] r8169: do not account fragments as packets Stanislaw Gruszka
2010-10-15 12:15 ` Stanislaw Gruszka [this message]
2010-10-15 14:52 ` [PATCH 6/6] r8169: print errors when dma mapping fail Francois Romieu
2010-10-15 15:59 ` Stanislaw Gruszka
2010-10-15 13:41 ` [PATCH 1/6] r8169: check dma mapping failures Francois Romieu
2010-10-15 14:11 ` Stanislaw Gruszka
2010-10-15 14:23 ` Denis Kirjanov
2010-10-18 7:01 ` Stanislaw Gruszka
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=1287144922-3297-6-git-send-email-sgruszka@redhat.com \
--to=sgruszka@redhat.com \
--cc=kirjanov@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=romieu@fr.zoreil.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).