* [PATCH 0/3] r8169 driver fixes
@ 2011-02-03 17:26 Francois Romieu
2011-02-03 19:01 ` Ivan Vecera
2011-02-03 23:18 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Francois Romieu @ 2011-02-03 17:26 UTC (permalink / raw)
To: davem; +Cc: netdev, Ivan Vecera, Hayes Wang
The following series includes Ivan Rx fifo overflow fix and similar
changes I did after testing with various 8168 chipsets.
The series is available as
git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6.git r8169-davem
Distance from 'master' (2ba451421b23636c45fabfa522858c5c124b3673)
-----------------------------------------------------------------
0331b3b022b9724019e4c42fded4a01eaa6946f5
407786ae1960eef585f97bfa7625a36512925de0
e4b6fa3d3d3db4fac32904ae12efe199de8efed0
Diffstat
--------
drivers/net/r8169.c | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
Shortlog
--------
Francois Romieu (2):
r8169: RxFIFO overflow oddities with 8168 chipsets
r8169: prevent RxFIFO induced loops in the irq handler.
Ivan Vecera (1):
r8169: use RxFIFO overflow workaround for 8168c chipset
Patch
-----
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bde7d61..59ccf0c 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -973,7 +973,8 @@ static void __rtl8169_check_link_status(struct net_device *dev,
if (pm)
pm_request_resume(&tp->pci_dev->dev);
netif_carrier_on(dev);
- netif_info(tp, ifup, dev, "link up\n");
+ if (net_ratelimit())
+ netif_info(tp, ifup, dev, "link up\n");
} else {
netif_carrier_off(dev);
netif_info(tp, ifdown, dev, "link down\n");
@@ -3757,7 +3758,8 @@ static void rtl_hw_start_8168(struct net_device *dev)
RTL_W16(IntrMitigate, 0x5151);
/* Work around for RxFIFO overflow. */
- if (tp->mac_version == RTL_GIGA_MAC_VER_11) {
+ if (tp->mac_version == RTL_GIGA_MAC_VER_11 ||
+ tp->mac_version == RTL_GIGA_MAC_VER_22) {
tp->intr_event |= RxFIFOOver | PCSTimeout;
tp->intr_event &= ~RxOverflow;
}
@@ -4639,12 +4641,33 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
break;
}
- /* Work around for rx fifo overflow */
- if (unlikely(status & RxFIFOOver) &&
- (tp->mac_version == RTL_GIGA_MAC_VER_11)) {
- netif_stop_queue(dev);
- rtl8169_tx_timeout(dev);
- break;
+ if (unlikely(status & RxFIFOOver)) {
+ switch (tp->mac_version) {
+ /* Work around for rx fifo overflow */
+ case RTL_GIGA_MAC_VER_11:
+ case RTL_GIGA_MAC_VER_22:
+ case RTL_GIGA_MAC_VER_26:
+ netif_stop_queue(dev);
+ rtl8169_tx_timeout(dev);
+ goto done;
+ /* Testers needed. */
+ case RTL_GIGA_MAC_VER_17:
+ case RTL_GIGA_MAC_VER_19:
+ case RTL_GIGA_MAC_VER_20:
+ case RTL_GIGA_MAC_VER_21:
+ case RTL_GIGA_MAC_VER_23:
+ case RTL_GIGA_MAC_VER_24:
+ case RTL_GIGA_MAC_VER_27:
+ case RTL_GIGA_MAC_VER_28:
+ /* Experimental science. Pktgen proof. */
+ case RTL_GIGA_MAC_VER_12:
+ case RTL_GIGA_MAC_VER_25:
+ if (status == RxFIFOOver)
+ goto done;
+ break;
+ default:
+ break;
+ }
}
if (unlikely(status & SYSErr)) {
@@ -4680,7 +4703,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
(status & RxFIFOOver) ? (status | RxOverflow) : status);
status = RTL_R16(IntrStatus);
}
-
+done:
return IRQ_RETVAL(handled);
}
--
Ueimor
祝你 新年快乐,兔年吉祥,心想事成,事事顺利, 万事如意,恭喜发财 !
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] r8169 driver fixes
2011-02-03 17:26 [PATCH 0/3] r8169 driver fixes Francois Romieu
@ 2011-02-03 19:01 ` Ivan Vecera
2011-02-03 23:18 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: Ivan Vecera @ 2011-02-03 19:01 UTC (permalink / raw)
To: Francois Romieu; +Cc: davem, netdev, Hayes Wang
On Thu, 2011-02-03 at 18:26 +0100, Francois Romieu wrote:
> The following series includes Ivan Rx fifo overflow fix and similar
> changes I did after testing with various 8168 chipsets.
>
> The series is available as
> git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6.git r8169-davem
>
> Distance from 'master' (2ba451421b23636c45fabfa522858c5c124b3673)
> -----------------------------------------------------------------
>
> 0331b3b022b9724019e4c42fded4a01eaa6946f5
> 407786ae1960eef585f97bfa7625a36512925de0
> e4b6fa3d3d3db4fac32904ae12efe199de8efed0
>
> Diffstat
> --------
>
> drivers/net/r8169.c | 41 ++++++++++++++++++++++++++++++++---------
> 1 files changed, 32 insertions(+), 9 deletions(-)
>
> Shortlog
> --------
>
> Francois Romieu (2):
> r8169: RxFIFO overflow oddities with 8168 chipsets
> r8169: prevent RxFIFO induced loops in the irq handler.
>
> Ivan Vecera (1):
> r8169: use RxFIFO overflow workaround for 8168c chipset
>
Looks good.
Ivan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] r8169 driver fixes
2011-02-03 17:26 [PATCH 0/3] r8169 driver fixes Francois Romieu
2011-02-03 19:01 ` Ivan Vecera
@ 2011-02-03 23:18 ` David Miller
2011-02-03 23:55 ` Francois Romieu
1 sibling, 1 reply; 5+ messages in thread
From: David Miller @ 2011-02-03 23:18 UTC (permalink / raw)
To: romieu; +Cc: netdev, ivecera, hayeswang
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 3 Feb 2011 18:26:11 +0100
> The following series includes Ivan Rx fifo overflow fix and similar
> changes I did after testing with various 8168 chipsets.
>
> The series is available as
> git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6.git r8169-davem
These are bug fixes, but this GIT branch is based upon net-next-2.6,
what is the intent here?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] r8169 driver fixes
2011-02-03 23:18 ` David Miller
@ 2011-02-03 23:55 ` Francois Romieu
2011-02-04 0:11 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Francois Romieu @ 2011-02-03 23:55 UTC (permalink / raw)
To: David Miller; +Cc: netdev, ivecera, hayeswang
David Miller <davem@davemloft.net> :
> These are bug fixes, but this GIT branch is based upon net-next-2.6,
> what is the intent here?
It should have been based on $(git merge-base master net-2.6) instead
of net-ext-2.6.
I'll rebase it after some sleep.
--
Ueimor
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] r8169 driver fixes
2011-02-03 23:55 ` Francois Romieu
@ 2011-02-04 0:11 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2011-02-04 0:11 UTC (permalink / raw)
To: romieu; +Cc: netdev, ivecera, hayeswang
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Fri, 4 Feb 2011 00:55:00 +0100
> David Miller <davem@davemloft.net> :
>> These are bug fixes, but this GIT branch is based upon net-next-2.6,
>> what is the intent here?
>
> It should have been based on $(git merge-base master net-2.6) instead
> of net-ext-2.6.
>
> I'll rebase it after some sleep.
Ok, thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-04 0:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-03 17:26 [PATCH 0/3] r8169 driver fixes Francois Romieu
2011-02-03 19:01 ` Ivan Vecera
2011-02-03 23:18 ` David Miller
2011-02-03 23:55 ` Francois Romieu
2011-02-04 0:11 ` David Miller
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.