Commit 20f2c5fa authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

brcmfmac: add initial support for monitor mode 



Report monitor interface availability using cfg80211 and support it in
the add_virtual_intf() and del_virtual_intf() callbacks. This new
feature is conditional and depends on firmware flagging monitor packets.
Receiving monitor frames is already handled by the brcmf_netif_mon_rx().

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 24332f80

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+100 −12
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/vmalloc.h>

#include <net/cfg80211.h>

#include <net/netlink.h>

#include <uapi/linux/if_arp.h>



#include <brcmu_utils.h>

#include <defs.h>
@@ -619,6 +620,82 @@ static bool brcmf_is_ibssmode(struct brcmf_cfg80211_vif *vif) 
	return vif->wdev.iftype == NL80211_IFTYPE_ADHOC;

}



/**

 * brcmf_mon_add_vif() - create monitor mode virtual interface

 *

 * @wiphy: wiphy device of new interface.

 * @name: name of the new interface.

 */

static struct wireless_dev *brcmf_mon_add_vif(struct wiphy *wiphy,

					      const char *name)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct brcmf_cfg80211_vif *vif;

	struct net_device *ndev;

	struct brcmf_if *ifp;

	int err;



	if (cfg->pub->mon_if) {

		err = -EEXIST;

		goto err_out;

	}



	vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_MONITOR);

	if (IS_ERR(vif)) {

		err = PTR_ERR(vif);

		goto err_out;

	}



	ndev = alloc_netdev(sizeof(*ifp), name, NET_NAME_UNKNOWN, ether_setup);

	if (!ndev) {

		err = -ENOMEM;

		goto err_free_vif;

	}

	ndev->type = ARPHRD_IEEE80211_RADIOTAP;

	ndev->ieee80211_ptr = &vif->wdev;

	ndev->needs_free_netdev = true;

	ndev->priv_destructor = brcmf_cfg80211_free_netdev;

	SET_NETDEV_DEV(ndev, wiphy_dev(cfg->wiphy));



	ifp = netdev_priv(ndev);

	ifp->vif = vif;

	ifp->ndev = ndev;

	ifp->drvr = cfg->pub;



	vif->ifp = ifp;

	vif->wdev.netdev = ndev;



	err = brcmf_net_mon_attach(ifp);

	if (err) {

		brcmf_err("Failed to attach %s device\n", ndev->name);

		free_netdev(ndev);

		goto err_free_vif;

	}



	cfg->pub->mon_if = ifp;



	return &vif->wdev;



err_free_vif:

	brcmf_free_vif(vif);

err_out:

	return ERR_PTR(err);

}



static int brcmf_mon_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct net_device *ndev = wdev->netdev;



	ndev->netdev_ops->ndo_stop(ndev);



	brcmf_net_detach(ndev, true);



	cfg->pub->mon_if = NULL;



	return 0;

}



static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,

						     const char *name,

						     unsigned char name_assign_type,
@@ -641,9 +718,10 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy, 
	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_AP_VLAN:

	case NL80211_IFTYPE_WDS:

	case NL80211_IFTYPE_MONITOR:

	case NL80211_IFTYPE_MESH_POINT:

		return ERR_PTR(-EOPNOTSUPP);

	case NL80211_IFTYPE_MONITOR:

		return brcmf_mon_add_vif(wiphy, name);

	case NL80211_IFTYPE_AP:

		wdev = brcmf_ap_add_vif(wiphy, name, params);

		break;
@@ -826,9 +904,10 @@ int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev) 
	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_AP_VLAN:

	case NL80211_IFTYPE_WDS:

	case NL80211_IFTYPE_MONITOR:

	case NL80211_IFTYPE_MESH_POINT:

		return -EOPNOTSUPP;

	case NL80211_IFTYPE_MONITOR:

		return brcmf_mon_del_vif(wiphy, wdev);

	case NL80211_IFTYPE_AP:

		return brcmf_cfg80211_del_ap_iface(wiphy, wdev);

	case NL80211_IFTYPE_P2P_CLIENT:
@@ -6547,9 +6626,10 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp) 
	struct ieee80211_iface_limit *c0_limits = NULL;

	struct ieee80211_iface_limit *p2p_limits = NULL;

	struct ieee80211_iface_limit *mbss_limits = NULL;

	bool mbss, p2p, rsdb, mchan;

	int i, c, n_combos;

	bool mon_flag, mbss, p2p, rsdb, mchan;

	int i, c, n_combos, n_limits;



	mon_flag = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MONITOR_FLAG);

	mbss = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS);

	p2p = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P);

	rsdb = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB);
@@ -6563,6 +6643,8 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp) 
	wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |

				 BIT(NL80211_IFTYPE_ADHOC) |

				 BIT(NL80211_IFTYPE_AP);

	if (mon_flag)

		wiphy->interface_modes |= BIT(NL80211_IFTYPE_MONITOR);

	if (p2p)

		wiphy->interface_modes |= BIT(NL80211_IFTYPE_P2P_CLIENT) |

					  BIT(NL80211_IFTYPE_P2P_GO) |
@@ -6570,18 +6652,18 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp) 


	c = 0;

	i = 0;

	if (p2p && rsdb)

		c0_limits = kcalloc(4, sizeof(*c0_limits), GFP_KERNEL);

	else if (p2p)

		c0_limits = kcalloc(3, sizeof(*c0_limits), GFP_KERNEL);

	else

		c0_limits = kcalloc(2, sizeof(*c0_limits), GFP_KERNEL);

	n_limits = 1 + mon_flag + (p2p ? 2 : 0) + (rsdb || !p2p);

	c0_limits = kcalloc(n_limits, sizeof(*c0_limits), GFP_KERNEL);

	if (!c0_limits)

		goto err;



	combo[c].num_different_channels = 1 + (rsdb || (p2p && mchan));

	c0_limits[i].max = 1 + rsdb;

	c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);

	if (mon_flag) {

		c0_limits[i].max = 1;

		c0_limits[i++].types = BIT(NL80211_IFTYPE_MONITOR);

	}

	if (p2p) {

		c0_limits[i].max = 1;

		c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
@@ -6630,14 +6712,20 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp) 
	if (mbss) {

		c++;

		i = 0;

		mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);

		n_limits = 1 + mon_flag;

		mbss_limits = kcalloc(n_limits, sizeof(*mbss_limits),

				      GFP_KERNEL);

		if (!mbss_limits)

			goto err;

		mbss_limits[i].max = 4;

		mbss_limits[i++].types = BIT(NL80211_IFTYPE_AP);

		if (mon_flag) {

			mbss_limits[i].max = 1;

			mbss_limits[i++].types = BIT(NL80211_IFTYPE_MONITOR);

		}

		combo[c].beacon_int_infra_match = true;

		combo[c].num_different_channels = 1;

		combo[c].max_interfaces = 4;

		combo[c].max_interfaces = 4 + mon_flag;

		combo[c].n_limits = i;

		combo[c].limits = mbss_limits;

	}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+67 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ fail: 
	return -EBADE;

}



static void brcmf_net_detach(struct net_device *ndev, bool rtnl_locked)

void brcmf_net_detach(struct net_device *ndev, bool rtnl_locked)

{

	if (ndev->reg_state == NETREG_REGISTERED) {

		if (rtnl_locked)
@@ -686,6 +686,72 @@ static void brcmf_net_detach(struct net_device *ndev, bool rtnl_locked) 
	}

}



static int brcmf_net_mon_open(struct net_device *ndev)

{

	struct brcmf_if *ifp = netdev_priv(ndev);

	struct brcmf_pub *drvr = ifp->drvr;

	u32 monitor;

	int err;



	brcmf_dbg(TRACE, "Enter\n");



	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_MONITOR, &monitor);

	if (err) {

		bphy_err(drvr, "BRCMF_C_GET_MONITOR error (%d)\n", err);

		return err;

	} else if (monitor) {

		bphy_err(drvr, "Monitor mode is already enabled\n");

		return -EEXIST;

	}



	monitor = 3;

	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_MONITOR, monitor);

	if (err)

		bphy_err(drvr, "BRCMF_C_SET_MONITOR error (%d)\n", err);



	return err;

}



static int brcmf_net_mon_stop(struct net_device *ndev)

{

	struct brcmf_if *ifp = netdev_priv(ndev);

	struct brcmf_pub *drvr = ifp->drvr;

	u32 monitor;

	int err;



	brcmf_dbg(TRACE, "Enter\n");



	monitor = 0;

	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_MONITOR, monitor);

	if (err)

		bphy_err(drvr, "BRCMF_C_SET_MONITOR error (%d)\n", err);



	return err;

}



static const struct net_device_ops brcmf_netdev_ops_mon = {

	.ndo_open = brcmf_net_mon_open,

	.ndo_stop = brcmf_net_mon_stop,

};



int brcmf_net_mon_attach(struct brcmf_if *ifp)

{

	struct brcmf_pub *drvr = ifp->drvr;

	struct net_device *ndev;

	int err;



	brcmf_dbg(TRACE, "Enter\n");



	ndev = ifp->ndev;

	ndev->netdev_ops = &brcmf_netdev_ops_mon;



	err = register_netdevice(ndev);

	if (err)

		bphy_err(drvr, "Failed to register %s device\n", ndev->name);



	return err;

}



void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on)

{

	struct net_device *ndev;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ void brcmf_txflowblock_if(struct brcmf_if *ifp, 
void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);

void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb);

void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb);

void brcmf_net_detach(struct net_device *ndev, bool rtnl_locked);

int brcmf_net_mon_attach(struct brcmf_if *ifp);

void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on);

int __init brcmf_core_init(void);

void __exit brcmf_core_exit(void);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static const struct brcmf_feat_fwcap brcmf_fwcap_map[] = { 
	{ BRCMF_FEAT_MCHAN, "mchan" },

	{ BRCMF_FEAT_P2P, "p2p" },

	{ BRCMF_FEAT_MONITOR, "monitor" },

	{ BRCMF_FEAT_MONITOR_FLAG, "rtap" },

	{ BRCMF_FEAT_MONITOR_FMT_RADIOTAP, "rtap" },

	{ BRCMF_FEAT_DOT11H, "802.11h" },

	{ BRCMF_FEAT_SAE, "sae" },

drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 * GSCAN: enhanced scan offload feature.

 * FWSUP: Firmware supplicant.

 * MONITOR: firmware can pass monitor packets to host.

 * MONITOR_FLAG: firmware flags monitor packets.

 * MONITOR_FMT_RADIOTAP: firmware provides monitor packets with radiotap header

 * MONITOR_FMT_HW_RX_HDR: firmware provides monitor packets with hw/ucode header

 * DOT11H: firmware supports 802.11h
@@ -44,6 +45,7 @@ 
	BRCMF_FEAT_DEF(GSCAN) \

	BRCMF_FEAT_DEF(FWSUP) \

	BRCMF_FEAT_DEF(MONITOR) \

	BRCMF_FEAT_DEF(MONITOR_FLAG) \

	BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) \

	BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR) \

	BRCMF_FEAT_DEF(DOT11H) \

CRA Git | Maintained and supported by SUSTech CRA and CCSE