mt76:fix?
This commit is contained in:
DHDAXCW
parent
5a8e81867f
commit
b713540757
154
package/kernel/mt76/patches/0002-fix-mt7916-xiao-ji-ji.patch
Normal file
154
package/kernel/mt76/patches/0002-fix-mt7916-xiao-ji-ji.patch
Normal file
@ -0,0 +1,154 @@
|
||||
--- a/mt7615/mac.c
|
||||
+++ b/mt7615/mac.c
|
||||
@@ -907,7 +907,6 @@ void mt7615_mac_sta_poll(struct mt7615_dev *dev)
|
||||
INIT_LIST_HEAD(&sta_poll_list);
|
||||
spin_lock_bh(&dev->sta_poll_lock);
|
||||
list_splice_init(&dev->sta_poll_list, &sta_poll_list);
|
||||
- spin_unlock_bh(&dev->sta_poll_lock);
|
||||
|
||||
while (!list_empty(&sta_poll_list)) {
|
||||
bool clear = false;
|
||||
@@ -915,6 +914,7 @@ void mt7615_mac_sta_poll(struct mt7615_dev *dev)
|
||||
msta = list_first_entry(&sta_poll_list, struct mt7615_sta,
|
||||
poll_list);
|
||||
list_del_init(&msta->poll_list);
|
||||
+ spin_unlock_bh(&dev->sta_poll_lock);
|
||||
|
||||
addr = mt7615_mac_wtbl_addr(dev, msta->wcid.idx) + 19 * 4;
|
||||
|
||||
@@ -937,8 +937,10 @@ void mt7615_mac_sta_poll(struct mt7615_dev *dev)
|
||||
memset(msta->airtime_ac, 0, sizeof(msta->airtime_ac));
|
||||
}
|
||||
|
||||
- if (!msta->wcid.sta)
|
||||
+ if (!msta->wcid.sta) {
|
||||
+ spin_lock_bh(&dev->sta_poll_lock);
|
||||
continue;
|
||||
+ }
|
||||
|
||||
sta = container_of((void *)msta, struct ieee80211_sta,
|
||||
drv_priv);
|
||||
@@ -953,7 +955,10 @@ void mt7615_mac_sta_poll(struct mt7615_dev *dev)
|
||||
ieee80211_sta_register_airtime(sta, tid, tx_cur,
|
||||
rx_cur);
|
||||
}
|
||||
+
|
||||
+ spin_lock_bh(&dev->sta_poll_lock);
|
||||
}
|
||||
+ spin_unlock_bh(&dev->sta_poll_lock);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mt7615_mac_sta_poll);
|
||||
|
||||
|
||||
--- a/mt7915/pci.c
|
||||
+++ b/mt7915/pci.c
|
||||
@@ -7,11 +7,19 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/pci.h>
|
||||
+#include <linux/sysfs.h>
|
||||
+#include <linux/kobject.h>
|
||||
|
||||
#include "mt7915.h"
|
||||
#include "mac.h"
|
||||
#include "../trace.h"
|
||||
|
||||
+struct kobject *kobj_ref;
|
||||
+static ssize_t brain2000_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf);
|
||||
+struct kobj_attribute brain2000_attr = __ATTR(brain2000_mt76->token_count, 0660, brain2000_show, NULL);
|
||||
+
|
||||
+struct mt76_dev *brain2000_mt76;
|
||||
+
|
||||
static LIST_HEAD(hif_list);
|
||||
static DEFINE_SPINLOCK(hif_lock);
|
||||
static u32 hif_idx;
|
||||
@@ -28,6 +36,45 @@ static const struct pci_device_id mt7915_hif_device_table[] = {
|
||||
{ },
|
||||
};
|
||||
|
||||
+static ssize_t brain2000_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
|
||||
+{
|
||||
+ struct mt7915_dev *dev = container_of(brain2000_mt76, struct mt7915_dev, mt76);
|
||||
+ struct mt7915_sta *sta_poll_list_item;
|
||||
+ struct mt7915_sta *sta_rc_list_item;
|
||||
+ struct mt7915_twt_flow *twt_list_item;
|
||||
+ int sta_poll_list_counter, sta_rc_list_counter, twt_list_counter;
|
||||
+ int token_count;
|
||||
+ struct mt76_phy *mphy = &brain2000_mt76->phy;
|
||||
+ struct mt7915_phy *phy = (struct mt7915_phy *)mphy->priv;
|
||||
+
|
||||
+ spin_lock_bh(&dev->sta_poll_lock);
|
||||
+
|
||||
+ sta_rc_list_counter = 0;
|
||||
+ list_for_each_entry(sta_rc_list_item, &dev->sta_rc_list, rc_list)
|
||||
+ sta_rc_list_counter++;
|
||||
+
|
||||
+ sta_poll_list_counter = 0;
|
||||
+ list_for_each_entry(sta_poll_list_item, &dev->sta_poll_list, poll_list)
|
||||
+ sta_poll_list_counter++;
|
||||
+
|
||||
+ twt_list_counter = 0;
|
||||
+ list_for_each_entry(twt_list_item, &dev->twt_list, list)
|
||||
+ twt_list_counter++;
|
||||
+ spin_unlock_bh(&dev->sta_poll_lock);
|
||||
+
|
||||
+ token_count = brain2000_mt76->token_count;
|
||||
+
|
||||
+ int bytes = sprintf(buf, "token_count=%d\nsta_poll_list=%d\nsta_rc_list=%d\ntwt_list=%d\nthrottle_state=%d\n",
|
||||
+ token_count,
|
||||
+ sta_poll_list_counter,
|
||||
+ sta_rc_list_counter,
|
||||
+ twt_list_counter,
|
||||
+ phy->throttle_state
|
||||
+ );
|
||||
+
|
||||
+ return bytes;
|
||||
+}
|
||||
+
|
||||
static struct mt7915_hif *mt7915_pci_get_hif2(u32 idx)
|
||||
{
|
||||
struct mt7915_hif *hif;
|
||||
@@ -179,6 +226,13 @@ static int mt7915_pci_probe(struct pci_dev *pdev,
|
||||
if (ret)
|
||||
goto free_hif2_irq;
|
||||
|
||||
+ kobj_ref = kobject_create_and_add("brain2000", kernel_kobj);
|
||||
+ if (sysfs_create_file(kobj_ref, &brain2000_attr.attr))
|
||||
+ goto free_hif2_irq;
|
||||
+
|
||||
+ brain2000_mt76 = mdev;
|
||||
+
|
||||
+
|
||||
return 0;
|
||||
|
||||
free_hif2_irq:
|
||||
@@ -211,6 +265,9 @@ static void mt7915_pci_remove(struct pci_dev *pdev)
|
||||
struct mt76_dev *mdev;
|
||||
struct mt7915_dev *dev;
|
||||
|
||||
+ kobject_put(kobj_ref);
|
||||
+ sysfs_remove_file(kernel_kobj, &brain2000_attr.attr);
|
||||
+
|
||||
mdev = pci_get_drvdata(pdev);
|
||||
dev = container_of(mdev, struct mt7915_dev, mt76);
|
||||
mt7915_put_hif2(dev->hif2);
|
||||
|
||||
--- a/tx.c
|
||||
+++ b/tx.c
|
||||
@@ -398,6 +398,8 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
|
||||
int i;
|
||||
|
||||
spin_lock_bh(&hwq->lock);
|
||||
+ rcu_read_lock();
|
||||
+
|
||||
for (i = 0; tids && nframes; i++, tids >>= 1) {
|
||||
struct ieee80211_txq *txq = sta->txq[i];
|
||||
struct mt76_txq *mtxq = (struct mt76_txq *)txq->drv_priv;
|
||||
@@ -426,6 +428,7 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
|
||||
ieee80211_sta_eosp(sta);
|
||||
}
|
||||
|
||||
+ rcu_read_unlock();
|
||||
spin_unlock_bh(&hwq->lock);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mt76_release_buffered_frames);
|
||||
Loading…
x
Reference in New Issue
Block a user