* [PATCH 2/2] [sky2] Fix for interrupt handler
@ 2012-07-04 9:38 Mirko Lindner
2012-10-25 22:36 ` Jonathan Nieder
0 siblings, 1 reply; 6+ messages in thread
From: Mirko Lindner @ 2012-07-04 9:38 UTC (permalink / raw)
To: davem; +Cc: shemminger, netdev
Re-enable interrupts if it is not our interrupt
Signed-off-by: Mirko Lindner <mlindner@marvell.com>
---
drivers/net/ethernet/marvell/sky2.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index f1163b2..2b0748d 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -3080,8 +3080,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id)
/* Reading this mask interrupts as side effect */
status = sky2_read32(hw, B0_Y2_SP_ISRC2);
- if (status == 0 || status == ~0)
+ if (status == 0 || status == ~0) {
+ sky2_write32(hw, B0_Y2_SP_ICR, 2);
return IRQ_NONE;
+ }
prefetch(&hw->st_le[hw->st_idx]);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] [sky2] Fix for interrupt handler
2012-07-04 9:38 [PATCH 2/2] [sky2] Fix for interrupt handler Mirko Lindner
@ 2012-10-25 22:36 ` Jonathan Nieder
2012-11-03 10:04 ` [3.0.y, 3.2.y, 3.4.y] " Jonathan Nieder
0 siblings, 1 reply; 6+ messages in thread
From: Jonathan Nieder @ 2012-10-25 22:36 UTC (permalink / raw)
To: David S. Miller; +Cc: Julian Gilbey, Mirko Lindner, Stephen Hemminger, netdev
Hi,
Mirko Lindner wrote:
> Re-enable interrupts if it is not our interrupt
>
> Signed-off-by: Mirko Lindner <mlindner@marvell.com>
Julian (cc-ed) is experiencing tx stalls[1] on a 3.2.y-based kernel:
WARNING: at [...]/linux-3.2.21/net/sched/sch_generic.c:255 dev_watchdog+0xe9/0x148()
Hardware name: Inspiron 1545
NETDEV WATCHDOG: eth0 (sky2): transmit queue 0 timed out
Cherry-picking v3.6-rc1~125^2~264 (sky2: Fix for interrupt handler,
2012-07-03) fixes it.
Tested-by: Julian Gilbey <jdg@debian.org>
Dave, would this be a candidate for stable? Patch left unsnipped for
reference.
Thanks,
Jonathan
[1] http://bugs.debian.org/681280
[2] http://patchwork.ozlabs.org/bundle/davem/stable/?state=*
> ---
> drivers/net/ethernet/marvell/sky2.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
> index f1163b2..2b0748d 100644
> --- a/drivers/net/ethernet/marvell/sky2.c
> +++ b/drivers/net/ethernet/marvell/sky2.c
> @@ -3080,8 +3080,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id)
>
> /* Reading this mask interrupts as side effect */
> status = sky2_read32(hw, B0_Y2_SP_ISRC2);
> - if (status == 0 || status == ~0)
> + if (status == 0 || status == ~0) {
> + sky2_write32(hw, B0_Y2_SP_ICR, 2);
> return IRQ_NONE;
> + }
>
> prefetch(&hw->st_le[hw->st_idx]);
>
> --
> 1.7.10.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [3.0.y, 3.2.y, 3.4.y] Re: [PATCH 2/2] [sky2] Fix for interrupt handler
2012-10-25 22:36 ` Jonathan Nieder
@ 2012-11-03 10:04 ` Jonathan Nieder
2012-11-12 8:24 ` Jonathan Nieder
2012-11-13 8:14 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Jonathan Nieder @ 2012-11-03 10:04 UTC (permalink / raw)
To: David S. Miller
Cc: Julian Gilbey, Mirko Lindner, Stephen Hemminger, netdev, stable
On October 25, Jonathan Nieder wrote:
> Mirko Lindner wrote:
>> Re-enable interrupts if it is not our interrupt
>>
>> Signed-off-by: Mirko Lindner <mlindner@marvell.com>
[...]
> Tested-by: Julian Gilbey <jdg@debian.org> # 3.2.y, Inspiron 1545
Ping. Dave, is
d663d181b9e9 sky2: Fix for interrupt handler
a candidate for inclusion in 3.0-, 3.2-, and 3.4-stable? (It was
applied upstream during the 3.6 merge window.) I don't see it in
the list at [2].
Thanks,
Jonathan
> [1] http://bugs.debian.org/681280
> [2] http://patchwork.ozlabs.org/bundle/davem/stable/?state=*
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [3.0.y, 3.2.y, 3.4.y] Re: [PATCH 2/2] [sky2] Fix for interrupt handler
2012-11-03 10:04 ` [3.0.y, 3.2.y, 3.4.y] " Jonathan Nieder
@ 2012-11-12 8:24 ` Jonathan Nieder
2012-11-13 8:14 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: Jonathan Nieder @ 2012-11-12 8:24 UTC (permalink / raw)
To: David S. Miller
Cc: Julian Gilbey, Mirko Lindner, Stephen Hemminger, netdev, stable
On November 3, Jonathan Nieder wrote:
> On October 25, Jonathan Nieder wrote:
>> Mirko Lindner wrote:
>>> Re-enable interrupts if it is not our interrupt
[...]
>> Tested-by: Julian Gilbey <jdg@debian.org> # 3.2.y, Inspiron 1545
>
> Ping. Dave, is
>
> d663d181b9e9 sky2: Fix for interrupt handler
>
> a candidate for inclusion in 3.0-, 3.2-, and 3.4-stable? (It was
> applied upstream during the 3.6 merge window.)
Please confirm or object so I know you've received this message.
Thanks for maintaining netdev-stable with such attention to quality,
by the way.
Sincerely,
Jonathan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [3.0.y, 3.2.y, 3.4.y] Re: [PATCH 2/2] [sky2] Fix for interrupt handler
2012-11-03 10:04 ` [3.0.y, 3.2.y, 3.4.y] " Jonathan Nieder
2012-11-12 8:24 ` Jonathan Nieder
@ 2012-11-13 8:14 ` David Miller
2012-11-14 5:49 ` Ben Hutchings
1 sibling, 1 reply; 6+ messages in thread
From: David Miller @ 2012-11-13 8:14 UTC (permalink / raw)
To: jrnieder; +Cc: jdg, mlindner, shemminger, netdev, stable
From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 3 Nov 2012 03:04:48 -0700
> On October 25, Jonathan Nieder wrote:
>> Mirko Lindner wrote:
>
>>> Re-enable interrupts if it is not our interrupt
>>>
>>> Signed-off-by: Mirko Lindner <mlindner@marvell.com>
> [...]
>> Tested-by: Julian Gilbey <jdg@debian.org> # 3.2.y, Inspiron 1545
>
> Ping. Dave, is
>
> d663d181b9e9 sky2: Fix for interrupt handler
>
> a candidate for inclusion in 3.0-, 3.2-, and 3.4-stable? (It was
> applied upstream during the 3.6 merge window.) I don't see it in
> the list at [2].
This looks fine.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [3.0.y, 3.2.y, 3.4.y] Re: [PATCH 2/2] [sky2] Fix for interrupt handler
2012-11-13 8:14 ` David Miller
@ 2012-11-14 5:49 ` Ben Hutchings
0 siblings, 0 replies; 6+ messages in thread
From: Ben Hutchings @ 2012-11-14 5:49 UTC (permalink / raw)
To: David Miller; +Cc: jrnieder, jdg, mlindner, shemminger, netdev, stable
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
On Tue, 2012-11-13 at 03:14 -0500, David Miller wrote:
> From: Jonathan Nieder <jrnieder@gmail.com>
> Date: Sat, 3 Nov 2012 03:04:48 -0700
>
> > On October 25, Jonathan Nieder wrote:
> >> Mirko Lindner wrote:
> >
> >>> Re-enable interrupts if it is not our interrupt
> >>>
> >>> Signed-off-by: Mirko Lindner <mlindner@marvell.com>
> > [...]
> >> Tested-by: Julian Gilbey <jdg@debian.org> # 3.2.y, Inspiron 1545
> >
> > Ping. Dave, is
> >
> > d663d181b9e9 sky2: Fix for interrupt handler
> >
> > a candidate for inclusion in 3.0-, 3.2-, and 3.4-stable? (It was
> > applied upstream during the 3.6 merge window.) I don't see it in
> > the list at [2].
>
> This looks fine.
Queued up for 3.2, thanks all.
Ben.
--
Ben Hutchings
friends: People who know you well, but like you anyway.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-11-14 5:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-04 9:38 [PATCH 2/2] [sky2] Fix for interrupt handler Mirko Lindner
2012-10-25 22:36 ` Jonathan Nieder
2012-11-03 10:04 ` [3.0.y, 3.2.y, 3.4.y] " Jonathan Nieder
2012-11-12 8:24 ` Jonathan Nieder
2012-11-13 8:14 ` David Miller
2012-11-14 5:49 ` Ben Hutchings
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.