Hi Sergei,

Subject: RE: [RFC/PATCH 07/18] ravb: Add magic_pkt to struct ravb_hw_info

Hi Sergei,

Thanks for the feedback.

quoted

Subject: Re: [RFC/PATCH 07/18] ravb: Add magic_pkt to struct
ravb_hw_info

On 9/23/21 5:08 PM, Biju Das wrote:

quoted

E-MAC on R-Car supports magic packet detection, whereas RZ/G2L do
not support this feature. Add magic_pkt to struct ravb_hw_info and
enable this feature only for R-Car.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>

[...]

quoted

diff --git a/drivers/net/ethernet/renesas/ravb_main.c

b/drivers/net/ethernet/renesas/ravb_main.c
index d37d73f6d984..529364d8f7fb 100644

--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c

@@ -811,12 +811,13 @@ static int ravb_stop_dma(struct net_device

*ndev)  static void ravb_emac_interrupt_unlocked(struct net_device
*ndev)  {
 	struct ravb_private *priv = netdev_priv(ndev);
+	const struct ravb_hw_info *info = priv->info;
 	u32 ecsr, psr;

 	ecsr = ravb_read(ndev, ECSR);
 	ravb_write(ndev, ecsr, ECSR);	/* clear interrupt */

-	if (ecsr & ECSR_MPD)
+	if (info->magic_pkt && (ecsr & ECSR_MPD))

   I think masking the MPD interrupt would be enough.

Agreed.

quoted

quoted

 		pm_wakeup_event(&priv->pdev->dev, 0);
 	if (ecsr & ECSR_ICD)
 		ndev->stats.tx_carrier_errors++;

@@ -1416,8 +1417,9 @@ static void ravb_get_wol(struct net_device

*ndev, struct ethtool_wolinfo *wol)

   Didn't you miss ravb_get_wol() -- it needs a change as well...

I don't think it is required. Framework is taking care of this. Please see
the output from target.

root@smarc-rzg2l:~# ethtool -s eth0 wol g netlink error: Operation not
supported root@smarc-rzg2l:~#

quoted

quoted

 static int ravb_set_wol(struct net_device *ndev, struct
ethtool_wolinfo *wol)  {
 	struct ravb_private *priv = netdev_priv(ndev);
+	const struct ravb_hw_info *info = priv->info;

-	if (wol->wolopts & ~WAKE_MAGIC)
+	if (!info->magic_pkt || (wol->wolopts & ~WAKE_MAGIC))
 		return -EOPNOTSUPP;

 	priv->wol_enabled = !!(wol->wolopts & WAKE_MAGIC);

[...]

As discussed, the new patch removes info->magic_pkt from interrupt routine.

Regards,
Biju