* [PATCH v3 2/3] nl80211: Limit certain commands to interface owner
From: Denis Kenzior @ 2019-07-01 15:33 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, Denis Kenzior
In-Reply-To: <20190701153317.27170-1-denkenz@gmail.com>
If the wdev object has been created (via NEW_INTERFACE) with
SOCKET_OWNER attribute set, then limit certain commands only to the
process that created that wdev.
This can be used to make sure no other process on the system interferes
by sending unwanted scans, action frames or any other funny business.
This patch introduces a new internal flag, and checks that flag in the
pre_doit hook.
Signed-off-by: Denis Kenzior <denkenz@gmail.com>
---
net/wireless/nl80211.c | 80 ++++++++++++++++++++++++++++++++----------
1 file changed, 61 insertions(+), 19 deletions(-)
Changes in v3:
- Fix minor locking mistake reported by kernel test robot
Changes in v2:
- None
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ff760ba83449..ebf5eab1f9b2 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -13587,6 +13587,7 @@ static int nl80211_probe_mesh_link(struct sk_buff *skb, struct genl_info *info)
#define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\
NL80211_FLAG_CHECK_NETDEV_UP)
#define NL80211_FLAG_CLEAR_SKB 0x20
+#define NL80211_FLAG_OWNER_ONLY 0x40
static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
struct genl_info *info)
@@ -13595,6 +13596,7 @@ static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
struct wireless_dev *wdev;
struct net_device *dev;
bool rtnl = ops->internal_flags & NL80211_FLAG_NEED_RTNL;
+ int ret;
if (rtnl)
rtnl_lock();
@@ -13602,10 +13604,10 @@ static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
if (ops->internal_flags & NL80211_FLAG_NEED_WIPHY) {
rdev = cfg80211_get_dev_from_info(genl_info_net(info), info);
if (IS_ERR(rdev)) {
- if (rtnl)
- rtnl_unlock();
- return PTR_ERR(rdev);
+ ret = PTR_ERR(rdev);
+ goto done;
}
+
info->user_ptr[0] = rdev;
} else if (ops->internal_flags & NL80211_FLAG_NEED_NETDEV ||
ops->internal_flags & NL80211_FLAG_NEED_WDEV) {
@@ -13614,32 +13616,33 @@ static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
wdev = __cfg80211_wdev_from_attrs(genl_info_net(info),
info->attrs);
if (IS_ERR(wdev)) {
- if (rtnl)
- rtnl_unlock();
- return PTR_ERR(wdev);
+ ret = PTR_ERR(wdev);
+ goto done;
}
dev = wdev->netdev;
rdev = wiphy_to_rdev(wdev->wiphy);
+ ret = -EINVAL;
if (ops->internal_flags & NL80211_FLAG_NEED_NETDEV) {
- if (!dev) {
- if (rtnl)
- rtnl_unlock();
- return -EINVAL;
- }
+ if (!dev)
+ goto done;
info->user_ptr[1] = dev;
} else {
info->user_ptr[1] = wdev;
}
+ ret = -ENETDOWN;
if (ops->internal_flags & NL80211_FLAG_CHECK_NETDEV_UP &&
- !wdev_running(wdev)) {
- if (rtnl)
- rtnl_unlock();
- return -ENETDOWN;
- }
+ !wdev_running(wdev))
+ goto done;
+
+ ret = -EPERM;
+ if (ops->internal_flags & NL80211_FLAG_OWNER_ONLY &&
+ wdev->owner_nlportid &&
+ wdev->owner_nlportid != info->snd_portid)
+ goto done;
if (dev)
dev_hold(dev);
@@ -13647,7 +13650,13 @@ static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
info->user_ptr[0] = rdev;
}
- return 0;
+ ret = 0;
+
+done:
+ if (rtnl && ret < 0)
+ rtnl_unlock();
+
+ return ret;
}
static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
@@ -13712,7 +13721,8 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_set_interface,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV |
- NL80211_FLAG_NEED_RTNL,
+ NL80211_FLAG_NEED_RTNL |
+ NL80211_FLAG_OWNER_ONLY,
},
{
.cmd = NL80211_CMD_NEW_INTERFACE,
@@ -13728,7 +13738,8 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_del_interface,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV |
- NL80211_FLAG_NEED_RTNL,
+ NL80211_FLAG_NEED_RTNL |
+ NL80211_FLAG_OWNER_ONLY,
},
{
.cmd = NL80211_CMD_GET_KEY,
@@ -13745,6 +13756,7 @@ static const struct genl_ops nl80211_ops[] = {
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
NL80211_FLAG_NEED_RTNL |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_CLEAR_SKB,
},
{
@@ -13754,6 +13766,7 @@ static const struct genl_ops nl80211_ops[] = {
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
NL80211_FLAG_NEED_RTNL |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_CLEAR_SKB,
},
{
@@ -13762,6 +13775,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_del_key,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13778,6 +13792,7 @@ static const struct genl_ops nl80211_ops[] = {
.flags = GENL_UNS_ADMIN_PERM,
.doit = nl80211_start_ap,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13786,6 +13801,7 @@ static const struct genl_ops nl80211_ops[] = {
.flags = GENL_UNS_ADMIN_PERM,
.doit = nl80211_stop_ap,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13802,6 +13818,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_set_station,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13810,6 +13827,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_new_station,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13818,6 +13836,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_del_station,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13921,6 +13940,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_trigger_scan,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13929,6 +13949,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_abort_scan,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13942,6 +13963,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_start_sched_scan,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13950,6 +13972,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_stop_sched_scan,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13958,6 +13981,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_authenticate,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL |
NL80211_FLAG_CLEAR_SKB,
},
@@ -13967,6 +13991,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_associate,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL |
NL80211_FLAG_CLEAR_SKB,
},
@@ -13976,6 +14001,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_deauthenticate,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13984,6 +14010,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_disassociate,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -13992,6 +14019,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_join_ibss,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14000,6 +14028,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_leave_ibss,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
#ifdef CONFIG_NL80211_TESTMODE
@@ -14019,6 +14048,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_connect,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL |
NL80211_FLAG_CLEAR_SKB,
},
@@ -14028,6 +14058,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_update_connect_params,
.flags = GENL_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL |
NL80211_FLAG_CLEAR_SKB,
},
@@ -14037,6 +14068,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_disconnect,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14083,6 +14115,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_remain_on_channel,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14091,6 +14124,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_cancel_remain_on_channel,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14115,6 +14149,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_tx_mgmt,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14123,6 +14158,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_tx_mgmt_cancel_wait,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14147,6 +14183,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_set_cqm,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14221,6 +14258,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_set_rekey_data,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL |
NL80211_FLAG_CLEAR_SKB,
},
@@ -14278,6 +14316,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_start_p2p_device,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14286,6 +14325,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_stop_p2p_device,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14371,6 +14411,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_crit_protocol_start,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
@@ -14379,6 +14420,7 @@ static const struct genl_ops nl80211_ops[] = {
.doit = nl80211_crit_protocol_stop,
.flags = GENL_UNS_ADMIN_PERM,
.internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_OWNER_ONLY |
NL80211_FLAG_NEED_RTNL,
},
{
--
2.21.0
^ permalink raw reply related
* [PATCH][next] iwlwifi: mvm: fix comparison of u32 variable with less than zero
From: Colin King @ 2019-07-01 16:27 UTC (permalink / raw)
To: Haim Dreyfuss, linux-wireless; +Cc: kernel-janitors
From: Colin Ian King <colin.king@canonical.com>
The comparison of the u32 variable wgds_tbl_idx with less than zero is
always going to be false because it is unsigned. Fix this by making
wgds_tbl_idx a plain signed int.
Addresses-Coverity: ("Unsigned compared against 0")
Fixes: 4fd445a2c855 ("iwlwifi: mvm: Add log information about SAR status")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
index 719f793b3487..a9bb43a2f27b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
@@ -620,7 +620,7 @@ void iwl_mvm_rx_chub_update_mcc(struct iwl_mvm *mvm,
enum iwl_mcc_source src;
char mcc[3];
struct ieee80211_regdomain *regd;
- u32 wgds_tbl_idx;
+ int wgds_tbl_idx;
lockdep_assert_held(&mvm->mutex);
--
2.20.1
^ permalink raw reply related
* [PATCH] mt76: mt7615: clean up FWDL TXQ during/after firmware upload
From: Felix Fietkau @ 2019-07-01 18:20 UTC (permalink / raw)
To: linux-wireless
Since we don't clean that tx queue from the tx tasklet, we need to do it
after the firmware upload is done. This patch also adds a cleanup step during
the upload, to help reclaim memory faster.
Fixes unprocessed queued frames eating up memory long after the firmware
upload has already completed
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 06d146198e33..de371bd2e0b9 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -248,6 +248,7 @@ static int mt7615_mcu_send_firmware(struct mt7615_dev *dev, const void *data,
data += cur_len;
len -= cur_len;
+ mt76_queue_tx_cleanup(dev, MT_TXQ_FWDL, false);
}
return ret;
@@ -525,6 +526,8 @@ static int mt7615_load_firmware(struct mt7615_dev *dev)
return -EIO;
}
+ mt76_queue_tx_cleanup(dev, MT_TXQ_FWDL, false);
+
dev_dbg(dev->mt76.dev, "Firmware init done\n");
return 0;
--
2.17.0
^ permalink raw reply related
* linux-next: Fixes tag needs some work in the wireless-drivers-next tree
From: Stephen Rothwell @ 2019-07-01 21:33 UTC (permalink / raw)
To: Kalle Valo, Wireless
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Dundi Raviteja
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi all,
In commit
c709df58832c ("ath10k: Fix memory leak in qmi")
Fixes tag
Fixes: fda6fee0001e ("ath10k: add QMI message handshake for wcn3990 client")
has these problem(s):
- Target SHA1 does not exist
Did you mean
Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* RE: linux-next: Fixes tag needs some work in the wireless-drivers-next tree
From: dundi @ 2019-07-02 4:26 UTC (permalink / raw)
To: 'Stephen Rothwell', 'Kalle Valo',
'Wireless'
Cc: 'Linux Next Mailing List',
'Linux Kernel Mailing List'
In-Reply-To: <20190702073306.3bd439ab@canb.auug.org.au>
Hi Stephen,
You are correct, Its
Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client")
My bad, I added last 12 digits instead of first 12 digits of SHA1.
Regards,
Dundi
-----Original Message-----
From: Stephen Rothwell <sfr@canb.auug.org.au>
Sent: Tuesday, July 2, 2019 3:03 AM
To: Kalle Valo <kvalo@codeaurora.org>; Wireless
<linux-wireless@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel
Mailing List <linux-kernel@vger.kernel.org>; Dundi Raviteja
<dundi@codeaurora.org>
Subject: linux-next: Fixes tag needs some work in the wireless-drivers-next
tree
Hi all,
In commit
c709df58832c ("ath10k: Fix memory leak in qmi")
Fixes tag
Fixes: fda6fee0001e ("ath10k: add QMI message handshake for wcn3990
client")
has these problem(s):
- Target SHA1 does not exist
Did you mean
Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* [PATCH] ath10k:New interface to get interface combinations from FW
From: Zhonglin Zhang @ 2019-07-02 6:59 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless, Zhonglin Zhang
New wmi event "WMI_TLV_IFACE_COMBINATION_EVENTID" is used.
If WMI_SERVICE_IFACE_COMBINATION_SUPPORT service bit set and
WMI_TLV_IFACE_COMBINATION_EVENTID event got from FW side, then
interface combinations reported from FW will override the default
combinations which is hard-coded in host drivers.
Tested HW: WCN3990
Tested FW: WLAN.HL.3.1-01061-QCAHLSWMTPL-1
Signed-off-by: Zhonglin Zhang <zhonglin@codeaurora.org>
---
drivers/net/wireless/ath/ath10k/core.c | 2 +
drivers/net/wireless/ath/ath10k/core.h | 36 +++++
drivers/net/wireless/ath/ath10k/mac.c | 12 ++
drivers/net/wireless/ath/ath10k/wmi-tlv.c | 183 ++++++++++++++++++++++-
drivers/net/wireless/ath/ath10k/wmi-tlv.h | 232 ++++++++++++++++++++++++++++++
drivers/net/wireless/ath/ath10k/wmi.h | 2 +
6 files changed, 466 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index dc45d16..29d558a 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -3210,6 +3210,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
ath10k_core_set_coverage_class_work);
init_dummy_netdev(&ar->napi_dev);
+ ath10k_init_iface_comb(ar);
ret = ath10k_coredump_create(ar);
if (ret)
@@ -3248,6 +3249,7 @@ void ath10k_core_destroy(struct ath10k *ar)
ath10k_coredump_destroy(ar);
ath10k_htt_tx_destroy(&ar->htt);
ath10k_wmi_free_host_mem(ar);
+ ath10k_deinit_iface_comb(ar);
ath10k_mac_destroy(ar);
}
EXPORT_SYMBOL(ath10k_core_destroy);
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 4d7db07..4ec7517 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -40,6 +40,9 @@
#define ATH10K_NUM_CHANS 41
#define ATH10K_MAX_5G_CHAN 173
+#define MAX_NUM_IFACE_COMBINATIONS 16
+#define BEACON_TX_OFFLOAD_MAX_VDEV 2
+
/* Antenna noise floor */
#define ATH10K_DEFAULT_NOISE_FLOOR -95
@@ -940,6 +943,13 @@ struct ath10k_bus_params {
bool hl_msdu_ids;
};
+struct ath10k_iface_comb {
+ struct ieee80211_iface_combination combo[MAX_NUM_IFACE_COMBINATIONS];
+ u16 combo_sz;
+ u16 interface_modes;
+ u32 beacon_tx_offload_max_vdev;
+};
+
struct ath10k {
struct ath_common ath_common;
struct ieee80211_hw *hw;
@@ -1211,10 +1221,36 @@ struct ath10k {
struct ath10k_bus_params bus_param;
struct completion peer_delete_done;
+ /* iface combination */
+ struct ath10k_iface_comb iface;
+
/* must be last */
u8 drv_priv[0] __aligned(sizeof(void *));
};
+static inline void ath10k_init_iface_comb(struct ath10k *ar)
+{
+ memset(&ar->iface, 0, sizeof(struct ath10k_iface_comb));
+ ar->iface.beacon_tx_offload_max_vdev = BEACON_TX_OFFLOAD_MAX_VDEV;
+}
+
+static inline void ath10k_deinit_iface_comb(struct ath10k *ar)
+{
+ int i;
+
+ for (i = 0; i < ar->iface.combo_sz; i++) {
+ kfree(ar->iface.combo[i].limits);
+ ar->iface.combo[i].limits = NULL;
+ }
+}
+
+static inline void ath10k_iface_comb_assignment(struct ath10k *ar)
+{
+ ar->hw->wiphy->iface_combinations = ar->iface.combo;
+ ar->hw->wiphy->n_iface_combinations = ar->iface.combo_sz;
+ ar->hw->wiphy->interface_modes = ar->iface.interface_modes;
+}
+
static inline bool ath10k_peer_stats_enabled(struct ath10k *ar)
{
if (test_bit(ATH10K_FLAG_PEER_STATS, &ar->dev_flags) &&
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index e43a566..0e90f30 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -8913,6 +8913,18 @@ int ath10k_mac_register(struct ath10k *ar)
ARRAY_SIZE(ath10k_tlv_if_comb);
}
ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
+
+ if (test_bit
+ (WMI_SERVICE_IFACE_COMBINATION_SUPPORT, ar->wmi.svc_map)) {
+ /**
+ * If combo_sz is not ZERO, it means that host will use
+ * iface_combinations reported from FW.
+ */
+ if (ar->iface.combo_sz)
+ ath10k_iface_comb_assignment(ar);
+ else
+ ath10k_warn(ar, "iface combination event missing!\n");
+ }
break;
case ATH10K_FW_WMI_OP_VERSION_10_1:
case ATH10K_FW_WMI_OP_VERSION_10_2:
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index 2985bb1..ce89e96 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -64,6 +64,12 @@ static const struct wmi_tlv_policy wmi_tlv_policies[] = {
= { .min_len = sizeof(struct wmi_tlv_wow_event_info) },
[WMI_TLV_TAG_STRUCT_TX_PAUSE_EVENT]
= { .min_len = sizeof(struct wmi_tlv_tx_pause_ev) },
+ [WMI_TLV_TAG_STRUCT_IFACE_COMBINATION_IND_EVENT]
+ = { .min_len = sizeof(struct wmi_tlv_iface_combination_event) },
+ [WMI_TLV_TAG_STRUCT_IFACE_COMBINATION]
+ = { .min_len = sizeof(struct wmi_tlv_iface_combination) },
+ [WMI_TLV_TAG_STRUCT_IFACE_LIMIT]
+ = { .min_len = sizeof(struct wmi_tlv_iface_limit) },
};
static int
@@ -483,6 +489,177 @@ static int ath10k_wmi_tlv_event_peer_delete_resp(struct ath10k *ar,
return 0;
}
+static u16 ath10k_wmi_tlv_vdev_type_remap(struct wmi_tlv_iface_limit *limit)
+{
+ u32 vdev_has_type = __le32_to_cpu(limit->vdev_type);
+ u32 vdev_has_subtype = __le32_to_cpu(limit->vdev_subtype);
+ u16 type = 0;
+
+ if (vdev_has_subtype) {
+ if (vdev_has_subtype & BIT(WMI_VDEV_SUBTYPE_P2P_DEVICE))
+ type |= BIT(NL80211_IFTYPE_P2P_DEVICE);
+ if (vdev_has_subtype & BIT(WMI_VDEV_SUBTYPE_P2P_CLIENT))
+ type |= BIT(NL80211_IFTYPE_P2P_CLIENT);
+ if (vdev_has_subtype & BIT(WMI_VDEV_SUBTYPE_P2P_GO))
+ type |= BIT(NL80211_IFTYPE_P2P_GO);
+ } else {
+ if (vdev_has_type & BIT(WMI_VDEV_TYPE_AP))
+ type |= BIT(NL80211_IFTYPE_AP);
+ if (vdev_has_type & BIT(WMI_VDEV_TYPE_STA))
+ type |= BIT(NL80211_IFTYPE_STATION);
+ if (vdev_has_type & BIT(WMI_VDEV_TYPE_IBSS))
+ type |= BIT(NL80211_IFTYPE_ADHOC);
+ }
+
+ return type;
+}
+
+static int ath10k_wmi_tlv_iface_comb_parse(struct ath10k *ar, u16 tag, u16 len,
+ const void *ptr, void *data)
+{
+ int ret = 0;
+ unsigned long valid_fields = 0;
+ struct wmi_tlv_iface_comb_parse *p = data;
+ struct ieee80211_iface_combination *comb = &ar->iface.combo[0];
+ struct ieee80211_iface_limit *limit = NULL;
+
+ switch (tag) {
+ case WMI_TLV_TAG_STRUCT_IFACE_COMBINATION_IND_EVENT:
+ p->ev = (struct wmi_tlv_iface_combination_event *)ptr;
+ break;
+ case WMI_TLV_TAG_ARRAY_STRUCT:
+ ret = ath10k_wmi_tlv_iter(ar, ptr, len,
+ ath10k_wmi_tlv_iface_comb_parse, p);
+ break;
+ case WMI_TLV_TAG_STRUCT_IFACE_COMBINATION:
+ p->combs = (struct wmi_tlv_iface_combination *)ptr;
+
+ if (p->n_combs >= MAX_NUM_IFACE_COMBINATIONS) {
+ ath10k_warn(ar, "Exceed Max Num Iface Combinations!\n");
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ valid_fields = __le32_to_cpu(p->combs->valid_fields);
+
+ if (test_bit(WMI_TLV_IFACE_COMB_BCN_INT_MATCH_VALID_BIT,
+ &valid_fields))
+ comb[p->n_combs].beacon_int_infra_match =
+ __le32_to_cpu(p->combs->beacon_int_infra_match);
+
+ if (test_bit(WMI_TLV_IFACE_COMB_BCN_INT_MIN_GCD_VALID_BIT,
+ &valid_fields))
+ comb[p->n_combs].beacon_int_min_gcd =
+ __le32_to_cpu(p->combs->beacon_int_min_gcd);
+
+ comb[p->n_combs].limits =
+ kcalloc(p->combs->limits_n, sizeof(*limit), GFP_ATOMIC);
+ if (!comb[p->n_combs].limits) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ p->n_combs++;
+ ar->iface.combo_sz++;
+ break;
+ case WMI_TLV_TAG_STRUCT_IFACE_LIMIT:
+ p->limits = (struct wmi_tlv_iface_limit *)ptr;
+
+ /**
+ * p->comb_index: current iface combo index, default value 0
+ * comb[p->comb_index]: current iface comb
+ * p->limit_index: point to the next available iface limit slot,
+ * limit_index default value 0.
+ * comb[p->comb_index].n_limits: num of limits of this
+ * comb_index. n_limits value got from
+ * WMI_TLV_TAG_STRUCT_IFACE_COMBINATION assignment.
+ *
+ * So the logic here:
+ * 0) Basic precondition now we have got all comb(s) in
+ * WMI_TLV_TAG_STRUCT_IFACE_COMBINATION assignment.
+ * 1) if (limit_index >= n_limits of current iface combo, then
+ * this new iface limit will belong to a new iface combo. So
+ * update the index
+ * a. comb_index++ and limit_index reset as 0.
+ * b. comb_fill_max_interfaces point to the current iface
+ * combo to fill max_interfaces field. And its default
+ * value should point to the first iface combo.
+ * 2) Use combo_index/limit_index to do assignment, and finally
+ * limit_index++ to point to the next available limit slot.
+ * 3) Loop to 1) when find new iface limit, else exit the parse
+ * procedure.
+ */
+ if (p->limit_index >= comb[p->comb_index].n_limits) {
+ p->comb_index++;
+ p->limit_index = 0;
+ p->comb_fill_max_interfaces = &comb[p->comb_index];
+ }
+
+ limit = (struct ieee80211_iface_limit *)
+ &comb[p->comb_index].limits[p->limit_index];
+ limit->max = __le32_to_cpu(p->limits->vdev_limit_n);
+ limit->types = ath10k_wmi_tlv_vdev_type_remap(p->limits);
+ ar->iface.interface_modes |= limit->types;
+
+ /**
+ * ar->iface.beacon_tx_offload_max_vdev default value is 2.
+ * If limit type is AP and
+ * limit->max > ar->iface.beacon_tx_offload_max_vdev, we will
+ * override this value by limit->max. FW needs this value in
+ * WMI_INIT command for beacon offload function.
+ */
+ if ((limit->types & BIT(NL80211_IFTYPE_AP)) &&
+ limit->max > ar->iface.beacon_tx_offload_max_vdev)
+ ar->iface.beacon_tx_offload_max_vdev = limit->max;
+ if (!p->comb_fill_max_interfaces)
+ /* point to the first combination */
+ p->comb_fill_max_interfaces = comb;
+
+ p->comb_fill_max_interfaces->max_interfaces += limit->max;
+
+ p->limit_index++;
+ break;
+ default:
+ break;
+ }
+out:
+ if (ret) {
+ int i;
+
+ for (i = 0; i < p->n_combs; i++) {
+ kfree(comb[i].limits);
+ comb[i].limits = NULL;
+ }
+ }
+ return ret;
+}
+
+static int ath10k_wmi_tlv_iface_combination(struct ath10k *ar,
+ struct sk_buff *skb)
+{
+ int ret;
+ struct wmi_tlv_iface_comb_parse parse;
+
+ if (!test_bit(WMI_SERVICE_IFACE_COMBINATION_SUPPORT, ar->wmi.svc_map))
+ return 0;
+
+ memset(&parse, 0, sizeof(struct wmi_tlv_iface_comb_parse));
+
+ ath10k_deinit_iface_comb(ar);
+ ath10k_init_iface_comb(ar);
+
+ ret = ath10k_wmi_tlv_iter(ar, skb->data, skb->len,
+ ath10k_wmi_tlv_iface_comb_parse, &parse);
+
+ if (ret) {
+ ath10k_warn(ar, "%s:failed to parse tlv: %d\n", __func__, ret);
+ ar->iface.combo_sz = 0;
+ return ret;
+ }
+
+ return 0;
+}
+
/***********/
/* TLV ops */
/***********/
@@ -608,6 +785,9 @@ static void ath10k_wmi_tlv_op_rx(struct ath10k *ar, struct sk_buff *skb)
case WMI_TLV_SERVICE_READY_EVENTID:
ath10k_wmi_event_service_ready(ar, skb);
return;
+ case WMI_TLV_IFACE_COMBINATION_EVENTID:
+ ath10k_wmi_tlv_iface_combination(ar, skb);
+ break;
case WMI_TLV_READY_EVENTID:
ath10k_wmi_event_ready(ar, skb);
break;
@@ -1776,7 +1956,8 @@ static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar)
cfg->max_frag_entries = __cpu_to_le32(2);
cfg->num_tdls_vdevs = __cpu_to_le32(TARGET_TLV_NUM_TDLS_VDEVS);
cfg->num_tdls_conn_table_entries = __cpu_to_le32(0x20);
- cfg->beacon_tx_offload_max_vdev = __cpu_to_le32(2);
+ cfg->beacon_tx_offload_max_vdev =
+ __cpu_to_le32(ar->iface.beacon_tx_offload_max_vdev);
cfg->num_multicast_filter_entries = __cpu_to_le32(5);
cfg->num_wow_filters = __cpu_to_le32(ar->wow.max_num_patterns);
cfg->num_keep_alive_pattern = __cpu_to_le32(6);
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
index d691f06..71d7f396 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
@@ -288,6 +288,7 @@ enum wmi_tlv_event_id {
WMI_TLV_SERVICE_READY_EVENTID = 0x1,
WMI_TLV_READY_EVENTID,
WMI_TLV_SERVICE_AVAILABLE_EVENTID,
+ WMI_TLV_IFACE_COMBINATION_EVENTID,
WMI_TLV_SCAN_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_SCAN),
WMI_TLV_PDEV_TPC_CONFIG_EVENTID = WMI_TLV_EV(WMI_TLV_GRP_PDEV),
WMI_TLV_CHAN_INFO_EVENTID,
@@ -1217,6 +1218,121 @@ enum wmi_tlv_tag {
WMI_TLV_TAG_STRUCT_FD_SEND_FROM_HOST_CMD,
WMI_TLV_TAG_STRUCT_ENABLE_FILS_CMD,
WMI_TLV_TAG_STRUCT_HOST_SWFDA_EVENT,
+ WMI_TLV_TAG_STRUCT_BCN_OFFLOAD_CTRL_CMD,
+ WMI_TLV_TAG_STRUCT_PDEV_SET_AC_TXQ_OPTIMIZED_CMD,
+ WMI_TLV_TAG_STRUCT_STATS_PERIOD,
+ WMI_TLV_TAG_STRUCT_NDL_SCHEDULE_UPDATE,
+ WMI_TLV_TAG_STRUCT_PEER_TID_MSDUQ_QDEPTH_THRESH_UPDATE_CMD,
+ WMI_TLV_TAG_STRUCT_MSDUQ_QDEPTH_THRESH_UPDATE,
+ WMI_TLV_TAG_STRUCT_PDEV_SET_RX_FILTER_PROMISCUOUS_CMD,
+ WMI_TLV_TAG_STRUCT_SAR2_RESULT_EVENT,
+ WMI_TLV_TAG_STRUCT_SAR_CAPABILITIES,
+ WMI_TLV_TAG_STRUCT_SAP_OBSS_DETECTION_CFG_CMD,
+ WMI_TLV_TAG_STRUCT_SAP_OBSS_DETECTION_INFO_EVENT,
+ WMI_TLV_TAG_STRUCT_DMA_RING_CAPABILITIES,
+ WMI_TLV_TAG_STRUCT_DMA_RING_CFG_REQ,
+ WMI_TLV_TAG_STRUCT_DMA_RING_CFG_RSP,
+ WMI_TLV_TAG_STRUCT_DMA_BUF_RELEASE,
+ WMI_TLV_TAG_STRUCT_DMA_BUF_RELEASE_ENTRY,
+ WMI_TLV_TAG_STRUCT_SAR_GET_LIMITS_CMD,
+ WMI_TLV_TAG_STRUCT_SAR_GET_LIMITS_EVENT,
+ WMI_TLV_TAG_STRUCT_SAR_GET_LIMITS_EVENT_ROW,
+ WMI_TLV_TAG_STRUCT_OFFLOAD_11K_REPORT,
+ WMI_TLV_TAG_STRUCT_INVOKE_NEIGHBOR_REPORT,
+ WMI_TLV_TAG_STRUCT_NEIGHBOR_REPORT_OFFLOAD_TLV_PARAM,
+ WMI_TLV_TAG_STRUCT_VDEV_SET_CONNECTIVITY_CHECK_STATS,
+ WMI_TLV_TAG_STRUCT_VDEV_GET_CONNECTIVITY_CHECK_STATS,
+ WMI_TLV_TAG_STRUCT_BPF_SET_VDEV_ENABLE_CMD,
+ WMI_TLV_TAG_STRUCT_BPF_SET_VDEV_WORK_MEMORY_CMD,
+ WMI_TLV_TAG_STRUCT_BPF_GET_VDEV_WORK_MEMORY_CMD,
+ WMI_TLV_TAG_STRUCT_BPF_GET_VDEV_WORK_MEMORY_RESP_EVENT,
+ WMI_TLV_TAG_STRUCT_PDEV_GET_NFCAL_POWER,
+ WMI_TLV_TAG_STRUCT_BSS_COLOR_CHANGE_ENABLE,
+ WMI_TLV_TAG_STRUCT_OBSS_COLOR_COLLISION_DET_CONFIG,
+ WMI_TLV_TAG_STRUCT_OBSS_COLOR_COLLISION_EVENT,
+ WMI_TLV_TAG_STRUCT_RUNTIME_DPD_RECAL_CMD,
+ WMI_TLV_TAG_STRUCT_TWT_ENABLE_CMD,
+ WMI_TLV_TAG_STRUCT_TWT_DISABLE_CMD,
+ WMI_TLV_TAG_STRUCT_TWT_ADD_DIALOG_CMD,
+ WMI_TLV_TAG_STRUCT_TWT_DEL_DIALOG_CMD,
+ WMI_TLV_TAG_STRUCT_TWT_PAUSE_DIALOG_CMD,
+ WMI_TLV_TAG_STRUCT_TWT_RESUME_DIALOG_CMD,
+ WMI_TLV_TAG_STRUCT_TWT_ENABLE_COMPLETE_EVENT,
+ WMI_TLV_TAG_STRUCT_TWT_DISABLE_COMPLETE_EVENT,
+ WMI_TLV_TAG_STRUCT_TWT_ADD_DIALOG_COMPLETE_EVENT,
+ WMI_TLV_TAG_STRUCT_TWT_DEL_DIALOG_COMPLETE_EVENT,
+ WMI_TLV_TAG_STRUCT_TWT_PAUSE_DIALOG_COMPLETE_EVENT,
+ WMI_TLV_TAG_STRUCT_TWT_RESUME_DIALOG_COMPLETE_EVENT,
+ WMI_TLV_TAG_STRUCT_REQUEST_ROAM_SCAN_STATS_CMD,
+ WMI_TLV_TAG_STRUCT_ROAM_SCAN_STATS_EVENT,
+ WMI_TLV_TAG_STRUCT_PEER_TID_CONFIGURATIONS_CMD,
+ WMI_TLV_TAG_STRUCT_VDEV_SET_CUSTOM_SW_RETRY_TH_CMD,
+ WMI_TLV_TAG_STRUCT_GET_TPC_POWER_CMD,
+ WMI_TLV_TAG_STRUCT_GET_TPC_POWER_EVENT,
+ WMI_TLV_TAG_STRUCT_DMA_BUF_RELEASE_SPECTRAL_META_DATA,
+ WMI_TLV_TAG_STRUCT_MOTION_DET_CONFIG_PARAMS_CMD,
+ WMI_TLV_TAG_STRUCT_MOTION_DET_BASE_LINE_CONFIG_PARAMS_CMD,
+ WMI_TLV_TAG_STRUCT_MOTION_DET_START_STOP_CMD,
+ WMI_TLV_TAG_STRUCT_MOTION_DET_BASE_LINE_START_STOP_CMD,
+ WMI_TLV_TAG_STRUCT_MOTION_DET_EVENT,
+ WMI_TLV_TAG_STRUCT_MOTION_DET_BASE_LINE_EVENT,
+ WMI_TLV_TAG_STRUCT_NDP_TRANSPORT_IP_PARAM,
+ WMI_TLV_TAG_STRUCT_OBSS_SPATIAL_REUSE_SET_CMD,
+ WMI_TLV_TAG_STRUCT_ESP_ESTIMATE_EVENT,
+ WMI_TLV_TAG_STRUCT_NAN_HOST_CONFIG_PARAM,
+ WMI_TLV_TAG_STRUCT_SPECTRAL_BIN_SCALING_PARAM,
+ WMI_TLV_TAG_STRUCT_PEER_CFR_CAPTURE_CONF_CMD,
+ WMI_TLV_TAG_STRUCT_PEER_CHAN_WIDTH_SWITCH_CMD,
+ WMI_TLV_TAG_STRUCT_CHAN_WIDTH_PEER_LIST,
+ WMI_TLV_TAG_STRUCT_OBSS_SPATIAL_REUSE_SET_DEF_OBSS_THRESH_CMD,
+ WMI_TLV_TAG_STRUCT_PDEV_HE_TB_ACTION_FRM_CMD,
+ WMI_TLV_TAG_STRUCT_PEER_EXTD2_STATS,
+ WMI_TLV_TAG_STRUCT_HPCS_PULSE_START_CMD,
+ WMI_TLV_TAG_STRUCT_PDEV_CTL_FAILSAFE_CHECK_PARAM,
+ WMI_TLV_TAG_STRUCT_VDEV_CHAINMASK_CONFIG_CMD,
+ WMI_TLV_TAG_STRUCT_VDEV_BCN_OFFLOAD_QUIET_CONFIG_CMD,
+ WMI_TLV_TAG_STRUCT_NAN_EVENT_INFO,
+ WMI_TLV_TAG_STRUCT_NDP_CHANNEL_INFO,
+ WMI_TLV_TAG_STRUCT_NDP_CMD,
+ WMI_TLV_TAG_STRUCT_NDP_EVENT,
+ WMI_TLV_TAG_STRUCT_PDEV_PKTLOG_FILTER_CMD,
+ WMI_TLV_TAG_STRUCT_PDEV_PKTLOG_FILTER_INFO,
+ WMI_TLV_TAG_STRUCT_QUIET_OFFLOAD_INFO,
+ WMI_TLV_TAG_STRUCT_GET_BCN_RECV_STATS,
+ WMI_TLV_TAG_STRUCT_VDEV_BCN_RECV_STATS_EVENT,
+ WMI_TLV_TAG_STRUCT_PEER_TX_PN_REQUEST_CMD,
+ WMI_TLV_TAG_STRUCT_PEER_TX_PN_RESPONSE_EVENT,
+ WMI_TLV_TAG_STRUCT_TLV_ARRAYS_LEN_PARAM,
+ WMI_TLV_TAG_STRUCT_PEER_UNMAP_RESPONSE_CMD,
+ WMI_TLV_TAG_STRUCT_PDEV_CSC_SWITCH_COUNT_STATUS_EVENT,
+ WMI_TLV_TAG_STRUCT_ROAM_BSS_LOAD_CONFIG_CMD,
+ WMI_TLV_TAG_STRUCT_ROAM_BLACKLIST_EVENT,
+ WMI_TLV_TAG_STRUCT_CSC_VDEV_LIST,
+ WMI_TLV_TAG_STRUCT_VDEV_GET_MWS_COEX_INFO_CMD,
+ WMI_TLV_TAG_STRUCT_VDEV_GET_MWS_COEX_STATE,
+ WMI_TLV_TAG_STRUCT_VDEV_GET_MWS_COEX_DPWB_STATE,
+ WMI_TLV_TAG_STRUCT_VDEV_GET_MWS_COEX_TDM_STATE,
+ WMI_TLV_TAG_STRUCT_VDEV_GET_MWS_COEX_IDRX_STATE,
+ WMI_TLV_TAG_STRUCT_VDEV_GET_MWS_COEX_ANTENNA_SHARING_STATE,
+ WMI_TLV_TAG_STRUCT_REQUEST_WLM_STATS_CMD,
+ WMI_TLV_TAG_STRUCT_WLM_STATS_EVENT,
+ WMI_TLV_TAG_STRUCT_KEY_MATERIAL_EXT,
+ WMI_TLV_TAG_STRUCT_PEER_CFR_CAPTURE_EVENT,
+ WMI_TLV_TAG_STRUCT_COLD_BOOT_CAL_DATA,
+ WMI_TLV_TAG_STRUCT_PDEV_SET_RAP_CONFIG,
+ WMI_TLV_TAG_STRUCT_PDEV_SET_RAP_CONFIG_ON_STA_PS,
+ WMI_TLV_TAG_STRUCT_PDEV_RAP_INFO_EVENT,
+ WMI_TLV_TAG_STRUCT_STA_TDCC_CONFIG_CMD,
+ WMI_TLV_TAG_STRUCT_ROAM_DEAUTH_CONFIG_CMD,
+ WMI_TLV_TAG_STRUCT_ROAM_IDLE_CONFIG_CMD,
+ WMI_TLV_TAG_STRUCT_IDLE_TRIGGER_MONITOR_CMD,
+ WMI_TLV_TAG_STRUCT_STATS_INTERFERENCE,
+ WMI_TLV_TAG_STRUCT_ROAM_SCORE_DELTA_PARAM,
+ WMI_TLV_TAG_STRUCT_ROAM_CND_MIN_RSSI_PARAM,
+ WMI_TLV_TAG_STRUCT_CHAN_RF_CHARACTERIZATION_INFO,
+ WMI_TLV_TAG_STRUCT_IFACE_COMBINATION_IND_EVENT,
+ WMI_TLV_TAG_STRUCT_IFACE_COMBINATION,
+ WMI_TLV_TAG_STRUCT_IFACE_LIMIT,
WMI_TLV_TAG_MAX
};
@@ -1409,6 +1525,7 @@ enum wmi_tlv_service {
WMI_TLV_SERVICE_WLAN_HPCS_PULSE = 172,
WMI_TLV_SERVICE_PER_VDEV_CHAINMASK_CONFIG_SUPPORT = 173,
WMI_TLV_SERVICE_TX_DATA_MGMT_ACK_RSSI = 174,
+ WMI_TLV_SERVICE_IFACE_COMBINATION_SUPPORT = 209,
WMI_TLV_MAX_EXT_SERVICE = 256,
};
@@ -1588,6 +1705,8 @@ wmi_tlv_svc_map_ext(const __le32 *in, unsigned long *out, size_t len)
WMI_TLV_MAX_SERVICE);
SVCMAP(WMI_TLV_SERVICE_TX_DATA_MGMT_ACK_RSSI,
WMI_SERVICE_TX_DATA_ACK_RSSI, WMI_TLV_MAX_SERVICE);
+ SVCMAP(WMI_TLV_SERVICE_IFACE_COMBINATION_SUPPORT,
+ WMI_SERVICE_IFACE_COMBINATION_SUPPORT, WMI_TLV_MAX_SERVICE);
}
#undef SVCMAP
@@ -2483,4 +2602,117 @@ struct wmi_tlv_mgmt_tx_cmd {
__le32 frame_len;
__le32 buf_len;
} __packed;
+
+struct wmi_tlv_iface_combination_event {
+ /* common part */
+ __le32 pdev_n;
+
+ /* iface combination part
+ * wmi_tlv_iface_combinations[] will follow.
+ * 1. iface combinations:
+ * wmi_tlv_iface_combination combinations[0];
+ * wmi_tlv_iface_combination combinations[.];
+ * wmi_tlv_iface_combination combinations[m];
+ * ===========================================
+ * 2. limits for all combinations:
+ * 2.1 limits for first combination:
+ * wmi_tlv_iface_limit limits[0];
+ * wmi_tlv_iface_limit limits[vdev_limit_n - 1];
+ * -------------------------------------------
+ * 2.2 limits for next combination:
+ * wmi_tlv_iface_limit limits[i];
+ * wmi_tlv_iface_limit limits[vdev_limit_n - 1];
+ * -------------------------------------------
+ * 2.3 limits for the last combination:
+ * wmi_tlv_iface_limit limits[m];
+ * wmi_tlv_iface_limit limits[vdev_limit_n - 1];
+ */
+} __packed;
+
+struct wmi_tlv_iface_limit {
+ /**
+ * How many vdevs can work as below vdev_type/vdev_subtype
+ * in one combination
+ */
+ __le32 vdev_limit_n;
+
+ /* Indicate what role above vdev can work as
+ * Refer to "WMI_VDEV_TYPE_xx, WMI_VDEV_SUBTYPE_xx
+ * for role definition
+ */
+ __le32 vdev_type;
+ __le32 vdev_subtype;
+} __packed;
+
+#define WMI_TLV_IFACE_COMB_PEER_MAX_VALID_BIT 0
+#define WMI_TLV_IFACE_COMB_BCN_INT_MATCH_VALID_BIT 1
+#define WMI_TLV_IFACE_COMB_BCN_INT_MIN_GCD_VALID_BIT 2
+#define WMI_TLV_IFACE_COMB_NUM_UNIQUE_BI_VALID_BIT 3
+
+struct wmi_tlv_iface_combination {
+ /**
+ * Max num peers can be supported in this combination.
+ * It excludes the self-peers associated with each vdev.
+ * It's the number of real remote peers.
+ * eg: when working as AP mode, indicating how many clients can be
+ * supported to connect with this AP.
+ */
+ __le32 peer_max;
+ /**
+ * Home channels supported on one single phy concurrently
+ */
+ __le32 channel_n;
+ /**
+ * The number of "wmi_tlv_iface_limit" for a specified combination.
+ */
+ __le32 limits_n;
+ /**
+ * Beacon intervals between infrastructure and AP types must match
+ * or not.
+ * 1: need match
+ * 0: not need
+ */
+ __le32 beacon_int_infra_match;
+ /**
+ * This interface (vdev) combination supports different beacon
+ * intervals.
+ *
+ * = 0
+ * all beacon intervals for different interface must be same.
+ * > 0
+ * any beacon interval for the interface part of this combination AND
+ * GCD of all beacon intervals from beaconing interfaces of this
+ * combination must be greater or equal to this value.
+ */
+ __le32 beacon_int_min_gcd;
+ /**
+ * Number of different beacon intervals supported.
+ */
+ __le32 num_unique_bi;
+ /**
+ * This indicates which field contains valid value from FW side.
+ * All fields except channel_n and limits_n are optional.
+ */
+ __le32 valid_fields;
+} __packed;
+
+/**
+ * It is to save the parse status. Through the parse procedure,
+ * iface_combinations info will be got finally.
+ */
+struct wmi_tlv_iface_comb_parse {
+ struct wmi_tlv_iface_combination_event *ev;
+ struct wmi_tlv_iface_combination *combs;
+ struct wmi_tlv_iface_limit *limits;
+ /* for combos fill */
+ int n_combs;
+ struct ieee80211_iface_combination *comb_fill_max_interfaces;
+
+ /* for limits fill
+ * comb_index point to the current combo
+ * limit_index point to the next available limit slot
+ */
+ int comb_index;
+ int limit_index;
+};
#endif
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 838768c..cdba117 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -202,6 +202,7 @@ enum wmi_service {
WMI_SERVICE_REPORT_AIRTIME,
WMI_SERVICE_SYNC_DELETE_CMDS,
WMI_SERVICE_TX_PWR_PER_PEER,
+ WMI_SERVICE_IFACE_COMBINATION_SUPPORT,
/* Remember to add the new value to wmi_service_name()! */
@@ -496,6 +497,7 @@ static inline char *wmi_service_name(enum wmi_service service_id)
SVCSTR(WMI_SERVICE_REPORT_AIRTIME);
SVCSTR(WMI_SERVICE_SYNC_DELETE_CMDS);
SVCSTR(WMI_SERVICE_TX_PWR_PER_PEER);
+ SVCSTR(WMI_SERVICE_IFACE_COMBINATION_SUPPORT);
case WMI_SERVICE_MAX:
return NULL;
--
2.7.4
^ permalink raw reply related
* Re: [PATCH] rtl8xxxu: Fix wifi low signal strength issue of RTL8723BU
From: Chris Chiu @ 2019-07-02 8:01 UTC (permalink / raw)
To: Daniel Drake
Cc: Jes Sorensen, Kalle Valo, David Miller, linux-wireless, netdev,
Linux Kernel, Linux Upstreaming Team, Larry Finger
In-Reply-To: <CAD8Lp44R0a1=fVi=fGv69w1ppdcaFV01opkdkhaX-eJ=K=tYeA@mail.gmail.com>
On Mon, Jul 1, 2019 at 4:28 PM Daniel Drake <drake@endlessm.com> wrote:
>
> Hi Chris,
>
> On Thu, Jun 27, 2019 at 5:53 PM Chris Chiu <chiu@endlessm.com> wrote:
> > The WiFi tx power of RTL8723BU is extremely low after booting. So
> > the WiFi scan gives very limited AP list and it always fails to
> > connect to the selected AP. This module only supports 1x1 antenna
> > and the antenna is switched to bluetooth due to some incorrect
> > register settings.
> >
> > This commit hand over the antenna control to PTA, the wifi signal
> > will be back to normal and the bluetooth scan can also work at the
> > same time. However, the btcoexist still needs to be handled under
> > different circumstances. If there's a BT connection established,
> > the wifi still fails to connect until disconneting the BT.
> >
> > Signed-off-by: Chris Chiu <chiu@endlessm.com>
>
> Really nice work finding this!
>
> I know that after this change, you plan to bring over the btcoexist
> code from the vendor driver (or at least the minimum required code)
> for a more complete fix, but I'm curious how you found these magic
> register values and how they compare to the values used by the vendor
> driver with btcoexist?
>
> What's PTA? A type of firmware-implemented btcoexist that works for
> scanning but doesn't work when a BT connection is actually
> established?
>
When the vendor driver invokes rtw_btcoex_HAL_Initialize, which will then
call halbtc8723b1ant_SetAntPath to configure the registers in this patch.
From the code, the registers will have different register settings per the
antenna position and the phase. If the driver is in the InitHwConfig phase,
the register value is identical to what rtl8xxxu driver does in enable_rf().
However, the vendor driver will do halbtc8723b1ant_PsTdma() twice by
halbtc8723b1ant_ActionWifiNotConnected() with the type argument 8 for
PTA control about 200ms after InitHwConfig. The _ActionWifiNotConnected
is invoked by the BTCOEXIST. I keep seeing the halbtc8723b1ant_PsTdma
with type 8 been called every 2 seconds.
I don't know what PTA is. I presume it's the mechanism in FW for the automatic
antenna selecting instead of manual control. Given the phenomenon that wifi
signal still stays low even without bluetooth driver loaded, I believe
setting the
registers as in halbtc8723b1ant_SetAntPath with BTC_ANT_PATH_PTA also
makes sense.
> > diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
> > index 3adb1d3d47ac..6c3c70d93ac1 100644
> > --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
> > +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
> > @@ -1525,7 +1525,7 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv)
> > /*
> > * WLAN action by PTA
> > */
> > - rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x04);
> > + rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x0c);
>
> The comment above this still says "WLAN action by PTA" and the vendor
> driver has:
> //set wlan_act control by PTA
> pBtCoexist->fBtcWrite1Byte(pBtCoexist, 0x76e, 0x4);
>
> but then also:
> //set wlan_act control by PTA
> pBtCoexist->fBtcWrite1Byte(pBtCoexist, 0x76e, 0xc);
>
> So this change seems to be at least consistent with ambiguity of the
> vendor driver, do you have any understanding of the extra bit that is
> now set here?
>
I think the precise expression for 0x04 is "set wlan act to always low",
it's configured for wifi only.
> It's not easy to follow the code flow of the vendor driver to see what
> actually happens, have you checked that, does it end up using the 0xc
> value?
>
Yes, it ends up with 0x0c not matter what antenna position type is. Unless
it's configured wifi only.
> > - * 0x280, 0x00, 0x200, 0x80 - not clear
> > + * Different settings per different antenna position.
> > + * Antenna switch to BT: 0x280, 0x00 (inverse)
> > + * Antenna switch to WiFi: 0x0, 0x280 (inverse)
> > + * Antenna controlled by PTA: 0x200, 0x80 (inverse)
> > */
> > - rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x00);
> > + rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x80);
>
> I don't quite follow the comment here. Why are there 2 values listed
> for each possibility, what do you mean by inverse? You say the
> register settings were incorrect, but the previous value was 0x00
> which you now document as "antenna switch to wifi" which sounds like
> it was already correct?
>
> Which value does the vendor driver use?
>
The first column means the value for normal antenna installation, wifi
on the main port. The second column is the value for inverse antenna
installation. So if I want to manually switch the antenna for BT use,
and the antenna installation is inverse, I need to set to 0x280. So 0x80
means I want to switch to PTA and the antenna installation in inverse.
The vendor driver's code about this is also in halbtc8723b1ant_SetAntPath.
> > /*
> > * Software control, antenna at WiFi side
> > diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> > index 8136e268b4e6..87b2179a769e 100644
> > --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> > +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> > @@ -3891,12 +3891,13 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
> >
> > /* Check if MAC is already powered on */
> > val8 = rtl8xxxu_read8(priv, REG_CR);
> > + val16 = rtl8xxxu_read16(priv, REG_SYS_CLKR);
> >
> > /*
> > * Fix 92DU-VC S3 hang with the reason is that secondary mac is not
> > * initialized. First MAC returns 0xea, second MAC returns 0x00
> > */
> > - if (val8 == 0xea)
> > + if (val8 == 0xea || !(val16 & BIT(11)))
> > macpower = false;
> > else
> > macpower = true;
>
> At a glance I can't see which code this corresponds to in the vendor
> driver, can you point that out?
>
> Thanks
> Daniel
It's in rtl8723bu_hal_init and the comment says "Check if MAC has already
power on". In vendor driver, it's just for output messages but in rtl8xxxu, it
will determine whether if the llt_init() and tx related registers
being correctly
initialized. I sometimes hit the problem of connection failure after boot and
it's because the macpower is falsely true.
Chris
^ permalink raw reply
* Re: [PATCH 3/3] iwlwifi: add support for quz firmwares
From: Luciano Coelho @ 2019-07-02 8:03 UTC (permalink / raw)
To: Bjørn Mork; +Cc: kvalo, linux-wireless
In-Reply-To: <87k1el8ql9.fsf@miraculix.mork.no>
On Mon, 2019-05-20 at 10:42 +0200, Bjørn Mork wrote:
> Luca Coelho <luca@coelho.fi> writes:
>
> > --- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
> > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
> > @@ -549,6 +549,7 @@ extern const struct iwl_cfg iwl22000_2ac_cfg_hr;
> > extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;
> > extern const struct iwl_cfg iwl22000_2ac_cfg_jf;
> > extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;
> > +extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;
> > extern const struct iwl_cfg iwl22000_2ax_cfg_hr;
> > extern const struct iwl_cfg iwl_ax200_cfg_cc;
> > extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;
> > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
> > index aea6d03e545a..e539bc94eff7 100644
> > --- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
> > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
> > @@ -327,6 +327,7 @@ enum {
> > #define CSR_HW_REV_TYPE_NONE (0x00001F0)
> > #define CSR_HW_REV_TYPE_QNJ (0x0000360)
> > #define CSR_HW_REV_TYPE_QNJ_B0 (0x0000364)
> > +#define CSR_HW_REV_TYPE_QUZ (0x0000354)
> > #define CSR_HW_REV_TYPE_HR_CDB (0x0000340)
> > #define CSR_HW_REV_TYPE_SO (0x0000370)
> > #define CSR_HW_REV_TYPE_TY (0x0000420)
> > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> > index 1d6f3053f233..79c1dc05f948 100644
> > --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> > @@ -3543,6 +3543,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
> > }
> > } else if (cfg == &iwl_ax101_cfg_qu_hr) {
> > if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
> > + CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
> > + trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {
> > + trans->cfg = &iwl22000_2ax_cfg_qnj_hr_b0;
> > + } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
> > CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {
> > trans->cfg = &iwl_ax101_cfg_qu_hr;
> > } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
>
> Did you intend to use CSR_HW_REV_TYPE_QUZ and iwl_cfg
> iwl_ax101_cfg_quz_hr here, or am I misunderstanding something?
>
> Must admit that I didn't actually read the code. Just happend to look
> at this patch briefly while glancing through linux-wireless... Sorry if
> I'just adding noise.
Sorry for the late reply! But yes, you are right, this was a merge
damage. I'll send a patch fixing it.
Thanks a lot for the attentive eyes!
--
Cheers,
Luca.
^ permalink raw reply
* [PATCH] iwlwifi: fix support for quz firmwares
From: Luca Coelho @ 2019-07-02 9:05 UTC (permalink / raw)
To: kvalo; +Cc: linux-wireless, bjorn, Luca Coelho, stable
From: Luca Coelho <luciano.coelho@intel.com>
There was a merge damage when we added support for quz firmwares. We
should be checking for CSR_HW_REV_TYPE_QUZ and not
CSR_HW_REV_TYPE_QNJ_B0. Fix that.
Fixes: debec2f23910 ("iwlwifi: add support for quz firmwares")
Cc: stable@vger.kernel.org # v5.1
Reported-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 602c31b3992a..0338bf9184a5 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3579,8 +3579,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
} else if (cfg == &iwl_ax101_cfg_qu_hr) {
if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
- trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {
- trans->cfg = &iwl22000_2ax_cfg_qnj_hr_b0;
+ trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
+ trans->cfg = &iwl_ax101_cfg_quz_hr;
} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {
trans->cfg = &iwl_ax101_cfg_qu_hr;
--
2.20.1
^ permalink raw reply related
* [PATCH] mt76: mt7615: always release sem in mt7615_load_patch
From: Lorenzo Bianconi @ 2019-07-02 9:24 UTC (permalink / raw)
To: nbd; +Cc: lorenzo.bianconi, linux-wireless, ryder.lee, royluo
Release patch semaphore even if request_firmware fails in
mt7615_load_patch
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index a010c138f52b..0e72cda52343 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -314,9 +314,9 @@ static int mt7615_driver_own(struct mt7615_dev *dev)
static int mt7615_load_patch(struct mt7615_dev *dev)
{
- const struct firmware *fw;
- const struct mt7615_patch_hdr *hdr;
const char *firmware = MT7615_ROM_PATCH;
+ const struct mt7615_patch_hdr *hdr;
+ const struct firmware *fw = NULL;
int len, ret, sem;
sem = mt7615_mcu_patch_sem_ctrl(dev, 1);
@@ -332,7 +332,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev)
ret = request_firmware(&fw, firmware, dev->mt76.dev);
if (ret)
- return ret;
+ goto out;
if (!fw || !fw->data || fw->size < sizeof(*hdr)) {
dev_err(dev->mt76.dev, "Invalid firmware\n");
--
2.21.0
^ permalink raw reply related
* Re: use exact allocation for dma coherent memory
From: Arend Van Spriel @ 2019-07-02 9:48 UTC (permalink / raw)
To: Christoph Hellwig, Maarten Lankhorst, Maxime Ripard, Sean Paul,
David Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Ian Abbott, H Hartley Sweeten
Cc: devel, linux-s390, Intel Linux Wireless, linux-rdma, netdev,
intel-gfx, linux-wireless, linux-kernel, dri-devel, linux-mm,
iommu, moderated list:ARM PORT, linux-media
In-Reply-To: <20190701084833.GA22927@lst.de>
On 7/1/2019 10:48 AM, Christoph Hellwig wrote:
> On Fri, Jun 14, 2019 at 03:47:10PM +0200, Christoph Hellwig wrote:
>> Switching to a slightly cleaned up alloc_pages_exact is pretty easy,
>> but it turns out that because we didn't filter valid gfp_t flags
>> on the DMA allocator, a bunch of drivers were passing __GFP_COMP
>> to it, which is rather bogus in too many ways to explain. Arm has
>> been filtering it for a while, but this series instead tries to fix
>> the drivers and warn when __GFP_COMP is passed, which makes it much
>> larger than just adding the functionality.
>
> Dear driver maintainers,
>
> can you look over the patches touching your drivers, please? I'd
> like to get as much as possible of the driver patches into this
> merge window, so that it can you through your maintainer trees.
You made me look ;-) Actually not touching my drivers so I'm off the
hook. However, I was wondering if drivers could know so I decided to
look into the DMA-API.txt documentation which currently states:
"""
The flag parameter (dma_alloc_coherent() only) allows the caller to
specify the ``GFP_`` flags (see kmalloc()) for the allocation (the
implementation may choose to ignore flags that affect the location of
the returned memory, like GFP_DMA).
"""
I do expect you are going to change that description as well now that
you are going to issue a warning on __GFP_COMP. Maybe include that in
patch 15/16 where you introduce that warning.
Regards,
Arend
^ permalink raw reply
* [PATCH] brcmfmac: Replace two seq_printf() calls in brcmf_feat_fwcap_debugfs_read()
From: Markus Elfring @ 2019-07-02 9:50 UTC (permalink / raw)
To: netdev, linux-wireless, brcm80211-dev-list,
brcm80211-dev-list.pdl, Arend van Spriel, Chi-Hsien Lin,
David S. Miller, Franky Lin, Hante Meuleman, Kalle Valo,
Pieter-Paul Giesberts, Rafał Miłecki, Wright Feng
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 2 Jul 2019 11:31:07 +0200
A line break and a single string should be put into a sequence.
Thus use the corresponding output functions.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
index 73aff4e4039d..ec0e80296e43 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
@@ -225,10 +225,10 @@ static int brcmf_feat_fwcap_debugfs_read(struct seq_file *seq, void *data)
}
/* Usually there is a space at the end of capabilities string */
- seq_printf(seq, "%s", caps);
+ seq_puts(seq, caps);
/* So make sure we don't print two line breaks */
if (tmp > caps && *(tmp - 1) != '\n')
- seq_printf(seq, "\n");
+ seq_putc(seq, '\n');
return 0;
}
--
2.22.0
^ permalink raw reply related
* Re: [PATCH] brcmfmac: Replace two seq_printf() calls in brcmf_feat_fwcap_debugfs_read()
From: Arend Van Spriel @ 2019-07-02 9:51 UTC (permalink / raw)
To: Markus Elfring, netdev, linux-wireless, brcm80211-dev-list,
brcm80211-dev-list.pdl, Chi-Hsien Lin, David S. Miller,
Franky Lin, Hante Meuleman, Kalle Valo, Pieter-Paul Giesberts,
Rafał Miłecki, Wright Feng
Cc: LKML, kernel-janitors
In-Reply-To: <7d96085a-76e8-c290-698a-e1473d3f4be7@web.de>
On 7/2/2019 11:50 AM, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 2 Jul 2019 11:31:07 +0200
>
> A line break and a single string should be put into a sequence.
> Thus use the corresponding output functions.
>
> This issue was detected by using the Coccinelle software.
pot-ato, po-tato
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
> index 73aff4e4039d..ec0e80296e43 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
> @@ -225,10 +225,10 @@ static int brcmf_feat_fwcap_debugfs_read(struct seq_file *seq, void *data)
> }
>
> /* Usually there is a space at the end of capabilities string */
> - seq_printf(seq, "%s", caps);
> + seq_puts(seq, caps);
> /* So make sure we don't print two line breaks */
> if (tmp > caps && *(tmp - 1) != '\n')
> - seq_printf(seq, "\n");
> + seq_putc(seq, '\n');
>
> return 0;
> }
> --
> 2.22.0
>
^ permalink raw reply
* [PATCH] HE: STA disassociate AP due to QOS NULL not sent
From: Shay Bar @ 2019-07-02 10:50 UTC (permalink / raw)
To: johannes@sipsolutions.net; +Cc: linux-wireless@vger.kernel.org, Shay Bar
In case of HE AP-STA link, ieee80211_send_nullfunc() will not send the QOS NULL packet to check if AP is still associated.
In this case, probe_send_count will be non zero and ieee80211_sta_work() will later disassociate the AP (although it didn't really send a test QOS NULL packet).
Fix is to decrement probe_send_count and not call ieee80211_send_nullfunc() in case of HE link.
Signed-off-by: Shay Bar <shay.bar@celeno.com>
---
net/mac80211/mlme.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 379d2ab6d327..bc5ed2dbe69b 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2511,7 +2511,10 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
if (ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) {
ifmgd->nullfunc_failed = false;
-ieee80211_send_nullfunc(sdata->local, sdata, false);
+if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE))
+ifmgd->probe_send_count--;
+else
+ieee80211_send_nullfunc(sdata->local, sdata, false);
} else {
int ssid_len;
--
2.22.0
________________________________
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any retransmission, dissemination, copying or other use of, or taking of any action in reliance upon this information is prohibited. If you received this in error, please contact the sender and delete the material from any computer. Nothing contained herein shall be deemed as a representation, warranty or a commitment by Celeno. No warranties are expressed or implied, including, but not limited to, any implied warranties of non-infringement, merchantability and fitness for a particular purpose.
________________________________
^ permalink raw reply related
* Re: [PATCH] HE: STA disassociate AP due to QOS NULL not sent
From: Johannes Berg @ 2019-07-02 10:55 UTC (permalink / raw)
To: Shay Bar; +Cc: linux-wireless@vger.kernel.org
In-Reply-To: <20190702105019.10633-1-shay.bar@celeno.com>
Hi,
Please put "mac80211" prefix, and resend the patch without line
wrapping.
It'd probably also be good to remove the 'legal footer', not sure I
should take patches with that.
Thanks,
johannes
^ permalink raw reply
* [PATCH] mt76: mt7615: introduce mt7615_mcu_send_ram_firmware routine
From: Lorenzo Bianconi @ 2019-07-02 11:39 UTC (permalink / raw)
To: nbd; +Cc: lorenzo.bianconi, linux-wireless, ryder.lee, royluo
Add mt7615_mcu_send_ram_firmware routine since mt7615_load_ram runs the
same code to send ram firmware to cr4 and n9 mcus. Moreover rename
gen_dl_mode in mt7615_mcu_gen_dl_mode.
This patch does not introduce any behaviour change, it is just code
refactor.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
.../net/wireless/mediatek/mt76/mt7615/mcu.c | 90 +++++++++----------
1 file changed, 42 insertions(+), 48 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 0e72cda52343..03aedf5076ca 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -380,7 +380,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev)
return ret;
}
-static u32 gen_dl_mode(u8 feature_set, bool is_cr4)
+static u32 mt7615_mcu_gen_dl_mode(u8 feature_set, bool is_cr4)
{
u32 ret = 0;
@@ -394,14 +394,45 @@ static u32 gen_dl_mode(u8 feature_set, bool is_cr4)
return ret;
}
+static int
+mt7615_mcu_send_ram_firmware(struct mt7615_dev *dev,
+ const struct mt7615_fw_trailer *hdr,
+ const u8 *data, bool is_cr4)
+{
+ int n_region = is_cr4 ? CR4_REGION_NUM : N9_REGION_NUM;
+ int err, i, offset = 0;
+ u32 len, addr, mode;
+
+ for (i = 0; i < n_region; i++) {
+ mode = mt7615_mcu_gen_dl_mode(hdr[i].feature_set, is_cr4);
+ len = le32_to_cpu(hdr[i].len) + IMG_CRC_LEN;
+ addr = le32_to_cpu(hdr[i].addr);
+
+ err = mt7615_mcu_init_download(dev, addr, len, mode);
+ if (err) {
+ dev_err(dev->mt76.dev, "Download request failed\n");
+ return err;
+ }
+
+ err = mt7615_mcu_send_firmware(dev, data + offset, len);
+ if (err) {
+ dev_err(dev->mt76.dev, "Failed to send firmware to device\n");
+ return err;
+ }
+
+ offset += len;
+ }
+
+ return 0;
+}
+
static int mt7615_load_ram(struct mt7615_dev *dev)
{
const struct firmware *fw;
const struct mt7615_fw_trailer *hdr;
const char *n9_firmware = MT7615_FIRMWARE_N9;
const char *cr4_firmware = MT7615_FIRMWARE_CR4;
- u32 n9_ilm_addr, offset;
- int i, ret;
+ int ret;
ret = request_firmware(&fw, n9_firmware, dev->mt76.dev);
if (ret)
@@ -419,31 +450,12 @@ static int mt7615_load_ram(struct mt7615_dev *dev)
dev_info(dev->mt76.dev, "N9 Firmware Version: %.10s, Build Time: %.15s\n",
hdr->fw_ver, hdr->build_date);
- n9_ilm_addr = le32_to_cpu(hdr->addr);
-
- for (offset = 0, i = 0; i < N9_REGION_NUM; i++) {
- u32 len, addr, mode;
-
- len = le32_to_cpu(hdr[i].len) + IMG_CRC_LEN;
- addr = le32_to_cpu(hdr[i].addr);
- mode = gen_dl_mode(hdr[i].feature_set, false);
-
- ret = mt7615_mcu_init_download(dev, addr, len, mode);
- if (ret) {
- dev_err(dev->mt76.dev, "Download request failed\n");
- goto out;
- }
-
- ret = mt7615_mcu_send_firmware(dev, fw->data + offset, len);
- if (ret) {
- dev_err(dev->mt76.dev, "Failed to send firmware to device\n");
- goto out;
- }
-
- offset += len;
- }
+ ret = mt7615_mcu_send_ram_firmware(dev, hdr, fw->data, false);
+ if (ret)
+ goto out;
- ret = mt7615_mcu_start_firmware(dev, n9_ilm_addr, FW_START_OVERRIDE);
+ ret = mt7615_mcu_start_firmware(dev, le32_to_cpu(hdr->addr),
+ FW_START_OVERRIDE);
if (ret) {
dev_err(dev->mt76.dev, "Failed to start N9 firmware\n");
goto out;
@@ -467,27 +479,9 @@ static int mt7615_load_ram(struct mt7615_dev *dev)
dev_info(dev->mt76.dev, "CR4 Firmware Version: %.10s, Build Time: %.15s\n",
hdr->fw_ver, hdr->build_date);
- for (offset = 0, i = 0; i < CR4_REGION_NUM; i++) {
- u32 len, addr, mode;
-
- len = le32_to_cpu(hdr[i].len) + IMG_CRC_LEN;
- addr = le32_to_cpu(hdr[i].addr);
- mode = gen_dl_mode(hdr[i].feature_set, true);
-
- ret = mt7615_mcu_init_download(dev, addr, len, mode);
- if (ret) {
- dev_err(dev->mt76.dev, "Download request failed\n");
- goto out;
- }
-
- ret = mt7615_mcu_send_firmware(dev, fw->data + offset, len);
- if (ret) {
- dev_err(dev->mt76.dev, "Failed to send firmware to device\n");
- goto out;
- }
-
- offset += len;
- }
+ ret = mt7615_mcu_send_ram_firmware(dev, hdr, fw->data, true);
+ if (ret)
+ goto out;
ret = mt7615_mcu_start_firmware(dev, 0, FW_START_WORKING_PDA_CR4);
if (ret)
--
2.21.0
^ permalink raw reply related
* Re: [RFC PATCH] cfg80211: fix duplicated scan entries after channel switch
From: Sergey Matyukevich @ 2019-07-02 11:50 UTC (permalink / raw)
To: Johannes Berg
Cc: linux-wireless@vger.kernel.org, Igor Mitsyanko, Mikhail Karpenko
In-Reply-To: <7c8b3493cd2c48beae5a12e23964c8d3ca181d04.camel@sipsolutions.net>
...
> > To summarize, if BSS channel needs to be updated, then bss_tree should
> > be rebuilt in order to put updated BSS entry into a proper location.
>
> Good catch!
>
> > This commit suggests the following straightforward solution:
> > - if new entry has been already created for BSS after channel switch,
> > then remove it completely
>
> Shouldn't we prefer the new entry?
>
> OTOH, the old entry will likely have a "hold", so it doesn't get removed
> while we're connected ... and the driver etc. might be referencing it.
> So I guess the old entry should be updated with info from the newer one?
>
> > Finally, next scan operation will find BSS entry in expected location
> > in rb_tree. So all the IEs, including HT/VHT operation IEs,
> > will be properly updated.
>
> Right. Although if it was there before, then it already has been updated
> in a sense... But I guess it's a corner case to even get there?
>
> > 1. Tested using iwlwifi and qtnfmac drivers, looks good
>
> Great.
>
> > 2. Alternative approach: remove old BSS entry and keep new a one
> > This approach may have certain benefits for mac80211 drivers.
> > For instance, in this case HT/VHT operation IEs are going to be
> > valid from the start, no need to wait for the next scan.
>
> > However the following procedure for replacing current_bss, protected
> > by wdev->mtx and rdev->bss_lock locks, seems to be insufficient:
> >
> > bss_ref_get(rdev, new);
> > cfg80211_hold_bss(new);
> > wdev->current_bss = new;
> >
> > cfg80211_unhold_bss(old);
> > bss_ref_put(rdev, old);
> > __cfg80211_unlink_bss(rdev, old);
> >
> > When testing this alternative approach using iwlwifi driver,
> > occasional general protection fault crashes have been observed
> > on ieee80211_rx_mgmt_beacon/ieee80211_bss_info_update code paths.
> > So far I haven't yet root caused them.
>
> At the very least you'd also have to update ifmgd->associated in
> mac80211, and that's basically not really possible? Well, I guess we
> could change the channel switch API to return the new one or something.
>
> I guess the better thing would be to go update the old entry with the
> new one's data, before killing the new one.
>
> Not sure it's worth the extra complexity though.
Hello Johannes,
Thanks for review! Summarizing your comments, here are the options
and some of their highlights:
1. replace old entry with the new entry
- no easy way to update ifmgd->associated w/o rework of mac80211 csa
2. keep old entry, remove new entry
- this is what suggested RFC patch does
- works, but update of current_bss entry after csa may be delayed
3. keep old entry, update it using data from new entry, then remove new entry
- this looks like a better approach
Unless I am missing something, the last option can be implemented on top of
the current RFC patch w/o extra complexity. The required bss entry update is
what cfg80211_bss_update function does when bss in question already exists.
So it should be possible to reuse that code.
I will post RFC patch v2 after more testing for both mac80211 and
fullmac cases.
Regards,
Sergey
^ permalink raw reply
* [PATCH] mac80211: HE STA disassoc due to QOS NULL not sent
From: Shay Bar @ 2019-07-02 12:20 UTC (permalink / raw)
To: johannes@sipsolutions.net; +Cc: linux-wireless@vger.kernel.org, Shay Bar
In case of HE AP-STA link, ieee80211_send_nullfunc() will not send the QOS NULL packet to check if AP is still associated.
In this case, probe_send_count will be non zero and ieee80211_sta_work() will later disassociate the AP.
(although it didn't really send a test QOS NULL packet).
Fix is to decrement probe_send_count and not call ieee80211_send_nullfunc() in case of HE link.
Signed-off-by: Shay Bar <shay.bar@celeno.com>
---
net/mac80211/mlme.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 379d2ab6d327..bc5ed2dbe69b 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2511,7 +2511,10 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
if (ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) {
ifmgd->nullfunc_failed = false;
-ieee80211_send_nullfunc(sdata->local, sdata, false);
+if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE))
+ifmgd->probe_send_count--;
+else
+ieee80211_send_nullfunc(sdata->local, sdata, false);
} else {
int ssid_len;
--
2.22.0
________________________________
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any retransmission, dissemination, copying or other use of, or taking of any action in reliance upon this information is prohibited. If you received this in error, please contact the sender and delete the material from any computer. Nothing contained herein shall be deemed as a representation, warranty or a commitment by Celeno. No warranties are expressed or implied, including, but not limited to, any implied warranties of non-infringement, merchantability and fitness for a particular purpose.
________________________________
^ permalink raw reply related
* [PATCH][next] ath: fix various spelling mistakes
From: Colin King @ 2019-07-02 12:39 UTC (permalink / raw)
To: Kalle Valo, David S . Miller, Maya Erez, ath10k, linux-wireless,
netdev, wil6210
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
There are a bunch of spelling mistakes in two ath drivers, fix
these.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/wireless/ath/ath10k/core.c | 2 +-
drivers/net/wireless/ath/ath10k/mac.c | 2 +-
drivers/net/wireless/ath/ath10k/qmi.c | 4 ++--
drivers/net/wireless/ath/wil6210/wmi.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index dc45d16e8d21..a7c25d49683b 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2784,7 +2784,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
status = ath10k_hif_set_target_log_mode(ar, fw_diag_log);
if (status && status != -EOPNOTSUPP) {
- ath10k_warn(ar, "set traget log mode faileds: %d\n", status);
+ ath10k_warn(ar, "set target log mode failed: %d\n", status);
goto err_hif_stop;
}
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index e43a566eef77..20f72ec95b28 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -7417,7 +7417,7 @@ static bool ath10k_mac_set_vht_bitrate_mask_fixup(struct ath10k *ar,
err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr,
WMI_PEER_PARAM_FIXED_RATE, rate);
if (err)
- ath10k_warn(ar, "failed to eanble STA %pM peer fixed rate: %d\n",
+ ath10k_warn(ar, "failed to enable STA %pM peer fixed rate: %d\n",
sta->addr, err);
return true;
diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index 3b63b6257c43..d28daa2d9449 100644
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -643,7 +643,7 @@ int ath10k_qmi_set_fw_log_mode(struct ath10k *ar, u8 fw_log_mode)
wlfw_ini_req_msg_v01_ei, &req);
if (ret < 0) {
qmi_txn_cancel(&txn);
- ath10k_err(ar, "fail to send fw log reqest: %d\n", ret);
+ ath10k_err(ar, "failed to send fw log request: %d\n", ret);
goto out;
}
@@ -652,7 +652,7 @@ int ath10k_qmi_set_fw_log_mode(struct ath10k *ar, u8 fw_log_mode)
goto out;
if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
- ath10k_err(ar, "fw log request rejectedr: %d\n",
+ ath10k_err(ar, "fw log request rejected: %d\n",
resp.resp.error);
ret = -EINVAL;
goto out;
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 475b1a233cc9..e1704cdfc03e 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -2688,7 +2688,7 @@ int wmi_get_all_temperatures(struct wil6210_priv *wil,
return rc;
if (reply.evt.status == WMI_FW_STATUS_FAILURE) {
- wil_err(wil, "Failed geting TEMP_SENSE_ALL\n");
+ wil_err(wil, "Failed getting TEMP_SENSE_ALL\n");
return -EINVAL;
}
--
2.20.1
^ permalink raw reply related
* Re: [RFC PATCH] cfg80211: fix duplicated scan entries after channel switch
From: Johannes Berg @ 2019-07-02 12:40 UTC (permalink / raw)
To: Sergey Matyukevich
Cc: linux-wireless@vger.kernel.org, Igor Mitsyanko, Mikhail Karpenko
In-Reply-To: <20190702115005.ulcfohbi4mkwpt2c@bars>
Hi Sergey,
On Tue, 2019-07-02 at 11:50 +0000, Sergey Matyukevich wrote:
> Thanks for review! Summarizing your comments, here are the options
> and some of their highlights:
>
> 1. replace old entry with the new entry
> - no easy way to update ifmgd->associated w/o rework of mac80211 csa
Yes, this one's the tricky one. I don't think you can make this work
easily.
> 2. keep old entry, remove new entry
> - this is what suggested RFC patch does
> - works, but update of current_bss entry after csa may be delayed
Correct.
> 3. keep old entry, update it using data from new entry, then remove new entry
> - this looks like a better approach
>
> Unless I am missing something, the last option can be implemented on top of
> the current RFC patch w/o extra complexity. The required bss entry update is
> what cfg80211_bss_update function does when bss in question already exists.
> So it should be possible to reuse that code.
Agree, you just need to sort of invert it, or call it like this:
* relink the old entry, unlink a new entry (if any)
* bss_update() with the new entry if there was one
* it should free one of the entries if I remember correctly
> I will post RFC patch v2 after more testing for both mac80211 and
> fullmac cases.
Sounds good, thanks a lot for working on this!
johannes
^ permalink raw reply
* Re: [PATCH] rtl8xxxu: Fix wifi low signal strength issue of RTL8723BU
From: Jes Sorensen @ 2019-07-02 12:42 UTC (permalink / raw)
To: Daniel Drake, Chris Chiu
Cc: Kalle Valo, David Miller, linux-wireless, netdev, Linux Kernel,
Linux Upstreaming Team, Larry Finger
In-Reply-To: <CAD8Lp44R0a1=fVi=fGv69w1ppdcaFV01opkdkhaX-eJ=K=tYeA@mail.gmail.com>
On 7/1/19 4:27 AM, Daniel Drake wrote:
> Hi Chris,
>
> On Thu, Jun 27, 2019 at 5:53 PM Chris Chiu <chiu@endlessm.com> wrote:
>> The WiFi tx power of RTL8723BU is extremely low after booting. So
>> the WiFi scan gives very limited AP list and it always fails to
>> connect to the selected AP. This module only supports 1x1 antenna
>> and the antenna is switched to bluetooth due to some incorrect
>> register settings.
>>
>> This commit hand over the antenna control to PTA, the wifi signal
>> will be back to normal and the bluetooth scan can also work at the
>> same time. However, the btcoexist still needs to be handled under
>> different circumstances. If there's a BT connection established,
>> the wifi still fails to connect until disconneting the BT.
>>
>> Signed-off-by: Chris Chiu <chiu@endlessm.com>
>
> Really nice work finding this!
>
> I know that after this change, you plan to bring over the btcoexist
> code from the vendor driver (or at least the minimum required code)
> for a more complete fix, but I'm curious how you found these magic
> register values and how they compare to the values used by the vendor
> driver with btcoexist?
We definitely don't want to bring over the vendor code, since it's a
pile of spaghetti, but we probably need to get something sorted. This
went down the drain when the bluetooth driver was added without taking
it into account - long after this driver was merged.
Cheers,
Jes
^ permalink raw reply
* Re: [PATCH] rtl8xxxu: Fix wifi low signal strength issue of RTL8723BU
From: Jes Sorensen @ 2019-07-02 12:44 UTC (permalink / raw)
To: Chris Chiu, kvalo, davem; +Cc: linux-wireless, netdev, linux-kernel, linux
In-Reply-To: <20190627095247.8792-1-chiu@endlessm.com>
On 6/27/19 5:52 AM, Chris Chiu wrote:
> The WiFi tx power of RTL8723BU is extremely low after booting. So
> the WiFi scan gives very limited AP list and it always fails to
> connect to the selected AP. This module only supports 1x1 antenna
> and the antenna is switched to bluetooth due to some incorrect
> register settings.
>
> This commit hand over the antenna control to PTA, the wifi signal
> will be back to normal and the bluetooth scan can also work at the
> same time. However, the btcoexist still needs to be handled under
> different circumstances. If there's a BT connection established,
> the wifi still fails to connect until disconneting the BT.
>
> Signed-off-by: Chris Chiu <chiu@endlessm.com>
> ---
> drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 9 ++++++---
> drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 ++-
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
> index 3adb1d3d47ac..6c3c70d93ac1 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
> @@ -1525,7 +1525,7 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv)
> /*
> * WLAN action by PTA
> */
> - rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x04);
> + rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x0c);
>
> /*
> * BT select S0/S1 controlled by WiFi
> @@ -1568,9 +1568,12 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv)
> rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.ant_sel_rsv));
>
> /*
> - * 0x280, 0x00, 0x200, 0x80 - not clear
> + * Different settings per different antenna position.
> + * Antenna switch to BT: 0x280, 0x00 (inverse)
> + * Antenna switch to WiFi: 0x0, 0x280 (inverse)
> + * Antenna controlled by PTA: 0x200, 0x80 (inverse)
> */
> - rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x00);
> + rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x80);
>
> /*
> * Software control, antenna at WiFi side
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> index 8136e268b4e6..87b2179a769e 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> @@ -3891,12 +3891,13 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
>
> /* Check if MAC is already powered on */
> val8 = rtl8xxxu_read8(priv, REG_CR);
> + val16 = rtl8xxxu_read16(priv, REG_SYS_CLKR);
>
> /*
> * Fix 92DU-VC S3 hang with the reason is that secondary mac is not
> * initialized. First MAC returns 0xea, second MAC returns 0x00
> */
> - if (val8 == 0xea)
> + if (val8 == 0xea || !(val16 & BIT(11)))
> macpower = false;
> else
> macpower = true;
This part I would like to ask you take a good look at the other chips to
make sure you don't break support for 8192cu, 8723au, 8188eu with this.
Cheers,
Jes
^ permalink raw reply
* [PATCH -next] carl9170: remove set but not used variable 'udev'
From: YueHaibing @ 2019-07-02 14:12 UTC (permalink / raw)
To: chunkeey; +Cc: linux-kernel, netdev, linux-wireless, kvalo, davem, YueHaibing
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/wireless/ath/carl9170/usb.c: In function carl9170_usb_disconnect:
drivers/net/wireless/ath/carl9170/usb.c:1110:21:
warning: variable udev set but not used [-Wunused-but-set-variable]
It is not use since commit feb09b293327 ("carl9170:
fix misuse of device driver API")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/net/wireless/ath/carl9170/usb.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
index 99f1897..486957a 100644
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
@@ -1107,12 +1107,10 @@ static int carl9170_usb_probe(struct usb_interface *intf,
static void carl9170_usb_disconnect(struct usb_interface *intf)
{
struct ar9170 *ar = usb_get_intfdata(intf);
- struct usb_device *udev;
if (WARN_ON(!ar))
return;
- udev = ar->udev;
wait_for_completion(&ar->fw_load_wait);
if (IS_INITIALIZED(ar)) {
--
2.7.4
^ permalink raw reply related
* [PATCH] wireless-regdb: Fix overlapping ranges for Switzerland and Liechtenstein
From: Martin Willi @ 2019-07-02 14:19 UTC (permalink / raw)
To: Seth Forshee; +Cc: wireless-regdb, linux-wireless, Henrik Laxhuber
The commit referenced below changes the 5GHz frequency range 5250-5330
to 5150-5330, making that range overlapping with the existing range
5170-5250. This imposes DFS limitations and a reduced maximum power
level for the range 5170-5250.
The change of the frequency range seems not intentional. Instead the
commit should have changed the 5170-5250 range to 5150-5250, and the
5250-5330 range to 5250-5350 (see [1]).
[1] https://www.ofcomnet.ch/api/rir/1010/05
Fixes: 957a7cff72a3 ("wireless-regdb: update regulatory rules for Switzerland (CH), and Liechtenstein (LI) on 5GHz")
Signed-off-by: Martin Willi <martin@strongswan.org>
---
db.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/db.txt b/db.txt
index d47ab94c3aa5..37393e6a793e 100644
--- a/db.txt
+++ b/db.txt
@@ -271,8 +271,8 @@ country CF: DFS-FCC
# transmitter power control is in use: 5250-5330@23db, 5490-5710@30db
country CH: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
- (5150 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
+ (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
+ (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
(5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
# 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
@@ -747,8 +747,8 @@ country LC: DFS-ETSI
# transmitter power control is in use: 5250-5330@23db, 5490-5710@30db
country LI: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
- (5150 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
+ (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
+ (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
(5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI
# 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
--
2.17.1
^ permalink raw reply related
* [PATCH][next] wil6210: fix wil_cid_valid with negative cid values
From: Colin King @ 2019-07-02 14:40 UTC (permalink / raw)
To: Maya Erez, Kalle Valo, David S . Miller, linux-wireless, wil6210,
netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
There are several occasions where a negative cid value is passed
into wil_cid_valid and this is converted into a u8 causing the
range check of cid >= 0 to always succeed. Fix this by making
the cid argument an int to handle any -ve error value of cid.
An example of this behaviour is in wil_cfg80211_dump_station,
where cid is assigned -ENOENT if the call to wil_find_cid_by_idx
fails, and this -ve value is passed to wil_cid_valid. I believe
that the conversion of -ENOENT to the u8 value 254 which is
greater than wil->max_assoc_sta causes wil_find_cid_by_idx to
currently work fine, but I think is by luck and not the
intended behaviour.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/wireless/ath/wil6210/wil6210.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 6f456b311a39..25a1adcb38eb 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -1144,7 +1144,7 @@ static inline void wil_c(struct wil6210_priv *wil, u32 reg, u32 val)
/**
* wil_cid_valid - check cid is valid
*/
-static inline bool wil_cid_valid(struct wil6210_priv *wil, u8 cid)
+static inline bool wil_cid_valid(struct wil6210_priv *wil, int cid)
{
return (cid >= 0 && cid < wil->max_assoc_sta);
}
--
2.20.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox