Skip to content

Commit

Permalink
mt76: mt7615: introduce mt7615_mac_update_rate_desc routine
Browse files Browse the repository at this point in the history 
Move register configuration out of mt7615_mac_set_rates since usb
driver can't access device register in interrupt context. Introduce
mt7615_mac_update_rate_desc routine to report rate info to
mt7615_mac_set_rates

Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
Lorenzo Bianconi authored and Felix Fietkau committed May 12, 2020
1 parent d4bf77b commit 8f93af9
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 43 deletions.
102 changes: 59 additions & 43 deletions drivers/net/wireless/mediatek/mt76/mt7615/mac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -813,26 +813,19 @@ void mt7615_mac_sta_poll(struct mt7615_dev *dev)
rcu_read_unlock();
}

void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta,
struct ieee80211_tx_rate *probe_rate,
struct ieee80211_tx_rate *rates)
static void
mt7615_mac_update_rate_desc(struct mt7615_phy *phy, struct mt7615_sta *sta,
struct ieee80211_tx_rate *probe_rate,
struct ieee80211_tx_rate *rates,
struct mt7615_rate_desc *rd)
{
struct mt7615_dev *dev = phy->dev;
struct mt76_phy *mphy = phy->mt76;
struct ieee80211_tx_rate *ref;
int wcid = sta->wcid.idx;
u32 addr = mt7615_mac_wtbl_addr(dev, wcid);
bool stbc = false;
bool rateset, stbc = false;
int n_rates = sta->n_rates;
u8 bw, bw_prev, bw_idx = 0;
u16 val[4];
u16 probe_val;
u32 w5, w27;
bool rateset;
int i, k;

if (!mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000))
return;
u8 bw, bw_prev;
int i, j;

for (i = n_rates; i < 4; i++)
rates[i] = rates[n_rates - 1];
Expand Down Expand Up @@ -860,10 +853,10 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta,
if ((ref->flags ^ rates[i].flags) & IEEE80211_TX_RC_SHORT_GI)
rates[i].flags ^= IEEE80211_TX_RC_SHORT_GI;

for (k = 0; k < i; k++) {
if (rates[i].idx != rates[k].idx)
for (j = 0; j < i; j++) {
if (rates[i].idx != rates[j].idx)
continue;
if ((rates[i].flags ^ rates[k].flags) &
if ((rates[i].flags ^ rates[j].flags) &
(IEEE80211_TX_RC_40_MHZ_WIDTH |
IEEE80211_TX_RC_80_MHZ_WIDTH |
IEEE80211_TX_RC_160_MHZ_WIDTH))
Expand All @@ -876,65 +869,87 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta,
}
}

val[0] = mt7615_mac_tx_rate_val(dev, mphy, &rates[0], stbc, &bw);
rd->val[0] = mt7615_mac_tx_rate_val(dev, mphy, &rates[0], stbc, &bw);
bw_prev = bw;

if (probe_rate) {
probe_val = mt7615_mac_tx_rate_val(dev, mphy, probe_rate,
stbc, &bw);
rd->probe_val = mt7615_mac_tx_rate_val(dev, mphy, probe_rate,
stbc, &bw);
if (bw)
bw_idx = 1;
rd->bw_idx = 1;
else
bw_prev = 0;
} else {
probe_val = val[0];
rd->probe_val = rd->val[0];
}

val[1] = mt7615_mac_tx_rate_val(dev, mphy, &rates[1], stbc, &bw);
rd->val[1] = mt7615_mac_tx_rate_val(dev, mphy, &rates[1], stbc, &bw);
if (bw_prev) {
bw_idx = 3;
rd->bw_idx = 3;
bw_prev = bw;
}

val[2] = mt7615_mac_tx_rate_val(dev, mphy, &rates[2], stbc, &bw);
rd->val[2] = mt7615_mac_tx_rate_val(dev, mphy, &rates[2], stbc, &bw);
if (bw_prev) {
bw_idx = 5;
rd->bw_idx = 5;
bw_prev = bw;
}

val[3] = mt7615_mac_tx_rate_val(dev, mphy, &rates[3], stbc, &bw);
rd->val[3] = mt7615_mac_tx_rate_val(dev, mphy, &rates[3], stbc, &bw);
if (bw_prev)
bw_idx = 7;
rd->bw_idx = 7;

rd->rateset = rateset;
rd->sta = sta;
rd->bw = bw;
}

void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta,
struct ieee80211_tx_rate *probe_rate,
struct ieee80211_tx_rate *rates)
{
int wcid = sta->wcid.idx, n_rates = sta->n_rates;
struct mt7615_dev *dev = phy->dev;
struct mt7615_rate_desc rd;
u32 w5, w27, addr;

if (!mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000))
return;

memset(&rd, 0, sizeof(struct mt7615_rate_desc));
mt7615_mac_update_rate_desc(phy, sta, probe_rate, rates, &rd);

addr = mt7615_mac_wtbl_addr(dev, wcid);
w27 = mt76_rr(dev, addr + 27 * 4);
w27 &= ~MT_WTBL_W27_CC_BW_SEL;
w27 |= FIELD_PREP(MT_WTBL_W27_CC_BW_SEL, bw);
w27 |= FIELD_PREP(MT_WTBL_W27_CC_BW_SEL, rd.bw);

w5 = mt76_rr(dev, addr + 5 * 4);
w5 &= ~(MT_WTBL_W5_BW_CAP | MT_WTBL_W5_CHANGE_BW_RATE |
MT_WTBL_W5_MPDU_OK_COUNT |
MT_WTBL_W5_MPDU_FAIL_COUNT |
MT_WTBL_W5_RATE_IDX);
w5 |= FIELD_PREP(MT_WTBL_W5_BW_CAP, bw) |
FIELD_PREP(MT_WTBL_W5_CHANGE_BW_RATE, bw_idx ? bw_idx - 1 : 7);
w5 |= FIELD_PREP(MT_WTBL_W5_BW_CAP, rd.bw) |
FIELD_PREP(MT_WTBL_W5_CHANGE_BW_RATE,
rd.bw_idx ? rd.bw_idx - 1 : 7);

mt76_wr(dev, MT_WTBL_RIUCR0, w5);

mt76_wr(dev, MT_WTBL_RIUCR1,
FIELD_PREP(MT_WTBL_RIUCR1_RATE0, probe_val) |
FIELD_PREP(MT_WTBL_RIUCR1_RATE1, val[0]) |
FIELD_PREP(MT_WTBL_RIUCR1_RATE2_LO, val[1]));
FIELD_PREP(MT_WTBL_RIUCR1_RATE0, rd.probe_val) |
FIELD_PREP(MT_WTBL_RIUCR1_RATE1, rd.val[0]) |
FIELD_PREP(MT_WTBL_RIUCR1_RATE2_LO, rd.val[1]));

mt76_wr(dev, MT_WTBL_RIUCR2,
FIELD_PREP(MT_WTBL_RIUCR2_RATE2_HI, val[1] >> 8) |
FIELD_PREP(MT_WTBL_RIUCR2_RATE3, val[1]) |
FIELD_PREP(MT_WTBL_RIUCR2_RATE4, val[2]) |
FIELD_PREP(MT_WTBL_RIUCR2_RATE5_LO, val[2]));
FIELD_PREP(MT_WTBL_RIUCR2_RATE2_HI, rd.val[1] >> 8) |
FIELD_PREP(MT_WTBL_RIUCR2_RATE3, rd.val[1]) |
FIELD_PREP(MT_WTBL_RIUCR2_RATE4, rd.val[2]) |
FIELD_PREP(MT_WTBL_RIUCR2_RATE5_LO, rd.val[2]));

mt76_wr(dev, MT_WTBL_RIUCR3,
FIELD_PREP(MT_WTBL_RIUCR3_RATE5_HI, val[2] >> 4) |
FIELD_PREP(MT_WTBL_RIUCR3_RATE6, val[3]) |
FIELD_PREP(MT_WTBL_RIUCR3_RATE7, val[3]));
FIELD_PREP(MT_WTBL_RIUCR3_RATE5_HI, rd.val[2] >> 4) |
FIELD_PREP(MT_WTBL_RIUCR3_RATE6, rd.val[3]) |
FIELD_PREP(MT_WTBL_RIUCR3_RATE7, rd.val[3]));

mt76_wr(dev, MT_WTBL_UPDATE,
FIELD_PREP(MT_WTBL_UPDATE_WLAN_IDX, wcid) |
Expand All @@ -944,7 +959,8 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta,
mt76_wr(dev, addr + 27 * 4, w27);

mt76_set(dev, MT_LPON_T0CR, MT_LPON_T0CR_MODE); /* TSF read */
sta->rate_set_tsf = (mt76_rr(dev, MT_LPON_UTTR0) & ~BIT(0)) | rateset;
sta->rate_set_tsf = mt76_rr(dev, MT_LPON_UTTR0) & ~BIT(0);
sta->rate_set_tsf |= rd.rateset;

if (!(sta->wcid.tx_info & MT_WCID_TX_INFO_SET))
mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000);
Expand Down
12 changes: 12 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ struct mt7615_rate_set {
struct ieee80211_tx_rate rates[4];
};

struct mt7615_rate_desc {
struct list_head node;

struct mt7615_sta *sta;

bool rateset;
u16 probe_val;
u16 val[4];
u8 bw_idx;
u8 bw;
};

struct mt7615_sta {
struct mt76_wcid wcid; /* must be first */

Expand Down

0 comments on commit 8f93af9

Please sign in to comment.