Hello!
On 04/18/2017 03:55 AM, Simon Horman wrote:
From: Tsutomu Izawa <tsutomu.izawa.xk@xxxxxxxxxxx>
This patch fixes ravb_ptp_interrupt clears GIS register of all interrupts
Clearing, maybe?
status. It corrects to clear PTCF bit or PTMF bit.
Well, it's safer to clear all of them, I think...
Also it fixes returned value to IRQ_HANDLED or IRQ_NONE.
Signed-off-by: Tsutomu Izawa <tsutomu.izawa.xk@xxxxxxxxxxx>
Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@xxxxxxxxxxx>
Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
---
drivers/net/ethernet/renesas/ravb.h | 4 ++--
drivers/net/ethernet/renesas/ravb_main.c | 12 ++++--------
drivers/net/ethernet/renesas/ravb_ptp.c | 15 ++++++++++++---
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 0525bd696d5d..fbfdefa659ce 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
[...]
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 8cfc4a54f2dc..747686386513 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -820,10 +820,8 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id)
}
/* gPTP interrupt status summary */
- if (iss & ISS_CGIS) {
- ravb_ptp_interrupt(ndev);
- result = IRQ_HANDLED;
- }
+ if (iss & ISS_CGIS)
+ result = ravb_ptp_interrupt(ndev);
No, this reintroduces the same kind of bug that we've fixed already:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=38c848c73180fb1d142a39e664b6d9663751f6b2
[...]
@@ -853,10 +851,8 @@ static irqreturn_t ravb_multi_interrupt(int irq, void *dev_id)
}
/* gPTP interrupt status summary */
- if (iss & ISS_CGIS) {
- ravb_ptp_interrupt(ndev);
- result = IRQ_HANDLED;
- }
+ if (iss & ISS_CGIS)
+ result = ravb_ptp_interrupt(ndev);
Here as well... look at the other handlers returning success.
[...]
MBR, Sergei
