This is a preliminary patch for implicit beamforming support.
Signed-off-by: Ryder Lee <[email protected]>
---
.../net/wireless/mediatek/mt76/mt7915/mcu.c | 50 +++++++------------
1 file changed, 17 insertions(+), 33 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 0baef70fc522..f38bc421ea8e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -66,9 +66,6 @@ struct mt7915_fw_region {
#define MCU_PATCH_ADDRESS 0x200000
-#define MT_STA_BFER BIT(0)
-#define MT_STA_BFEE BIT(1)
-
#define FW_FEATURE_SET_ENCRYPT BIT(0)
#define FW_FEATURE_SET_KEY_IDX GENMASK(2, 1)
#define FW_FEATURE_OVERRIDE_ADDR BIT(5)
@@ -1948,16 +1945,23 @@ mt7915_mcu_sta_bfee_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
bfee->fb_identity_matrix = true;
}
-static u8
-mt7915_mcu_sta_txbf_type(struct mt7915_phy *phy, struct ieee80211_vif *vif,
- struct ieee80211_sta *sta)
+static int
+mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta, bool enable)
{
- u8 type = 0;
+ struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
+ struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
+ struct mt7915_phy *phy;
+ struct sk_buff *skb;
+ int r, len;
+ bool ebfee = 0, ebf = 0;
if (vif->type != NL80211_IFTYPE_STATION &&
vif->type != NL80211_IFTYPE_AP)
return 0;
+ phy = mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy;
+
if (sta->he_cap.has_he) {
struct ieee80211_he_cap_elem *pe;
const struct ieee80211_he_cap_elem *ve;
@@ -1970,12 +1974,12 @@ mt7915_mcu_sta_txbf_type(struct mt7915_phy *phy, struct ieee80211_vif *vif,
if ((HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]) ||
HE_PHY(CAP4_MU_BEAMFORMER, pe->phy_cap_info[4])) &&
HE_PHY(CAP4_SU_BEAMFORMEE, ve->phy_cap_info[4]))
- type |= MT_STA_BFEE;
+ ebfee = true;
if ((HE_PHY(CAP3_SU_BEAMFORMER, ve->phy_cap_info[3]) ||
HE_PHY(CAP4_MU_BEAMFORMER, ve->phy_cap_info[4])) &&
HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]))
- type |= MT_STA_BFER;
+ ebf = true;
} else if (sta->vht_cap.vht_supported) {
struct ieee80211_sta_vht_cap *pc;
struct ieee80211_sta_vht_cap *vc;
@@ -1989,36 +1993,16 @@ mt7915_mcu_sta_txbf_type(struct mt7915_phy *phy, struct ieee80211_vif *vif,
IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;
if ((pc->cap & cr) && (vc->cap & ce))
- type |= MT_STA_BFEE;
+ ebfee = true;
if ((vc->cap & cr) && (pc->cap & ce))
- type |= MT_STA_BFER;
- } else if (sta->ht_cap.ht_supported) {
- /* TODO: iBF */
+ ebf = true;
}
- return type;
-}
-
-static int
-mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
- struct ieee80211_sta *sta, bool enable)
-{
- struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
- struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
- struct mt7915_phy *phy;
- struct sk_buff *skb;
- int r, len;
- u8 type;
-
- phy = mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy;
-
- type = mt7915_mcu_sta_txbf_type(phy, vif, sta);
-
/* must keep each tag independent */
/* starec bf */
- if (type & MT_STA_BFER) {
+ if (ebf) {
len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bf);
skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
@@ -2034,7 +2018,7 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
}
/* starec bfee */
- if (type & MT_STA_BFEE) {
+ if (ebfee) {
len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bfee);
skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
--
2.18.0
Add ht/vht implicit Tx beamforming support and enable it via debugfs.
Tested-by: Shayne Chen <[email protected]>
Signed-off-by: Ryder Lee <[email protected]>
---
.../wireless/mediatek/mt76/mt7915/debugfs.c | 28 +++++
.../net/wireless/mediatek/mt76/mt7915/init.c | 8 +-
.../net/wireless/mediatek/mt76/mt7915/mcu.c | 104 ++++++++++--------
.../wireless/mediatek/mt76/mt7915/mt7915.h | 1 +
4 files changed, 89 insertions(+), 52 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 7d810fbf2862..340d489993bb 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -6,6 +6,32 @@
/** global debugfs **/
+static int
+mt7915_implicit_txbf_set(void *data, u64 val)
+{
+ struct mt7915_dev *dev = data;
+
+ if (test_bit(MT76_STATE_RUNNING, &dev->mphy.state))
+ return 0;
+
+ dev->ibf = !!val;
+
+ return mt7915_mcu_set_txbf_type(dev);
+}
+
+static int
+mt7915_implicit_txbf_get(void *data, u64 *val)
+{
+ struct mt7915_dev *dev = data;
+
+ *val = dev->ibf;
+
+ return 0;
+}
+
+DEFINE_DEBUGFS_ATTRIBUTE(fops_implicit_txbf, mt7915_implicit_txbf_get,
+ mt7915_implicit_txbf_set, "%lld\n");
+
/* test knob of system layer 1/2 error recovery */
static int mt7915_ser_trigger_set(void *data, u64 val)
{
@@ -355,6 +381,8 @@ int mt7915_init_debugfs(struct mt7915_dev *dev)
mt7915_queues_acq);
debugfs_create_file("tx_stats", 0400, dir, dev, &fops_tx_stats);
debugfs_create_file("fw_debug", 0600, dir, dev, &fops_fw_debug);
+ debugfs_create_file("implicit_txbf", 0600, dir, dev,
+ &fops_implicit_txbf);
debugfs_create_u32("dfs_hw_pattern", 0400, dir, &dev->hw_pattern);
/* test knobs */
debugfs_create_file("radar_trigger", 0200, dir, dev,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index 255ccd7e3d27..cb501c5dc1cc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -169,18 +169,12 @@ static int mt7915_txbf_init(struct mt7915_dev *dev)
{
int ret;
- /*
- * TODO: DBDC & check whether iBF phase calibration data has
- * been stored in eeprom offset 0x651~0x7b8, then write down
- * 0x1111 into 0x651 and 0x651 to trigger iBF.
- */
-
/* trigger sounding packets */
ret = mt7915_mcu_set_txbf_sounding(dev);
if (ret)
return ret;
- /* enable iBF & eBF */
+ /* enable eBF */
return mt7915_mcu_set_txbf_type(dev);
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index f38bc421ea8e..2ac780bc2696 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -1736,13 +1736,14 @@ mt7915_mcu_sta_sounding_rate(struct sta_rec_bf *bf)
}
static void
-mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct sta_rec_bf *bf)
+mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct mt7915_phy *phy,
+ struct sta_rec_bf *bf)
{
struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
u8 n = 0;
bf->tx_mode = MT_PHY_TYPE_HT;
- bf->bf_cap |= MT_IBF;
+ bf->bf_cap = MT_IBF;
if (mcs->tx_params & IEEE80211_HT_MCS_TX_RX_DIFF &&
(mcs->tx_params & IEEE80211_HT_MCS_TX_DEFINED))
@@ -1755,8 +1756,9 @@ mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct sta_rec_bf *bf)
else if (mcs->rx_mask[1])
n = 1;
+ bf->nr = hweight8(phy->chainmask) - 1;
bf->nc = min_t(u8, bf->nr, n);
- bf->ibf_ncol = bf->nc;
+ bf->ibf_ncol = n;
if (sta->bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->nc)
bf->ibf_timeout = 0x48;
@@ -1764,34 +1766,46 @@ mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct sta_rec_bf *bf)
static void
mt7915_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7915_phy *phy,
- struct sta_rec_bf *bf)
+ struct sta_rec_bf *bf, bool explicit)
{
struct ieee80211_sta_vht_cap *pc = &sta->vht_cap;
struct ieee80211_sta_vht_cap *vc = &phy->mt76->sband_5g.sband.vht_cap;
- u8 bfee_nr, bfer_nr, n, tx_ant = hweight8(phy->chainmask) - 1;
- u16 mcs_map;
+ u16 mcs_map = le16_to_cpu(pc->vht_mcs.rx_mcs_map);
+ u8 nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
+ u8 tx_ant = hweight8(phy->chainmask) - 1;
bf->tx_mode = MT_PHY_TYPE_VHT;
- bf->bf_cap |= MT_EBF;
- mt7915_mcu_sta_sounding_rate(bf);
+ if (explicit) {
+ u8 n, bfee_nr, bfer_nr;
- bfee_nr = FIELD_GET(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK,
- pc->cap);
- bfer_nr = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,
- vc->cap);
- mcs_map = le16_to_cpu(pc->vht_mcs.rx_mcs_map);
+ bf->bf_cap = MT_EBF;
- n = min_t(u8, bfer_nr, bfee_nr);
- bf->nr = min_t(u8, n, tx_ant);
- n = mt7915_mcu_get_sta_nss(mcs_map);
+ mt7915_mcu_sta_sounding_rate(bf);
- bf->nc = min_t(u8, n, bf->nr);
- bf->ibf_ncol = bf->nc;
+ bfee_nr = FIELD_GET(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK,
+ pc->cap);
+ bfer_nr = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,
+ vc->cap);
+ n = min_t(u8, bfer_nr, bfee_nr);
+ bf->nr = min_t(u8, n, tx_ant);
+ bf->nc = min_t(u8, nss_mcs, bf->nr);
+ bf->ibf_ncol = bf->nc;
+
+ if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
+ bf->nr = 1;
+ } else {
+ bf->bf_cap = MT_IBF;
+ bf->nr = tx_ant;
+ bf->nc = min_t(u8, nss_mcs, bf->nr);
+ bf->ibf_ncol = nss_mcs;
+
+ if (sta->bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->nc)
+ bf->ibf_timeout = 0x48;
- /* force nr from 4 to 2 */
- if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
- bf->nr = 1;
+ if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
+ bf->ibf_nrow = 1;
+ }
}
static void
@@ -1800,16 +1814,14 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
{
struct ieee80211_sta_he_cap *pc = &sta->he_cap;
struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem;
- const struct ieee80211_he_cap_elem *ve;
- const struct ieee80211_sta_he_cap *vc;
- u8 bfee_nr, bfer_nr, nss_mcs;
- u16 mcs_map;
-
- vc = mt7915_get_he_phy_cap(phy, vif);
- ve = &vc->he_cap_elem;
+ const struct ieee80211_sta_he_cap *vc = mt7915_get_he_phy_cap(phy, vif);
+ const struct ieee80211_he_cap_elem *ve = &vc->he_cap_elem;
+ u16 mcs_map = le16_to_cpu(pc->he_mcs_nss_supp.rx_mcs_80);
+ u8 nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
+ u8 bfee_nr, bfer_nr;
bf->tx_mode = MT_PHY_TYPE_HE_SU;
- bf->bf_cap |= MT_EBF;
+ bf->bf_cap = MT_EBF;
mt7915_mcu_sta_sounding_rate(bf);
@@ -1821,10 +1833,6 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
ve->phy_cap_info[5]);
bfee_nr = HE_PHY(CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK,
pe->phy_cap_info[4]);
-
- mcs_map = le16_to_cpu(pc->he_mcs_nss_supp.tx_mcs_80);
- nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
-
bf->nr = min_t(u8, bfer_nr, bfee_nr);
bf->nc = min_t(u8, nss_mcs, bf->nr);
bf->ibf_ncol = bf->nc;
@@ -1863,7 +1871,7 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
static void
mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
struct ieee80211_vif *vif, struct mt7915_phy *phy,
- bool enable)
+ bool enable, bool explicit)
{
struct sta_rec_bf *bf;
struct tlv *tlv;
@@ -1885,19 +1893,25 @@ mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
return;
}
- bf->bw = sta->bandwidth;
- bf->ibf_dbw = sta->bandwidth;
- bf->ibf_nrow = tx_ant;
- bf->ibf_timeout = 0x18;
-
+ /* he: eBF only, in accordance with spec
+ * vht: support eBF and iBF
+ * ht: iBF only, since mac80211 lacks of eBF support
+ */
if (sta->he_cap.has_he)
mt7915_mcu_sta_bfer_he(sta, vif, phy, bf);
else if (sta->vht_cap.vht_supported)
- mt7915_mcu_sta_bfer_vht(sta, phy, bf);
+ mt7915_mcu_sta_bfer_vht(sta, phy, bf, explicit);
else if (sta->ht_cap.ht_supported)
- mt7915_mcu_sta_bfer_ht(sta, bf);
+ mt7915_mcu_sta_bfer_ht(sta, phy, bf);
+ else
+ return;
+
+ bf->bw = sta->bandwidth;
+ bf->ibf_dbw = sta->bandwidth;
+ bf->ibf_nrow = tx_ant;
+ bf->ibf_timeout = 0x18;
- if (bf->bf_cap & MT_EBF && bf->nr != tx_ant)
+ if (explicit && bf->nr != tx_ant)
bf->mem_20m = matrix[tx_ant][bf->nc];
else
bf->mem_20m = matrix[bf->nr][bf->nc];
@@ -2002,14 +2016,14 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
/* must keep each tag independent */
/* starec bf */
- if (ebf) {
+ if (ebf || dev->ibf) {
len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bf);
skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
if (IS_ERR(skb))
return PTR_ERR(skb);
- mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable);
+ mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable, ebf);
r = mt76_mcu_skb_send_msg(&dev->mt76, skb,
MCU_EXT_CMD_STA_REC_UPDATE, true);
@@ -3442,7 +3456,7 @@ int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev)
} __packed req = {
.action = MT_BF_TYPE_UPDATE,
.ebf = true,
- .ibf = false,
+ .ibf = dev->ibf,
};
return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_TXBF_ACTION, &req,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index df7ac2cf052f..63ad1f8199f2 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -191,6 +191,7 @@ struct mt7915_dev {
bool dbdc_support;
bool flash_mode;
bool fw_debug;
+ bool ibf;
};
enum {
--
2.18.0
> This is a preliminary patch for implicit beamforming support.
>
Hi Ryber,
just few nitpicks inline.
Regards,
Lorenzo
> Signed-off-by: Ryder Lee <[email protected]>
> ---
> .../net/wireless/mediatek/mt76/mt7915/mcu.c | 50 +++++++------------
> 1 file changed, 17 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> index 0baef70fc522..f38bc421ea8e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> @@ -66,9 +66,6 @@ struct mt7915_fw_region {
>
> #define MCU_PATCH_ADDRESS 0x200000
>
> -#define MT_STA_BFER BIT(0)
> -#define MT_STA_BFEE BIT(1)
> -
> #define FW_FEATURE_SET_ENCRYPT BIT(0)
> #define FW_FEATURE_SET_KEY_IDX GENMASK(2, 1)
> #define FW_FEATURE_OVERRIDE_ADDR BIT(5)
> @@ -1948,16 +1945,23 @@ mt7915_mcu_sta_bfee_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
> bfee->fb_identity_matrix = true;
> }
>
> -static u8
> -mt7915_mcu_sta_txbf_type(struct mt7915_phy *phy, struct ieee80211_vif *vif,
> - struct ieee80211_sta *sta)
> +static int
> +mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
> + struct ieee80211_sta *sta, bool enable)
> {
> - u8 type = 0;
> + struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
> + struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
> + struct mt7915_phy *phy;
> + struct sk_buff *skb;
> + int r, len;
> + bool ebfee = 0, ebf = 0;
>
> if (vif->type != NL80211_IFTYPE_STATION &&
> vif->type != NL80211_IFTYPE_AP)
> return 0;
>
> + phy = mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy;
> +
> if (sta->he_cap.has_he) {
> struct ieee80211_he_cap_elem *pe;
> const struct ieee80211_he_cap_elem *ve;
> @@ -1970,12 +1974,12 @@ mt7915_mcu_sta_txbf_type(struct mt7915_phy *phy, struct ieee80211_vif *vif,
> if ((HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]) ||
> HE_PHY(CAP4_MU_BEAMFORMER, pe->phy_cap_info[4])) &&
> HE_PHY(CAP4_SU_BEAMFORMEE, ve->phy_cap_info[4]))
> - type |= MT_STA_BFEE;
> + ebfee = true;
>
> if ((HE_PHY(CAP3_SU_BEAMFORMER, ve->phy_cap_info[3]) ||
> HE_PHY(CAP4_MU_BEAMFORMER, ve->phy_cap_info[4])) &&
> HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]))
> - type |= MT_STA_BFER;
> + ebf = true;
> } else if (sta->vht_cap.vht_supported) {
> struct ieee80211_sta_vht_cap *pc;
> struct ieee80211_sta_vht_cap *vc;
> @@ -1989,36 +1993,16 @@ mt7915_mcu_sta_txbf_type(struct mt7915_phy *phy, struct ieee80211_vif *vif,
> IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;
>
> if ((pc->cap & cr) && (vc->cap & ce))
> - type |= MT_STA_BFEE;
> + ebfee = true;
what about:
ebfee = !!((pc->cap & cr) && (vc->cap & ce))
>
> if ((vc->cap & cr) && (pc->cap & ce))
> - type |= MT_STA_BFER;
> - } else if (sta->ht_cap.ht_supported) {
> - /* TODO: iBF */
> + ebf = true;
ebfee = !!((vc->cap & cr) && (pc->cap & ce))
> }
>
> - return type;
> -}
> -
> -static int
> -mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
> - struct ieee80211_sta *sta, bool enable)
> -{
> - struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
> - struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
> - struct mt7915_phy *phy;
> - struct sk_buff *skb;
> - int r, len;
> - u8 type;
> -
> - phy = mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy;
> -
> - type = mt7915_mcu_sta_txbf_type(phy, vif, sta);
> -
> /* must keep each tag independent */
>
> /* starec bf */
> - if (type & MT_STA_BFER) {
> + if (ebf) {
> len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bf);
>
> skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
> @@ -2034,7 +2018,7 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
> }
>
> /* starec bfee */
> - if (type & MT_STA_BFEE) {
> + if (ebfee) {
> len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bfee);
>
> skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
> --
> 2.18.0
>
> Add ht/vht implicit Tx beamforming support and enable it via debugfs.
>
> Tested-by: Shayne Chen <[email protected]>
> Signed-off-by: Ryder Lee <[email protected]>
> ---
> .../wireless/mediatek/mt76/mt7915/debugfs.c | 28 +++++
> .../net/wireless/mediatek/mt76/mt7915/init.c | 8 +-
> .../net/wireless/mediatek/mt76/mt7915/mcu.c | 104 ++++++++++--------
> .../wireless/mediatek/mt76/mt7915/mt7915.h | 1 +
> 4 files changed, 89 insertions(+), 52 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> index 7d810fbf2862..340d489993bb 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> @@ -6,6 +6,32 @@
>
> /** global debugfs **/
>
> +static int
> +mt7915_implicit_txbf_set(void *data, u64 val)
> +{
> + struct mt7915_dev *dev = data;
> +
> + if (test_bit(MT76_STATE_RUNNING, &dev->mphy.state))
> + return 0;
Maybe return -EBUSY here?
> +
> + dev->ibf = !!val;
> +
> + return mt7915_mcu_set_txbf_type(dev);
> +}
> +
> +static int
> +mt7915_implicit_txbf_get(void *data, u64 *val)
> +{
> + struct mt7915_dev *dev = data;
> +
> + *val = dev->ibf;
> +
> + return 0;
> +}
> +
> +DEFINE_DEBUGFS_ATTRIBUTE(fops_implicit_txbf, mt7915_implicit_txbf_get,
> + mt7915_implicit_txbf_set, "%lld\n");
> +
> /* test knob of system layer 1/2 error recovery */
> static int mt7915_ser_trigger_set(void *data, u64 val)
> {
> @@ -355,6 +381,8 @@ int mt7915_init_debugfs(struct mt7915_dev *dev)
> mt7915_queues_acq);
> debugfs_create_file("tx_stats", 0400, dir, dev, &fops_tx_stats);
> debugfs_create_file("fw_debug", 0600, dir, dev, &fops_fw_debug);
> + debugfs_create_file("implicit_txbf", 0600, dir, dev,
> + &fops_implicit_txbf);
> debugfs_create_u32("dfs_hw_pattern", 0400, dir, &dev->hw_pattern);
> /* test knobs */
> debugfs_create_file("radar_trigger", 0200, dir, dev,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> index 255ccd7e3d27..cb501c5dc1cc 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> @@ -169,18 +169,12 @@ static int mt7915_txbf_init(struct mt7915_dev *dev)
> {
> int ret;
>
> - /*
> - * TODO: DBDC & check whether iBF phase calibration data has
> - * been stored in eeprom offset 0x651~0x7b8, then write down
> - * 0x1111 into 0x651 and 0x651 to trigger iBF.
> - */
> -
> /* trigger sounding packets */
> ret = mt7915_mcu_set_txbf_sounding(dev);
> if (ret)
> return ret;
>
> - /* enable iBF & eBF */
> + /* enable eBF */
> return mt7915_mcu_set_txbf_type(dev);
> }
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> index f38bc421ea8e..2ac780bc2696 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> @@ -1736,13 +1736,14 @@ mt7915_mcu_sta_sounding_rate(struct sta_rec_bf *bf)
> }
>
> static void
> -mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct sta_rec_bf *bf)
> +mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct mt7915_phy *phy,
> + struct sta_rec_bf *bf)
> {
> struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
> u8 n = 0;
>
> bf->tx_mode = MT_PHY_TYPE_HT;
> - bf->bf_cap |= MT_IBF;
> + bf->bf_cap = MT_IBF;
>
> if (mcs->tx_params & IEEE80211_HT_MCS_TX_RX_DIFF &&
> (mcs->tx_params & IEEE80211_HT_MCS_TX_DEFINED))
> @@ -1755,8 +1756,9 @@ mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct sta_rec_bf *bf)
> else if (mcs->rx_mask[1])
> n = 1;
>
> + bf->nr = hweight8(phy->chainmask) - 1;
> bf->nc = min_t(u8, bf->nr, n);
> - bf->ibf_ncol = bf->nc;
> + bf->ibf_ncol = n;
>
> if (sta->bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->nc)
> bf->ibf_timeout = 0x48;
> @@ -1764,34 +1766,46 @@ mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct sta_rec_bf *bf)
>
> static void
> mt7915_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7915_phy *phy,
> - struct sta_rec_bf *bf)
> + struct sta_rec_bf *bf, bool explicit)
> {
> struct ieee80211_sta_vht_cap *pc = &sta->vht_cap;
> struct ieee80211_sta_vht_cap *vc = &phy->mt76->sband_5g.sband.vht_cap;
> - u8 bfee_nr, bfer_nr, n, tx_ant = hweight8(phy->chainmask) - 1;
> - u16 mcs_map;
> + u16 mcs_map = le16_to_cpu(pc->vht_mcs.rx_mcs_map);
> + u8 nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
> + u8 tx_ant = hweight8(phy->chainmask) - 1;
>
> bf->tx_mode = MT_PHY_TYPE_VHT;
> - bf->bf_cap |= MT_EBF;
>
> - mt7915_mcu_sta_sounding_rate(bf);
> + if (explicit) {
> + u8 n, bfee_nr, bfer_nr;
>
> - bfee_nr = FIELD_GET(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK,
> - pc->cap);
> - bfer_nr = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,
> - vc->cap);
> - mcs_map = le16_to_cpu(pc->vht_mcs.rx_mcs_map);
> + bf->bf_cap = MT_EBF;
>
> - n = min_t(u8, bfer_nr, bfee_nr);
> - bf->nr = min_t(u8, n, tx_ant);
> - n = mt7915_mcu_get_sta_nss(mcs_map);
> + mt7915_mcu_sta_sounding_rate(bf);
>
> - bf->nc = min_t(u8, n, bf->nr);
> - bf->ibf_ncol = bf->nc;
> + bfee_nr = FIELD_GET(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK,
> + pc->cap);
> + bfer_nr = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,
> + vc->cap);
> + n = min_t(u8, bfer_nr, bfee_nr);
> + bf->nr = min_t(u8, n, tx_ant);
> + bf->nc = min_t(u8, nss_mcs, bf->nr);
> + bf->ibf_ncol = bf->nc;
> +
> + if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
> + bf->nr = 1;
> + } else {
> + bf->bf_cap = MT_IBF;
> + bf->nr = tx_ant;
> + bf->nc = min_t(u8, nss_mcs, bf->nr);
> + bf->ibf_ncol = nss_mcs;
> +
> + if (sta->bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->nc)
> + bf->ibf_timeout = 0x48;
>
> - /* force nr from 4 to 2 */
> - if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
> - bf->nr = 1;
> + if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
> + bf->ibf_nrow = 1;
> + }
> }
>
> static void
> @@ -1800,16 +1814,14 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
> {
> struct ieee80211_sta_he_cap *pc = &sta->he_cap;
> struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem;
> - const struct ieee80211_he_cap_elem *ve;
> - const struct ieee80211_sta_he_cap *vc;
> - u8 bfee_nr, bfer_nr, nss_mcs;
> - u16 mcs_map;
> -
> - vc = mt7915_get_he_phy_cap(phy, vif);
> - ve = &vc->he_cap_elem;
> + const struct ieee80211_sta_he_cap *vc = mt7915_get_he_phy_cap(phy, vif);
> + const struct ieee80211_he_cap_elem *ve = &vc->he_cap_elem;
> + u16 mcs_map = le16_to_cpu(pc->he_mcs_nss_supp.rx_mcs_80);
> + u8 nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
> + u8 bfee_nr, bfer_nr;
>
> bf->tx_mode = MT_PHY_TYPE_HE_SU;
> - bf->bf_cap |= MT_EBF;
> + bf->bf_cap = MT_EBF;
>
> mt7915_mcu_sta_sounding_rate(bf);
>
> @@ -1821,10 +1833,6 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
> ve->phy_cap_info[5]);
> bfee_nr = HE_PHY(CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK,
> pe->phy_cap_info[4]);
> -
> - mcs_map = le16_to_cpu(pc->he_mcs_nss_supp.tx_mcs_80);
> - nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
> -
> bf->nr = min_t(u8, bfer_nr, bfee_nr);
> bf->nc = min_t(u8, nss_mcs, bf->nr);
> bf->ibf_ncol = bf->nc;
> @@ -1863,7 +1871,7 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
> static void
> mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
> struct ieee80211_vif *vif, struct mt7915_phy *phy,
> - bool enable)
> + bool enable, bool explicit)
> {
> struct sta_rec_bf *bf;
> struct tlv *tlv;
> @@ -1885,19 +1893,25 @@ mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
> return;
> }
>
> - bf->bw = sta->bandwidth;
> - bf->ibf_dbw = sta->bandwidth;
> - bf->ibf_nrow = tx_ant;
> - bf->ibf_timeout = 0x18;
> -
> + /* he: eBF only, in accordance with spec
> + * vht: support eBF and iBF
> + * ht: iBF only, since mac80211 lacks of eBF support
> + */
> if (sta->he_cap.has_he)
> mt7915_mcu_sta_bfer_he(sta, vif, phy, bf);
> else if (sta->vht_cap.vht_supported)
> - mt7915_mcu_sta_bfer_vht(sta, phy, bf);
> + mt7915_mcu_sta_bfer_vht(sta, phy, bf, explicit);
> else if (sta->ht_cap.ht_supported)
> - mt7915_mcu_sta_bfer_ht(sta, bf);
> + mt7915_mcu_sta_bfer_ht(sta, phy, bf);
> + else
> + return;
> +
> + bf->bw = sta->bandwidth;
> + bf->ibf_dbw = sta->bandwidth;
> + bf->ibf_nrow = tx_ant;
> + bf->ibf_timeout = 0x18;
>
> - if (bf->bf_cap & MT_EBF && bf->nr != tx_ant)
> + if (explicit && bf->nr != tx_ant)
> bf->mem_20m = matrix[tx_ant][bf->nc];
> else
> bf->mem_20m = matrix[bf->nr][bf->nc];
> @@ -2002,14 +2016,14 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
> /* must keep each tag independent */
>
> /* starec bf */
> - if (ebf) {
> + if (ebf || dev->ibf) {
> len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bf);
>
> skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
> if (IS_ERR(skb))
> return PTR_ERR(skb);
>
> - mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable);
> + mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable, ebf);
>
> r = mt76_mcu_skb_send_msg(&dev->mt76, skb,
> MCU_EXT_CMD_STA_REC_UPDATE, true);
> @@ -3442,7 +3456,7 @@ int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev)
> } __packed req = {
> .action = MT_BF_TYPE_UPDATE,
> .ebf = true,
> - .ibf = false,
> + .ibf = dev->ibf,
> };
>
> return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_TXBF_ACTION, &req,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> index df7ac2cf052f..63ad1f8199f2 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> @@ -191,6 +191,7 @@ struct mt7915_dev {
> bool dbdc_support;
> bool flash_mode;
> bool fw_debug;
> + bool ibf;
> };
>
> enum {
> --
> 2.18.0
>