Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d7f53e3 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: add "ethtool wol" command support 



Host sleep wakeup condition is configured using this command.

Supports Wake-on: pumb

For examples:

wake-on any unicast packets:
ethtool -s mlan0 wol u

wake-on multicast/broadcast packet:
ethtool -s mlan0 wol mb

wake-on unicast packets and MAC events:
ethtool -s mlan0 wol pu

wake-on unicast/multicast/broadcast packets and MAC events:
ethtool -s mlan0 wol pmbu

disable all wake-on options:
ethtool -s mlan0 wol d

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cc0b5a64

drivers/net/wireless/mwifiex/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ mwifiex-y += sta_tx.o 
mwifiex-y += sta_rx.o

mwifiex-y += sta_rx.o

mwifiex-y += uap_txrx.o

mwifiex-y += uap_txrx.o

mwifiex-y += cfg80211.o

mwifiex-y += cfg80211.o

mwifiex-y += ethtool.o

mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o

mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o

obj-$(CONFIG_MWIFIEX) += mwifiex.o

obj-$(CONFIG_MWIFIEX) += mwifiex.o

drivers/net/wireless/mwifiex/cfg80211.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2235,6 +2235,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, 
	dev->flags |= IFF_BROADCAST | IFF_MULTICAST;

	dev->flags |= IFF_BROADCAST | IFF_MULTICAST;

	dev->watchdog_timeo = MWIFIEX_DEFAULT_WATCHDOG_TIMEOUT;

	dev->watchdog_timeo = MWIFIEX_DEFAULT_WATCHDOG_TIMEOUT;

	dev->hard_header_len += MWIFIEX_MIN_DATA_HEADER_LEN;

	dev->hard_header_len += MWIFIEX_MIN_DATA_HEADER_LEN;

	dev->ethtool_ops = &mwifiex_ethtool_ops;





	mdev_priv = netdev_priv(dev);

	mdev_priv = netdev_priv(dev);

	*((unsigned long *) mdev_priv) = (unsigned long) priv;

	*((unsigned long *) mdev_priv) = (unsigned long) priv;

drivers/net/wireless/mwifiex/ethtool.c

0 → 100644
+70 −0
Original line number Original line Diff line number Diff line 
/*

 * Marvell Wireless LAN device driver: ethtool

 *

 * Copyright (C) 2013, Marvell International Ltd.

 *

 * This software file (the "File") is distributed by Marvell International

 * Ltd. under the terms of the GNU General Public License Version 2, June 1991

 * (the "License").  You may use, redistribute and/or modify this File in

 * accordance with the terms and conditions of the License, a copy of which

 * is available by writing to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the

 * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.

 *

 * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE

 * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about

 * this warranty disclaimer.

 */



#include "main.h"



static void mwifiex_ethtool_get_wol(struct net_device *dev,

				    struct ethtool_wolinfo *wol)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	u32 conditions = le32_to_cpu(priv->adapter->hs_cfg.conditions);



	wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY;



	if (conditions == HS_CFG_COND_DEF)

		return;



	if (conditions & HS_CFG_COND_UNICAST_DATA)

		wol->wolopts |= WAKE_UCAST;

	if (conditions & HS_CFG_COND_MULTICAST_DATA)

		wol->wolopts |= WAKE_MCAST;

	if (conditions & HS_CFG_COND_BROADCAST_DATA)

		wol->wolopts |= WAKE_BCAST;

	if (conditions & HS_CFG_COND_MAC_EVENT)

		wol->wolopts |= WAKE_PHY;

}



static int mwifiex_ethtool_set_wol(struct net_device *dev,

				   struct ethtool_wolinfo *wol)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	u32 conditions = 0;



	if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY))

		return -EOPNOTSUPP;



	if (wol->wolopts & WAKE_UCAST)

		conditions |= HS_CFG_COND_UNICAST_DATA;

	if (wol->wolopts & WAKE_MCAST)

		conditions |= HS_CFG_COND_MULTICAST_DATA;

	if (wol->wolopts & WAKE_BCAST)

		conditions |= HS_CFG_COND_BROADCAST_DATA;

	if (wol->wolopts & WAKE_PHY)

		conditions |= HS_CFG_COND_MAC_EVENT;

	if (wol->wolopts == 0)

		conditions |= HS_CFG_COND_DEF;

	priv->adapter->hs_cfg.conditions = cpu_to_le32(conditions);



	return 0;

}



const struct ethtool_ops mwifiex_ethtool_ops = {

	.get_wol = mwifiex_ethtool_get_wol,

	.set_wol = mwifiex_ethtool_set_wol,

};

drivers/net/wireless/mwifiex/fw.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -380,6 +380,10 @@ enum P2P_MODES { 
#define HS_CFG_COND_DEF			0x00000000

#define HS_CFG_COND_DEF			0x00000000

#define HS_CFG_GPIO_DEF			0xff

#define HS_CFG_GPIO_DEF			0xff

#define HS_CFG_GAP_DEF			0

#define HS_CFG_GAP_DEF			0

#define HS_CFG_COND_BROADCAST_DATA	0x00000001

#define HS_CFG_COND_UNICAST_DATA	0x00000002

#define HS_CFG_COND_MAC_EVENT		0x00000004

#define HS_CFG_COND_MULTICAST_DATA	0x00000008





#define MWIFIEX_TIMEOUT_FOR_AP_RESP		0xfffc

#define MWIFIEX_TIMEOUT_FOR_AP_RESP		0xfffc

#define MWIFIEX_STATUS_CODE_AUTH_TIMEOUT	2

#define MWIFIEX_STATUS_CODE_AUTH_TIMEOUT	2

drivers/net/wireless/mwifiex/main.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1103,6 +1103,8 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv, 
int mwifiex_del_mgmt_ies(struct mwifiex_private *priv);

int mwifiex_del_mgmt_ies(struct mwifiex_private *priv);

u8 *mwifiex_11d_code_2_region(u8 code);

u8 *mwifiex_11d_code_2_region(u8 code);





extern const struct ethtool_ops mwifiex_ethtool_ops;



#ifdef CONFIG_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

void mwifiex_debugfs_init(void);

void mwifiex_debugfs_init(void);

void mwifiex_debugfs_remove(void);

void mwifiex_debugfs_remove(void);