Skip to content

Commit

Permalink
mt76: set runtime stream caps by mt76_phy
Browse files Browse the repository at this point in the history 
This patch can support concurrent dual-band operation.

Signed-off-by: Ryder Lee <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>
  • Loading branch information
@ryderlee1110 @nbd168
ryderlee1110 authored and nbd168 committed May 9, 2020
1 parent 509fceb commit 5640597
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions mac80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ static void mt76_led_cleanup(struct mt76_dev *dev)
led_classdev_unregister(&dev->led_cdev);
}

static void mt76_init_stream_cap(struct mt76_dev *dev,
static void mt76_init_stream_cap(struct mt76_phy *phy,
struct ieee80211_supported_band *sband,
bool vht)
{
struct ieee80211_sta_ht_cap *ht_cap = &sband->ht_cap;
int i, nstream = hweight8(dev->phy.antenna_mask);
int i, nstream = hweight8(phy->antenna_mask);
struct ieee80211_sta_vht_cap *vht_cap;
u16 mcs_map = 0;

Expand Down Expand Up @@ -153,12 +153,12 @@ static void mt76_init_stream_cap(struct mt76_dev *dev,
vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
}

void mt76_set_stream_caps(struct mt76_dev *dev, bool vht)
void mt76_set_stream_caps(struct mt76_phy *phy, bool vht)
{
if (dev->cap.has_2ghz)
mt76_init_stream_cap(dev, &dev->phy.sband_2g.sband, false);
if (dev->cap.has_5ghz)
mt76_init_stream_cap(dev, &dev->phy.sband_5g.sband, vht);
if (phy->dev->cap.has_2ghz)
mt76_init_stream_cap(phy, &phy->sband_2g.sband, false);
if (phy->dev->cap.has_5ghz)
mt76_init_stream_cap(phy, &phy->sband_5g.sband, vht);
}
EXPORT_SYMBOL_GPL(mt76_set_stream_caps);

Expand Down Expand Up @@ -199,7 +199,7 @@ mt76_init_sband(struct mt76_dev *dev, struct mt76_sband *msband,
ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
ht_cap->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;

mt76_init_stream_cap(dev, sband, vht);
mt76_init_stream_cap(&dev->phy, sband, vht);

if (!vht)
return 0;
Expand Down
2 changes: 1 addition & 1 deletion mt76.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ void mt76_set_channel(struct mt76_phy *phy);
void mt76_update_survey(struct mt76_dev *dev);
int mt76_get_survey(struct ieee80211_hw *hw, int idx,
struct survey_info *survey);
void mt76_set_stream_caps(struct mt76_dev *dev, bool vht);
void mt76_set_stream_caps(struct mt76_phy *phy, bool vht);

int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid,
u16 ssn, u16 size);
Expand Down
4 changes: 2 additions & 2 deletions mt7615/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ mt7615_cap_dbdc_enable(struct mt7615_dev *dev)
dev->phy.chainmask = dev->mphy.antenna_mask;
dev->mphy.hw->wiphy->available_antennas_rx = dev->phy.chainmask;
dev->mphy.hw->wiphy->available_antennas_tx = dev->phy.chainmask;
mt76_set_stream_caps(&dev->mt76, true);
mt76_set_stream_caps(&dev->mphy, true);
}

static void
Expand All @@ -352,7 +352,7 @@ mt7615_cap_dbdc_disable(struct mt7615_dev *dev)
dev->phy.chainmask = dev->chainmask;
dev->mphy.hw->wiphy->available_antennas_rx = dev->chainmask;
dev->mphy.hw->wiphy->available_antennas_tx = dev->chainmask;
mt76_set_stream_caps(&dev->mt76, true);
mt76_set_stream_caps(&dev->mphy, true);
}

int mt7615_register_ext_phy(struct mt7615_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion mt7615/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ mt7615_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
}
phy->chainmask = tx_ant;

mt76_set_stream_caps(&dev->mt76, true);
mt76_set_stream_caps(phy->mt76, true);

mutex_unlock(&dev->mt76.mutex);

Expand Down
2 changes: 1 addition & 1 deletion mt76x2/pci_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static int mt76x2_set_antenna(struct ieee80211_hw *hw, u32 tx_ant,
dev->chainmask = (tx_ant == 3) ? 0x202 : 0x101;
dev->mphy.antenna_mask = tx_ant;

mt76_set_stream_caps(&dev->mt76, true);
mt76_set_stream_caps(&dev->mphy, true);
mt76x2_phy_set_antenna(dev);

mutex_unlock(&dev->mt76.mutex);
Expand Down
4 changes: 2 additions & 2 deletions mt7915/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ mt7915_cap_dbdc_enable(struct mt7915_dev *dev)
dev->mphy.hw->wiphy->available_antennas_rx = dev->phy.chainmask;
dev->mphy.hw->wiphy->available_antennas_tx = dev->phy.chainmask;

mt76_set_stream_caps(&dev->mt76, true);
mt76_set_stream_caps(&dev->mphy, true);
mt7915_set_stream_he_caps(&dev->phy);
}

Expand All @@ -459,7 +459,7 @@ mt7915_cap_dbdc_disable(struct mt7915_dev *dev)
dev->mphy.hw->wiphy->available_antennas_rx = dev->chainmask;
dev->mphy.hw->wiphy->available_antennas_tx = dev->chainmask;

mt76_set_stream_caps(&dev->mt76, true);
mt76_set_stream_caps(&dev->mphy, true);
mt7915_set_stream_he_caps(&dev->phy);
}

Expand Down
2 changes: 1 addition & 1 deletion mt7915/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ mt7915_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
}
phy->chainmask = tx_ant;

mt76_set_stream_caps(&dev->mt76, true);
mt76_set_stream_caps(phy->mt76, true);
mt7915_set_stream_he_caps(phy);

mutex_unlock(&dev->mt76.mutex);
Expand Down

0 comments on commit 5640597

Please sign in to comment.