From edf02fb08f21173db3e0801cc49d104695cc3916 Mon Sep 17 00:00:00 2001

From: Nicolas Ferre <nicolas.ferre@microchip.com>

Date: Fri, 10 Jul 2020 14:46:42 +0200

Subject: [PATCH 6/8] net: macb: mark device wake capable when "magic-packet"

 property present

Git-commit: ced4799d06375929e013eea04ba6908207afabbe

Patch-mainline: v5.8-rc5

References: git-fixes

Change the way the "magic-packet" DT property is handled in the

macb_probe() function, matching DT binding documentation.

Now we mark the device as "wakeup capable" instead of calling the

device_init_wakeup() function that would enable the wakeup source.

For Ethernet WoL, enabling the wakeup_source is done by

using ethtool and associated macb_set_wol() function that

already calls device_set_wakeup_enable() for this purpose.

That would reduce power consumption by cutting more clocks if

"magic-packet" property is set but WoL is not configured by ethtool.

Fixes: 3e2a5e153906 ("net: macb: add wake-on-lan support via magic packet")

Cc: Claudiu Beznea <claudiu.beznea@microchip.com>

Cc: Harini Katakam <harini.katakam@xilinx.com>

Cc: Sergio Prado <sergio.prado@e-labworks.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 drivers/net/ethernet/cadence/macb.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c

index 77abec2064ce..acd152c70d17 100644

--- a/drivers/net/ethernet/cadence/macb.c

+++ b/drivers/net/ethernet/cadence/macb.c

@@ -3348,7 +3348,7 @@ static int macb_probe(struct platform_device *pdev)

 	bp->wol = 0;

 	if (of_get_property(np, "magic-packet", NULL))

 		bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;

-	device_init_wakeup(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);

+	device_set_wakeup_capable(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);

 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

 	if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {

-- 

2.16.4