OSDN Git Service

wifi: mt76: mt7915: Fix chainmask calculation on mt7915 DBDC
authorNicolas Cavallari <nicolas.cavallari@green-communications.fr>
Thu, 10 Nov 2022 15:39:51 +0000 (16:39 +0100)
committerFelix Fietkau <nbd@nbd.name>
Thu, 1 Dec 2022 16:29:13 +0000 (17:29 +0100)
mt7915 does not have a per-band number of chains unlike the other chips,
it only has a total number of chains.  Yet the current code would
consider the total number as a per-band number.

For example, it would report that a 2x2 + 2x2 DBDC card have 4 chains on
each band and set chainmask to 0b1111 for the first interface and
0b11110000 for the second.

Fixes: 99ad32a4ca3a ("mt76: mt7915: add support for MT7986")
Co-developed-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c

index 83bced0..0bce0ce 100644 (file)
@@ -194,6 +194,7 @@ void mt7915_eeprom_parse_hw_cap(struct mt7915_dev *dev,
        nss = path;
        if (dev->dbdc_support) {
                if (is_mt7915(&dev->mt76)) {
+                       path = min_t(u8, path, 2);
                        nss = FIELD_GET(MT_EE_WIFI_CONF3_TX_PATH_B0,
                                        eeprom[MT_EE_WIFI_CONF + 3]);
                        if (phy->band_idx)