Attachment 872299 Details for Bug 1010764 – r8169 RTL8110s pacchetto

[patch] r8169 RTL8110s pacchetto

r8169-RTL8110s-xmit-v2.patch (text/plain), 2.71 KB, created by poma on 2014-03-08 23:14:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-03-08 23:14:58 UTC

Size: 2.71 KB

patch

obsolete

>diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
>index e977965..583ea4f 100644
>--- a/drivers/net/ethernet/realtek/r8169.c
>+++ b/drivers/net/ethernet/realtek/r8169.c
>@@ -5811,7 +5811,7 @@ static void rtl8169_unmap_tx_skb(struct device *d, struct ring_info *tx_skb,
> 
> 	dma_unmap_single(d, le64_to_cpu(desc->addr), len, DMA_TO_DEVICE);
> 
>-	desc->opts1 = 0x00;
>+	desc->opts1 &= cpu_to_le32(RingEnd);
> 	desc->opts2 = 0x00;
> 	desc->addr = 0x00;
> 	tx_skb->len = 0;
>@@ -5870,10 +5870,42 @@ static void rtl_reset_work(struct rtl8169_private *tp)
> 	rtl8169_check_link_status(dev, tp, tp->mmio_addr);
> }
> 
>+static void rtl_desc_trace(struct rtl8169_private *tp, int start, u32 *data)
>+{
>+	netif_info(tp, drv, tp->dev,
>+		   "%02x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
>+		   start,
>+		   data[ 0], data[ 4], data[ 8], data[12],
>+		   data[16], data[20], data[24], data[28]);
>+}
>+
>+static void rtl_tx_ring_trace(struct rtl8169_private *tp)
>+{
>+	int i, start = 0;
>+
>+	netif_info(tp, drv, tp->dev,
>+		   "Tx dirty: %08x (%02x), Tx current: %08x (%02x)\n",
>+		   tp->dirty_tx, tp->dirty_tx % NUM_TX_DESC,
>+		   tp->cur_tx, tp->cur_tx % NUM_TX_DESC);
>+
>+	for (i = 0; i < NUM_TX_DESC / 8; i++) {
>+		u32 *data = &tp->TxDescArray[start].opts1;
>+		int j;
>+
>+		for (j = 0; j < 4; j++)
>+			rtl_desc_trace(tp, start, data++);
>+		netif_info(tp, drv, tp->dev, "\n");
>+
>+		start += 8;
>+	}
>+}
>+
> static void rtl8169_tx_timeout(struct net_device *dev)
> {
> 	struct rtl8169_private *tp = netdev_priv(dev);
> 
>+	rtl_tx_ring_trace(tp);
>+
> 	rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
> }
> 
>@@ -6009,6 +6041,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
> 	txd->addr = cpu_to_le64(mapping);
> 
> 	frags = rtl8169_xmit_frags(tp, skb, opts);
>+	// netif_info(tp, drv, tp->dev, "frags: %d\n", frags);
> 	if (frags < 0)
> 		goto err_dma_1;
> 	else if (frags)
>@@ -6022,14 +6055,14 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
> 
> 	skb_tx_timestamp(skb);
> 
>-	wmb();
>+	tp->cur_tx += frags + 1;
>+
>+	smp_wmb();
> 
> 	/* Anti gcc 2.95.3 bugware (sic) */
> 	status = opts[0] | len | (RingEnd * !((entry + 1) % NUM_TX_DESC));
> 	txd->opts1 = cpu_to_le32(status);
> 
>-	tp->cur_tx += frags + 1;
>-
> 	wmb();
> 
> 	RTL_W8(TxPoll, NPQ);
>@@ -6135,6 +6168,11 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
> 		if (status & DescOwn)
> 			break;
> 
>+		if (!status) {
>+			netif_info(tp, tx_done, dev, "Tx miss: %03d\n", entry);
>+			break;
>+		}
>+
> 		rtl8169_unmap_tx_skb(&tp->pci_dev->dev, tx_skb,
> 				     tp->TxDescArray + entry);
> 		if (status & LastFrag) {
>@@ -6552,6 +6590,8 @@ static int rtl_open(struct net_device *dev)
> 
> 	rtl_hw_start(dev);
> 
>+	rtl_tx_ring_trace(tp);
>+
> 	netif_start_queue(dev);
> 
> 	rtl_unlock_work(tp);

Actions: View | Diff

Attachments on bug 1010764: 801474 | 841611 | 847435 | 864436 | 864438 | 864439 | 864959 | 864960 | 864961 | 864962 | 864963 | 864964 | 872287 | 872299