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

Commit e00243fa authored by Lior David's avatar Lior David Committed by Kalle Valo
Browse files

wil6210: infrastructure for multiple virtual interfaces 



Simple infrastructure changes for supporting multiple
virtual interfaces (multiple VIFs).
It is still not possible to add new VIFs so the only VIF
belongs to the main interface.
Main changes:
1. Add MAC ID(mid) argument to wmi_send and wmi_call to
allow invoking WMI commands on different VIFs.
2. Similarly, in WMI event handler look at the mid reported
by FW and extract VIF structure (currently only for main
interface). All WMI event handlers operate on wil6210_vif
structure so they know on which VIF they were called.
3. Trivial changes to use wil6210_vif structure and MID
throughout the code.
4. Various changes to logging to report MID.

More complete multiple VIFs support will be added gradually
in next patches.

Signed-off-by: default avatarLior David <liord@codeaurora.org>
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 7bfe9e22

drivers/net/wireless/ath/wil6210/cfg80211.c

+199 −142

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ath/wil6210/debug.c

+5 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013,2016 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -25,7 +26,7 @@ void __wil_err(struct wil6210_priv *wil, const char *fmt, ...) 
	va_start(args, fmt);

	vaf.fmt = fmt;

	vaf.va = &args;

	netdev_err(wil_to_ndev(wil), "%pV", &vaf);

	netdev_err(wil->main_ndev, "%pV", &vaf);

	trace_wil6210_log_err(&vaf);

	va_end(args);

}
@@ -41,7 +42,7 @@ void __wil_err_ratelimited(struct wil6210_priv *wil, const char *fmt, ...) 
	va_start(args, fmt);

	vaf.fmt = fmt;

	vaf.va = &args;

	netdev_err(wil_to_ndev(wil), "%pV", &vaf);

	netdev_err(wil->main_ndev, "%pV", &vaf);

	trace_wil6210_log_err(&vaf);

	va_end(args);

}
@@ -57,7 +58,7 @@ void wil_dbg_ratelimited(const struct wil6210_priv *wil, const char *fmt, ...) 
	va_start(args, fmt);

	vaf.fmt = fmt;

	vaf.va = &args;

	netdev_dbg(wil_to_ndev(wil), "%pV", &vaf);

	netdev_dbg(wil->main_ndev, "%pV", &vaf);

	trace_wil6210_log_dbg(&vaf);

	va_end(args);

}
@@ -70,7 +71,7 @@ void __wil_info(struct wil6210_priv *wil, const char *fmt, ...) 
	va_start(args, fmt);

	vaf.fmt = fmt;

	vaf.va = &args;

	netdev_info(wil_to_ndev(wil), "%pV", &vaf);

	netdev_info(wil->main_ndev, "%pV", &vaf);

	trace_wil6210_log_info(&vaf);

	va_end(args);

}

drivers/net/wireless/ath/wil6210/debugfs.c

+41 −21
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -621,7 +622,7 @@ static ssize_t wil_write_file_reset(struct file *file, const char __user *buf, 
				    size_t len, loff_t *ppos)

{

	struct wil6210_priv *wil = file->private_data;

	struct net_device *ndev = wil_to_ndev(wil);

	struct net_device *ndev = wil->main_ndev;



	/**

	 * BUG:
@@ -716,27 +717,44 @@ static ssize_t wil_write_back(struct file *file, const char __user *buf, 
	if (rc < 2)

		return -EINVAL;



	if (0 == strcmp(cmd, "add")) {

	if ((strcmp(cmd, "add") == 0) ||

	    (strcmp(cmd, "del_tx") == 0)) {

		struct vring_tx_data *txdata;



		if (p1 < 0 || p1 >= WIL6210_MAX_TX_RINGS) {

			wil_err(wil, "BACK: invalid ring id %d\n", p1);

			return -EINVAL;

		}

		txdata = &wil->vring_tx_data[p1];

		if (strcmp(cmd, "add") == 0) {

			if (rc < 3) {

				wil_err(wil, "BACK: add require at least 2 params\n");

				return -EINVAL;

			}

			if (rc < 4)

				p3 = 0;

		wmi_addba(wil, p1, p2, p3);

	} else if (0 == strcmp(cmd, "del_tx")) {

			wmi_addba(wil, txdata->mid, p1, p2, p3);

		} else {

			if (rc < 3)

				p2 = WLAN_REASON_QSTA_LEAVE_QBSS;

		wmi_delba_tx(wil, p1, p2);

	} else if (0 == strcmp(cmd, "del_rx")) {

			wmi_delba_tx(wil, txdata->mid, p1, p2);

		}

	} else if (strcmp(cmd, "del_rx") == 0) {

		struct wil_sta_info *sta;



		if (rc < 3) {

			wil_err(wil,

				"BACK: del_rx require at least 2 params\n");

			return -EINVAL;

		}

		if (p1 < 0 || p1 >= WIL6210_MAX_CID) {

			wil_err(wil, "BACK: invalid CID %d\n", p1);

			return -EINVAL;

		}

		if (rc < 4)

			p3 = WLAN_REASON_QSTA_LEAVE_QBSS;

		wmi_delba_rx(wil, mk_cidxtid(p1, p2), p3);

		sta = &wil->sta[p1];

		wmi_delba_rx(wil, sta->mid, mk_cidxtid(p1, p2), p3);

	} else {

		wil_err(wil, "BACK: Unrecognized command \"%s\"\n", cmd);

		return -EINVAL;
@@ -855,7 +873,7 @@ static ssize_t wil_write_file_txmgmt(struct file *file, const char __user *buf, 
{

	struct wil6210_priv *wil = file->private_data;

	struct wiphy *wiphy = wil_to_wiphy(wil);

	struct wireless_dev *wdev = wil_to_wdev(wil);

	struct wireless_dev *wdev = wil->main_ndev->ieee80211_ptr;

	struct cfg80211_mgmt_tx_params params;

	int rc;

	void *frame;
@@ -890,6 +908,7 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, 
				  size_t len, loff_t *ppos)

{

	struct wil6210_priv *wil = file->private_data;

	struct wil6210_vif *vif = ndev_to_vif(wil->main_ndev);

	struct wmi_cmd_hdr *wmi;

	void *cmd;

	int cmdlen = len - sizeof(struct wmi_cmd_hdr);
@@ -912,7 +931,7 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, 
	cmd = (cmdlen > 0) ? &wmi[1] : NULL;

	cmdid = le16_to_cpu(wmi->command_id);



	rc1 = wmi_send(wil, cmdid, cmd, cmdlen);

	rc1 = wmi_send(wil, cmdid, vif->mid, cmd, cmdlen);

	kfree(wmi);



	wil_info(wil, "0x%04x[%d] -> %d\n", cmdid, cmdlen, rc1);
@@ -1050,6 +1069,7 @@ static int wil_bf_debugfs_show(struct seq_file *s, void *data) 
	int rc;

	int i;

	struct wil6210_priv *wil = s->private;

	struct wil6210_vif *vif = ndev_to_vif(wil->main_ndev);

	struct wmi_notify_req_cmd cmd = {

		.interval_usec = 0,

	};
@@ -1062,7 +1082,8 @@ static int wil_bf_debugfs_show(struct seq_file *s, void *data) 
		u32 status;



		cmd.cid = i;

		rc = wmi_call(wil, WMI_NOTIFY_REQ_CMDID, &cmd, sizeof(cmd),

		rc = wmi_call(wil, WMI_NOTIFY_REQ_CMDID, vif->mid,

			      &cmd, sizeof(cmd),

			      WMI_NOTIFY_REQ_DONE_EVENTID, &reply,

			      sizeof(reply), 20);

		/* if reply is all-0, ignore this CID */
@@ -1155,7 +1176,7 @@ static const struct file_operations fops_temp = { 
static int wil_freq_debugfs_show(struct seq_file *s, void *data)

{

	struct wil6210_priv *wil = s->private;

	struct wireless_dev *wdev = wil_to_wdev(wil);

	struct wireless_dev *wdev = wil->main_ndev->ieee80211_ptr;

	u16 freq = wdev->chandef.chan ? wdev->chandef.chan->center_freq : 0;



	seq_printf(s, "Freq = %d\n", freq);
@@ -1180,6 +1201,7 @@ static int wil_link_debugfs_show(struct seq_file *s, void *data) 
{

	struct wil6210_priv *wil = s->private;

	struct station_info sinfo;

	struct wil6210_vif *vif = ndev_to_vif(wil->main_ndev);

	int i, rc;



	for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {
@@ -1200,7 +1222,7 @@ static int wil_link_debugfs_show(struct seq_file *s, void *data) 
		seq_printf(s, "[%d] %pM %s\n", i, p->addr, status);



		if (p->status == wil_sta_connected) {

			rc = wil_cid_fill_sinfo(wil, i, &sinfo);

			rc = wil_cid_fill_sinfo(vif, i, &sinfo);

			if (rc)

				return rc;
@@ -1229,7 +1251,7 @@ static const struct file_operations fops_link = { 
static int wil_info_debugfs_show(struct seq_file *s, void *data)

{

	struct wil6210_priv *wil = s->private;

	struct net_device *ndev = wil_to_ndev(wil);

	struct net_device *ndev = wil->main_ndev;

	int is_ac = power_supply_is_system_supplied();

	int rx = atomic_xchg(&wil->isr_count_rx, 0);

	int tx = atomic_xchg(&wil->isr_count_tx, 0);
@@ -1773,11 +1795,9 @@ static void wil6210_debugfs_init_isr(struct wil6210_priv *wil, 


/* fields in struct wil6210_priv */

static const struct dbg_off dbg_wil_off[] = {

	WIL_FIELD(privacy,	0444,		doff_u32),

	WIL_FIELD(status[0],	0644,	doff_ulong),

	WIL_FIELD(hw_version,	0444,	doff_x32),

	WIL_FIELD(recovery_count, 0444,	doff_u32),

	WIL_FIELD(ap_isolate,	0444,	doff_u32),

	WIL_FIELD(discovery_mode, 0644,	doff_u8),

	WIL_FIELD(chip_revision, 0444,	doff_u8),

	WIL_FIELD(abft_len, 0644,		doff_u8),

drivers/net/wireless/ath/wil6210/ethtool.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014,2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -74,12 +75,13 @@ static int wil_ethtoolops_set_coalesce(struct net_device *ndev, 
				       struct ethtool_coalesce *cp)

{

	struct wil6210_priv *wil = ndev_to_wil(ndev);

	struct wireless_dev *wdev = ndev->ieee80211_ptr;

	int ret;



	wil_dbg_misc(wil, "ethtoolops_set_coalesce: rx %d usec, tx %d usec\n",

		     cp->rx_coalesce_usecs, cp->tx_coalesce_usecs);



	if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR) {

	if (wdev->iftype == NL80211_IFTYPE_MONITOR) {

		wil_dbg_misc(wil, "No IRQ coalescing in monitor mode\n");

		return -EINVAL;

	}

drivers/net/wireless/ath/wil6210/interrupt.c

+4 −2
Original line number Diff line number Diff line
@@ -188,12 +188,14 @@ void wil_unmask_irq(struct wil6210_priv *wil) 


void wil_configure_interrupt_moderation(struct wil6210_priv *wil)

{

	struct wireless_dev *wdev = wil->main_ndev->ieee80211_ptr;



	wil_dbg_irq(wil, "configure_interrupt_moderation\n");



	/* disable interrupt moderation for monitor

	 * to get better timestamp precision

	 */

	if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR)

	if (wdev->iftype == NL80211_IFTYPE_MONITOR)

		return;



	/* Disable and clear tx counter before (re)configuration */
@@ -340,7 +342,7 @@ static irqreturn_t wil6210_irq_tx(int irq, void *cookie) 


static void wil_notify_fw_error(struct wil6210_priv *wil)

{

	struct device *dev = &wil_to_ndev(wil)->dev;

	struct device *dev = &wil->main_ndev->dev;

	char *envp[3] = {

		[0] = "SOURCE=wil6210",

		[1] = "EVENT=FW_ERROR",