mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
![Florian Fainelli](/assets/img/avatar_default.png)
bcmgenet_set_wol() correctly sets MPD_PW_EN when a password is specified
to match magic packets against, however, when we switch from a
password-matching to a matching without password we would leave this bit
turned on, and GENET would only match magic packets with passwords.
This can be reproduced using the following sequence:
ethtool -s eth0 wol g
ethtool -s eth0 wol s sopass 00:11:22:33:44:55
ethtool -s eth0 wol g
The simple fix is to clear the MPD_PWD_EN bit when WAKE_MAGICSECURE is
not set.
Fixes: c51de7f397
("net: bcmgenet: add Wake-on-LAN support code")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
210 lines
5.3 KiB
C
210 lines
5.3 KiB
C
/*
|
|
* Broadcom GENET (Gigabit Ethernet) Wake-on-LAN support
|
|
*
|
|
* Copyright (c) 2014 Broadcom Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) "bcmgenet_wol: " fmt
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/types.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/string.h>
|
|
#include <linux/init.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/pm.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/version.h>
|
|
#include <linux/platform_device.h>
|
|
#include <net/arp.h>
|
|
|
|
#include <linux/mii.h>
|
|
#include <linux/ethtool.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/inetdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/in.h>
|
|
#include <linux/ip.h>
|
|
#include <linux/ipv6.h>
|
|
#include <linux/phy.h>
|
|
|
|
#include "bcmgenet.h"
|
|
|
|
/* ethtool function - get WOL (Wake on LAN) settings, Only Magic Packet
|
|
* Detection is supported through ethtool
|
|
*/
|
|
void bcmgenet_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
|
|
{
|
|
struct bcmgenet_priv *priv = netdev_priv(dev);
|
|
u32 reg;
|
|
|
|
wol->supported = WAKE_MAGIC | WAKE_MAGICSECURE;
|
|
wol->wolopts = priv->wolopts;
|
|
memset(wol->sopass, 0, sizeof(wol->sopass));
|
|
|
|
if (wol->wolopts & WAKE_MAGICSECURE) {
|
|
reg = bcmgenet_umac_readl(priv, UMAC_MPD_PW_MS);
|
|
put_unaligned_be16(reg, &wol->sopass[0]);
|
|
reg = bcmgenet_umac_readl(priv, UMAC_MPD_PW_LS);
|
|
put_unaligned_be32(reg, &wol->sopass[2]);
|
|
}
|
|
}
|
|
|
|
/* ethtool function - set WOL (Wake on LAN) settings.
|
|
* Only for magic packet detection mode.
|
|
*/
|
|
int bcmgenet_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
|
|
{
|
|
struct bcmgenet_priv *priv = netdev_priv(dev);
|
|
struct device *kdev = &priv->pdev->dev;
|
|
u32 reg;
|
|
|
|
if (!device_can_wakeup(kdev))
|
|
return -ENOTSUPP;
|
|
|
|
if (wol->wolopts & ~(WAKE_MAGIC | WAKE_MAGICSECURE))
|
|
return -EINVAL;
|
|
|
|
reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);
|
|
if (wol->wolopts & WAKE_MAGICSECURE) {
|
|
bcmgenet_umac_writel(priv, get_unaligned_be16(&wol->sopass[0]),
|
|
UMAC_MPD_PW_MS);
|
|
bcmgenet_umac_writel(priv, get_unaligned_be32(&wol->sopass[2]),
|
|
UMAC_MPD_PW_LS);
|
|
reg |= MPD_PW_EN;
|
|
} else {
|
|
reg &= ~MPD_PW_EN;
|
|
}
|
|
bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);
|
|
|
|
/* Flag the device and relevant IRQ as wakeup capable */
|
|
if (wol->wolopts) {
|
|
device_set_wakeup_enable(kdev, 1);
|
|
/* Avoid unbalanced enable_irq_wake calls */
|
|
if (priv->wol_irq_disabled)
|
|
enable_irq_wake(priv->wol_irq);
|
|
priv->wol_irq_disabled = false;
|
|
} else {
|
|
device_set_wakeup_enable(kdev, 0);
|
|
/* Avoid unbalanced disable_irq_wake calls */
|
|
if (!priv->wol_irq_disabled)
|
|
disable_irq_wake(priv->wol_irq);
|
|
priv->wol_irq_disabled = true;
|
|
}
|
|
|
|
priv->wolopts = wol->wolopts;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int bcmgenet_poll_wol_status(struct bcmgenet_priv *priv)
|
|
{
|
|
struct net_device *dev = priv->dev;
|
|
int retries = 0;
|
|
|
|
while (!(bcmgenet_rbuf_readl(priv, RBUF_STATUS)
|
|
& RBUF_STATUS_WOL)) {
|
|
retries++;
|
|
if (retries > 5) {
|
|
netdev_crit(dev, "polling wol mode timeout\n");
|
|
return -ETIMEDOUT;
|
|
}
|
|
mdelay(1);
|
|
}
|
|
|
|
return retries;
|
|
}
|
|
|
|
int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *priv,
|
|
enum bcmgenet_power_mode mode)
|
|
{
|
|
struct net_device *dev = priv->dev;
|
|
u32 cpu_mask_clear;
|
|
int retries = 0;
|
|
u32 reg;
|
|
|
|
if (mode != GENET_POWER_WOL_MAGIC) {
|
|
netif_err(priv, wol, dev, "unsupported mode: %d\n", mode);
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* disable RX */
|
|
reg = bcmgenet_umac_readl(priv, UMAC_CMD);
|
|
reg &= ~CMD_RX_EN;
|
|
bcmgenet_umac_writel(priv, reg, UMAC_CMD);
|
|
mdelay(10);
|
|
|
|
reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);
|
|
reg |= MPD_EN;
|
|
bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);
|
|
|
|
/* Do not leave UniMAC in MPD mode only */
|
|
retries = bcmgenet_poll_wol_status(priv);
|
|
if (retries < 0) {
|
|
reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);
|
|
reg &= ~MPD_EN;
|
|
bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);
|
|
return retries;
|
|
}
|
|
|
|
netif_dbg(priv, wol, dev, "MPD WOL-ready status set after %d msec\n",
|
|
retries);
|
|
|
|
/* Enable CRC forward */
|
|
reg = bcmgenet_umac_readl(priv, UMAC_CMD);
|
|
priv->crc_fwd_en = 1;
|
|
reg |= CMD_CRC_FWD;
|
|
|
|
/* Receiver must be enabled for WOL MP detection */
|
|
reg |= CMD_RX_EN;
|
|
bcmgenet_umac_writel(priv, reg, UMAC_CMD);
|
|
|
|
if (priv->hw_params->flags & GENET_HAS_EXT) {
|
|
reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);
|
|
reg &= ~EXT_ENERGY_DET_MASK;
|
|
bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);
|
|
}
|
|
|
|
/* Enable the MPD interrupt */
|
|
cpu_mask_clear = UMAC_IRQ_MPD_R;
|
|
|
|
bcmgenet_intrl2_0_writel(priv, cpu_mask_clear, INTRL2_CPU_MASK_CLEAR);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv,
|
|
enum bcmgenet_power_mode mode)
|
|
{
|
|
u32 cpu_mask_set;
|
|
u32 reg;
|
|
|
|
if (mode != GENET_POWER_WOL_MAGIC) {
|
|
netif_err(priv, wol, priv->dev, "invalid mode: %d\n", mode);
|
|
return;
|
|
}
|
|
|
|
reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);
|
|
reg &= ~MPD_EN;
|
|
bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);
|
|
|
|
/* Disable CRC Forward */
|
|
reg = bcmgenet_umac_readl(priv, UMAC_CMD);
|
|
reg &= ~CMD_CRC_FWD;
|
|
bcmgenet_umac_writel(priv, reg, UMAC_CMD);
|
|
priv->crc_fwd_en = 0;
|
|
|
|
/* Stop monitoring magic packet IRQ */
|
|
cpu_mask_set = UMAC_IRQ_MPD_R;
|
|
|
|
/* Stop monitoring magic packet IRQ */
|
|
bcmgenet_intrl2_0_writel(priv, cpu_mask_set, INTRL2_CPU_MASK_SET);
|
|
}
|