On 2019-12-15 04:56, Ryder Lee wrote: > Add a set_antenna callback to setup per phy tx/rx streams. > > Signed-off-by: Shayne Chen <shayne.chen@xxxxxxxxxxxx> > Signed-off-by: Ryder Lee <ryder.lee@xxxxxxxxxxxx> > --- > .../net/wireless/mediatek/mt76/mt7615/main.c | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c > index 759a66997c6f..70791544a088 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c > @@ -48,6 +48,8 @@ static int mt7615_start(struct ieee80211_hw *hw) > mt7615_mcu_set_mac_enable(dev, 1, true); > } > > + mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_SET_RX_PATH); > + > set_bit(MT76_STATE_RUNNING, &phy->mt76->state); > > if (running) This chunk needs to be moved to the first patch to avoid creating a regression. > @@ -635,6 +637,33 @@ mt7615_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class) > mt7615_mac_set_timing(phy); > } > > +static int > +mt7615_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant) > +{ > + struct mt7615_dev *dev = mt7615_hw_dev(hw); > + struct mt7615_phy *phy = mt7615_hw_phy(hw); > + int max_nss = hweight8(hw->wiphy->available_antennas_tx); > + bool ext_phy = phy != &dev->phy; > + > + if (!tx_ant || tx_ant != rx_ant || ffs(tx_ant) > max_nss) > + return -EINVAL; > + > + if ((BIT(hweight8(tx_ant)) - 1) != tx_ant) > + tx_ant = BIT(ffs(tx_ant) - 1) - 1; > + > + mutex_lock(&dev->mt76.mutex); > + > + phy->mt76->antenna_mask = tx_ant; > + phy->chainmask = ext_phy ? tx_ant << 2 : tx_ant; > + > + mt76_set_stream_caps(&dev->mt76, true); > + mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_SET_RX_PATH); This call is unnecessary, because antenna settings can only be changed when the device is not running. - Felix