Commit 510ef226 authored by Nicolas Cavallari's avatar Nicolas Cavallari Committed by Felix Fietkau
Browse files

wifi: mt76: mt7915: don't claim 160MHz support with mt7915 DBDC 



The hardware simply does not support this in DBDC mode.  Remove it from
the HE capabilities.

Signed-off-by: default avatarNicolas Cavallari <nicolas.cavallari@green-communications.fr>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent d44f5bca

drivers/net/wireless/mediatek/mt76/mt7915/init.c

+31 −16
Original line number Diff line number Diff line
@@ -761,8 +761,12 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy, 
	u8 c, sts_160 = sts;



	/* Can do 1/2 of STS in 160Mhz mode for mt7915 */

	if (is_mt7915(&dev->mt76) && !dev->dbdc_support)

	if (is_mt7915(&dev->mt76)) {

		if (!dev->dbdc_support)

			sts_160 /= 2;

		else

			sts_160 = 0;

	}



#ifdef CONFIG_MAC80211_MESH

	if (vif == NL80211_IFTYPE_MESH_POINT)
@@ -772,8 +776,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy, 
	elem->phy_cap_info[3] &= ~IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER;

	elem->phy_cap_info[4] &= ~IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;



	c = IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK |

	    IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK;

	c = IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK;

	if (sts_160)

		c |= IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK;

	elem->phy_cap_info[5] &= ~c;



	c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |
@@ -789,8 +794,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy, 
	elem->phy_cap_info[2] |= c;



	c = IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |

	    IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 |

	    IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4;

	    IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4;

	if (sts_160)

		c |= IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4;

	elem->phy_cap_info[4] |= c;



	/* do not support NG16 due to spec D4.0 changes subcarrier idx */
@@ -815,11 +821,12 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy, 
	elem->phy_cap_info[4] |= IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;



	/* num_snd_dim

	 * for mt7915, max supported sts is 2 for bw > 80MHz

	 * for mt7915, max supported sts is 2 for bw > 80MHz and 0 if dbdc

	 */

	c = FIELD_PREP(IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,

		       sts - 1) |

	    FIELD_PREP(IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK,

		       sts - 1);

	if (sts_160)

		c |= FIELD_PREP(IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK,

				sts_160 - 1);

	elem->phy_cap_info[5] |= c;
@@ -865,11 +872,14 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, 
	u16 mcs_map_160 = 0;

	u8 nss_160;



	if (!is_mt7915(&dev->mt76))

		nss_160 = nss;

	else if (!dev->dbdc_support)

		/* Can do 1/2 of NSS streams in 160Mhz mode for mt7915 */

	if (is_mt7915(&dev->mt76) && !dev->dbdc_support)

		nss_160 = nss / 2;

	else

		nss_160 = nss;

		/* Can't do 160MHz with mt7915 dbdc */

		nss_160 = 0;



	for (i = 0; i < 8; i++) {

		if (i < nss)
@@ -915,11 +925,14 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, 
		if (band == NL80211_BAND_2GHZ)

			he_cap_elem->phy_cap_info[0] =

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;

		else

		else if (nss_160)

			he_cap_elem->phy_cap_info[0] =

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;

		else

			he_cap_elem->phy_cap_info[0] =

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G;



		he_cap_elem->phy_cap_info[1] =

			IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD;
@@ -973,9 +986,11 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, 
				IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI;

			he_cap_elem->phy_cap_info[8] |=

				IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |

				IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |

				IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU |

				IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484;

			if (nss_160)

				he_cap_elem->phy_cap_info[8] |=

					IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |

					IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;

			he_cap_elem->phy_cap_info[9] |=

				IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM |

				IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |