* [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set
@ 2017-09-20 0:33 Troy Kisky
2017-09-20 0:33 ` [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER Troy Kisky
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Troy Kisky @ 2017-09-20 0:33 UTC (permalink / raw)
To: fugang.duan, netdev, davem; +Cc: fabio.estevam, lznuaa, Troy Kisky
Before queue 0 was always checked if any queue caused an interrupt.
It is better to just mark queue 0 if queue 0 has caused an interrupt.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Fugang Duan <Fugang.duan@nxp.com>
---
v3: add Acked-by
v4: no change
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
drivers/net/ethernet/freescale/fec_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 56f56d6..464055f 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1559,14 +1559,14 @@ fec_enet_collect_events(struct fec_enet_private *fep, uint int_events)
if (int_events == 0)
return false;
- if (int_events & FEC_ENET_RXF)
+ if (int_events & FEC_ENET_RXF_0)
fep->work_rx |= (1 << 2);
if (int_events & FEC_ENET_RXF_1)
fep->work_rx |= (1 << 0);
if (int_events & FEC_ENET_RXF_2)
fep->work_rx |= (1 << 1);
- if (int_events & FEC_ENET_TXF)
+ if (int_events & FEC_ENET_TXF_0)
fep->work_tx |= (1 << 2);
if (int_events & FEC_ENET_TXF_1)
fep->work_tx |= (1 << 0);
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER
2017-09-20 0:33 [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set Troy Kisky
@ 2017-09-20 0:33 ` Troy Kisky
2017-09-20 2:14 ` Andy Duan
2017-09-20 22:47 ` David Miller
2017-09-20 0:33 ` [PATCH v4 3/3] net: fec: return IRQ_HANDLED if fec_ptp_check_pps_event handled it Troy Kisky
2017-09-20 22:47 ` [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set David Miller
2 siblings, 2 replies; 7+ messages in thread
From: Troy Kisky @ 2017-09-20 0:33 UTC (permalink / raw)
To: fugang.duan, netdev, davem; +Cc: fabio.estevam, lznuaa, Troy Kisky
FEC_ENET_TS_TIMER is not checked in the interrupt routine
so there is no need to enable it.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
---
v4: Added Acked-by
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
drivers/net/ethernet/freescale/fec.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index 38c7b21..ede1876 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -374,8 +374,8 @@ struct bufdesc_ex {
#define FEC_ENET_TS_AVAIL ((uint)0x00010000)
#define FEC_ENET_TS_TIMER ((uint)0x00008000)
-#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII | FEC_ENET_TS_TIMER)
-#define FEC_NAPI_IMASK (FEC_ENET_MII | FEC_ENET_TS_TIMER)
+#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII)
+#define FEC_NAPI_IMASK FEC_ENET_MII
#define FEC_RX_DISABLED_IMASK (FEC_DEFAULT_IMASK & (~FEC_ENET_RXF))
/* ENET interrupt coalescing macro define */
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 3/3] net: fec: return IRQ_HANDLED if fec_ptp_check_pps_event handled it
2017-09-20 0:33 [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set Troy Kisky
2017-09-20 0:33 ` [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER Troy Kisky
@ 2017-09-20 0:33 ` Troy Kisky
2017-09-20 22:47 ` David Miller
2017-09-20 22:47 ` [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set David Miller
2 siblings, 1 reply; 7+ messages in thread
From: Troy Kisky @ 2017-09-20 0:33 UTC (permalink / raw)
To: fugang.duan, netdev, davem; +Cc: fabio.estevam, lznuaa, Troy Kisky
fec_ptp_check_pps_event will return 1 if FEC_T_TF_MASK caused
an interrupt. Don't return IRQ_NONE in this case.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
---
v3: New patch, came from feedback from another patch.
v4: Added Acked-by
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
drivers/net/ethernet/freescale/fec_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 464055f..3dc2d77 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1604,8 +1604,8 @@ fec_enet_interrupt(int irq, void *dev_id)
}
if (fep->ptp_clock)
- fec_ptp_check_pps_event(fep);
-
+ if (fec_ptp_check_pps_event(fep))
+ ret = IRQ_HANDLED;
return ret;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER
2017-09-20 0:33 ` [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER Troy Kisky
@ 2017-09-20 2:14 ` Andy Duan
2017-09-20 22:47 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: Andy Duan @ 2017-09-20 2:14 UTC (permalink / raw)
To: Troy Kisky, netdev, davem; +Cc: Fabio Estevam, lznuaa
From: Troy Kisky <troy.kisky@boundarydevices.com> Sent: Wednesday, September 20, 2017 8:33 AM
>FEC_ENET_TS_TIMER is not checked in the interrupt routine so there is no
>need to enable it.
>
>Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
>Acked-by: Fugang Duan <fugang.duan@nxp.com>
>
>---
>v4: Added Acked-by
>
>Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
>---
Troy, thank you for submitting the version.
The patch series had been already acked by me.
Thanks again.
> drivers/net/ethernet/freescale/fec.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/ethernet/freescale/fec.h
>b/drivers/net/ethernet/freescale/fec.h
>index 38c7b21..ede1876 100644
>--- a/drivers/net/ethernet/freescale/fec.h
>+++ b/drivers/net/ethernet/freescale/fec.h
>@@ -374,8 +374,8 @@ struct bufdesc_ex {
> #define FEC_ENET_TS_AVAIL ((uint)0x00010000)
> #define FEC_ENET_TS_TIMER ((uint)0x00008000)
>
>-#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF |
>FEC_ENET_MII | FEC_ENET_TS_TIMER)
>-#define FEC_NAPI_IMASK (FEC_ENET_MII | FEC_ENET_TS_TIMER)
>+#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF |
>FEC_ENET_MII)
>+#define FEC_NAPI_IMASK FEC_ENET_MII
> #define FEC_RX_DISABLED_IMASK (FEC_DEFAULT_IMASK &
>(~FEC_ENET_RXF))
>
> /* ENET interrupt coalescing macro define */
>--
>2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set
2017-09-20 0:33 [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set Troy Kisky
2017-09-20 0:33 ` [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER Troy Kisky
2017-09-20 0:33 ` [PATCH v4 3/3] net: fec: return IRQ_HANDLED if fec_ptp_check_pps_event handled it Troy Kisky
@ 2017-09-20 22:47 ` David Miller
2 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2017-09-20 22:47 UTC (permalink / raw)
To: troy.kisky; +Cc: fugang.duan, netdev, fabio.estevam, lznuaa
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Tue, 19 Sep 2017 17:33:07 -0700
> Before queue 0 was always checked if any queue caused an interrupt.
> It is better to just mark queue 0 if queue 0 has caused an interrupt.
>
> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
> Acked-by: Fugang Duan <Fugang.duan@nxp.com>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER
2017-09-20 0:33 ` [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER Troy Kisky
2017-09-20 2:14 ` Andy Duan
@ 2017-09-20 22:47 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: David Miller @ 2017-09-20 22:47 UTC (permalink / raw)
To: troy.kisky; +Cc: fugang.duan, netdev, fabio.estevam, lznuaa
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Tue, 19 Sep 2017 17:33:08 -0700
> FEC_ENET_TS_TIMER is not checked in the interrupt routine
> so there is no need to enable it.
>
> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
> Acked-by: Fugang Duan <fugang.duan@nxp.com>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 3/3] net: fec: return IRQ_HANDLED if fec_ptp_check_pps_event handled it
2017-09-20 0:33 ` [PATCH v4 3/3] net: fec: return IRQ_HANDLED if fec_ptp_check_pps_event handled it Troy Kisky
@ 2017-09-20 22:47 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2017-09-20 22:47 UTC (permalink / raw)
To: troy.kisky; +Cc: fugang.duan, netdev, fabio.estevam, lznuaa
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Tue, 19 Sep 2017 17:33:09 -0700
> fec_ptp_check_pps_event will return 1 if FEC_T_TF_MASK caused
> an interrupt. Don't return IRQ_NONE in this case.
>
> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
> Acked-by: Fugang Duan <fugang.duan@nxp.com>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-09-20 22:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-20 0:33 [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set Troy Kisky
2017-09-20 0:33 ` [PATCH v4 2/3] net: fec: remove unused interrupt FEC_ENET_TS_TIMER Troy Kisky
2017-09-20 2:14 ` Andy Duan
2017-09-20 22:47 ` David Miller
2017-09-20 0:33 ` [PATCH v4 3/3] net: fec: return IRQ_HANDLED if fec_ptp_check_pps_event handled it Troy Kisky
2017-09-20 22:47 ` David Miller
2017-09-20 22:47 ` [PATCH v4 1/3] net: fec: only check queue 0 if RXF_0/TXF_0 interrupt is set David Miller
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).