[v3,net] ravb: clear RIC1 in init instead of stop

Commit Message

Yoshihiro Kaneko Dec. 14, 2015, 4:24 p.m. UTC

From: Kazuya Mizuguchi <[e-mail]>

AVB-DMAC Receive FIFO Warning interrupt is not enabled, so it is not
necessary to disable the interrupt in ravb_close().
On the other hand, this patch disables the interrupt in ravb_dmac_init() to
prevent the possibility that the interrupt is issued by the state that
a boot loader left.

Signed-off-by: Kazuya Mizuguchi <[e-mail]>
Signed-off-by: Yoshihiro Kaneko <[e-mail]>
---

This patch is based on the master branch of David Miller's networking
tree.

v3 [Yoshihiro Kaneko]
* compile tested only
* As suggested by Sergei Shtylyov
  - update the subject to reflect what this patch is doing.
  - clear RIC1 in ravb_dmac_init() instead of ravb_open().

v2 [Yoshihiro Kaneko]
* compile tested only
* As suggested by Sergei Shtylyov
  - clear RIC1 in ndo_open() to disable the interrupt regardless of
    a left state from a bootloader.

 drivers/net/ethernet/renesas/ravb_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Sergei Shtylyov Dec. 14, 2015, 4:57 p.m. UTC | #1

On 12/14/2015 07:24 PM, Yoshihiro Kaneko wrote:

> From: Kazuya Mizuguchi <[e-mail]>
>
> AVB-DMAC Receive FIFO Warning interrupt is not enabled, so it is not
> necessary to disable the interrupt in ravb_close().
> On the other hand, this patch disables the interrupt in ravb_dmac_init() to
> prevent the possibility that the interrupt is issued by the state that
> a boot loader left.
>
> Signed-off-by: Kazuya Mizuguchi <[e-mail]>
> Signed-off-by: Yoshihiro Kaneko <[e-mail]>

Acked-by: Sergei Shtylyov <[e-mail]>

> ---
>
> This patch is based on the master branch of David Miller's networking
> tree.

    I think this should rather go into net-next.git though...

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

David Miller Dec. 14, 2015, 7:33 p.m. UTC | #2

From: Sergei Shtylyov <[e-mail]>
Date: Mon, 14 Dec 2015 19:57:39 +0300

> On 12/14/2015 07:24 PM, Yoshihiro Kaneko wrote:
> 
>> From: Kazuya Mizuguchi <[e-mail]>
>>
>> AVB-DMAC Receive FIFO Warning interrupt is not enabled, so it is not
>> necessary to disable the interrupt in ravb_close().
>> On the other hand, this patch disables the interrupt in
>> ravb_dmac_init() to
>> prevent the possibility that the interrupt is issued by the state that
>> a boot loader left.
>>
>> Signed-off-by: Kazuya Mizuguchi <[e-mail]>
>> Signed-off-by: Yoshihiro Kaneko <[e-mail]>
> 
> Acked-by: Sergei Shtylyov <[e-mail]>
> 
>> ---
>>
>> This patch is based on the master branch of David Miller's networking
>> tree.
> 
>    I think this should rather go into net-next.git though...

Agreed, applied to net-next, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index b69e0c2..b76303e 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -405,9 +405,11 @@  static int ravb_dmac_init(struct net_device *ndev)
 	/* Timestamp enable */
 	ravb_write(ndev, TCCR_TFEN, TCCR);
 
-	/* Interrupt enable: */
+	/* Interrupt init: */
 	/* Frame receive */
 	ravb_write(ndev, RIC0_FRE0 | RIC0_FRE1, RIC0);
+	/* Disable FIFO full warning */
+	ravb_write(ndev, 0, RIC1);
 	/* Receive FIFO full error, descriptor empty */
 	ravb_write(ndev, RIC2_QFE0 | RIC2_QFE1 | RIC2_RFFE, RIC2);
 	/* Frame transmitted, timestamp FIFO updated */
@@ -1471,7 +1473,6 @@  static int ravb_close(struct net_device *ndev)
 
 	/* Disable interrupts by clearing the interrupt masks. */
 	ravb_write(ndev, 0, RIC0);
-	ravb_write(ndev, 0, RIC1);
 	ravb_write(ndev, 0, RIC2);
 	ravb_write(ndev, 0, TIC);