[PATCH 0/2] sh_eth: fixes for MagicPacket handling

[PATCH 0/2] sh_eth: fixes for MagicPacket handling

[Niklas Söderlund]

Hi,

This series contain two fixes for MagicPacket handling. It's based on 
top of net-next and is tested on Koelsch.

Niklas Söderlund (2):
  sh_eth: align usage of sh_eth_modify() with rest of driver
  sh_eth: fix wakeup event reporting from MagicPacket

 drivers/net/ethernet/renesas/sh_eth.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.11.0

[PATCH 1/2] sh_eth: align usage of sh_eth_modify() with rest of driver

[Niklas Söderlund]

To be consistent with the rest of the driver when setting bits using
sh_eth_modify() the same bit should also be cleared. This have no
functional change and should have been done from the start.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
 drivers/net/ethernet/renesas/sh_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 2f08d2735fe25e4d..f9134c818ac6ef53 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -3271,7 +3271,7 @@ static int sh_eth_wol_setup(struct net_device *ndev)
 	sh_eth_write(ndev, EESIPR_ECIIP, EESIPR);
 
 	/* Enable MagicPacket */
-	sh_eth_modify(ndev, ECMR, 0, ECMR_MPDE);
+	sh_eth_modify(ndev, ECMR, ECMR_MPDE, ECMR_MPDE);
 
 	/* Increased clock usage so device won't be suspended */
 	clk_enable(mdp->clk);
-- 
2.11.0

[PATCH 2/2] sh_eth: fix wakeup event reporting from MagicPacket

[Niklas Söderlund]

If a link change interrupt happens along side the MagicPacket interrupt
and the link change interrupt is ignored the interrupt handler will
return and the wakeup event is not register. Fix this by moving the
MagicPacket check before the link change check.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
 drivers/net/ethernet/renesas/sh_eth.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index f9134c818ac6ef53..54248775f227b062 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1605,6 +1605,8 @@ static void sh_eth_emac_interrupt(struct net_device *ndev)
 	sh_eth_write(ndev, felic_stat, ECSR);	/* clear int */
 	if (felic_stat & ECSR_ICD)
 		ndev->stats.tx_carrier_errors++;
+	if (felic_stat & ECSR_MPD)
+		pm_wakeup_event(&mdp->pdev->dev, 0);
 	if (felic_stat & ECSR_LCHNG) {
 		/* Link Changed */
 		if (mdp->cd->no_psr || mdp->no_ether_link)
@@ -1624,8 +1626,6 @@ static void sh_eth_emac_interrupt(struct net_device *ndev)
 			sh_eth_rcv_snd_enable(ndev);
 		}
 	}
-	if (felic_stat & ECSR_MPD)
-		pm_wakeup_event(&mdp->pdev->dev, 0);
 }
 
 /* error control function */
-- 
2.11.0

Re: [PATCH 1/2] sh_eth: align usage of sh_eth_modify() with rest of driver

[Sergei Shtylyov]

Hello!

On 02/01/2017 05:41 PM, Niklas Söderlund wrote:

> To be consistent with the rest of the driver when setting bits using
> sh_eth_modify() the same bit should also be cleared. This have no
> functional change and should have been done from the start.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

[...]

MBR, Sergei

Re: [PATCH 2/2] sh_eth: fix wakeup event reporting from MagicPacket

[Sergei Shtylyov]

On 02/01/2017 05:41 PM, Niklas Söderlund wrote:

> If a link change interrupt happens along side the MagicPacket interrupt
> and the link change interrupt is ignored the interrupt handler will
> return and the wakeup event is not register. Fix this by moving the
> MagicPacket check before the link change check.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

[...]

MBR, Sergei

Re: [PATCH 2/2] sh_eth: fix wakeup event reporting from MagicPacket

[Sergei Shtylyov]

On 02/01/2017 05:41 PM, Niklas Söderlund wrote:

> If a link change interrupt happens along side the MagicPacket interrupt
> and the link change interrupt is ignored the interrupt handler will
> return and the wakeup event is not register. Fix this by moving the

    Registered?

> MagicPacket check before the link change check.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

[...]

MBR, Sergei

Re: [PATCH 0/2] sh_eth: fixes for MagicPacket handling

[David Miller]

From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Date: Wed,  1 Feb 2017 15:41:53 +0100

> This series contain two fixes for MagicPacket handling. It's based on 
> top of net-next and is tested on Koelsch.

Series applied, thanks.

I fixed the "register" --> "registered" thing in the commit message
for patch #2 when I applied this.

Thanks again.

Re: [PATCH 0/2] sh_eth: fixes for MagicPacket handling

[Niklas Söderlund]

On 2017-02-01 12:54:41 -0500, David Miller wrote:
> From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Date: Wed,  1 Feb 2017 15:41:53 +0100
> 
> > This series contain two fixes for MagicPacket handling. It's based on 
> > top of net-next and is tested on Koelsch.
> 
> Series applied, thanks.
> 
> I fixed the "register" --> "registered" thing in the commit message
> for patch #2 when I applied this.

Thanks for applying and thanks for fixing the typo.

> 
> Thanks again.

-- 
Regards,
Niklas Söderlund