Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1174068ybz; Fri, 1 May 2020 16:17:44 -0700 (PDT) X-Google-Smtp-Source: APiQypL1hRuHaY77P2PrImdg/8qm7Nkw0TVUVl82dEj+Cfh6UYzlClmOdn0j6e5xrtb9NNIM6SG3 X-Received: by 2002:a05:6402:1fc:: with SMTP id i28mr5549087edy.18.1588375064470; Fri, 01 May 2020 16:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588375064; cv=none; d=google.com; s=arc-20160816; b=NGABmh46w2FyaZLV7yyEgWKlJZg8k4YkpMbI8uJvmDwnDM7mlxrz78Y0L396QKOktC BzdbdnBiHb5BOPmLcan24r5dfXPaHFKDRdavYysDj7sKlNZr8Pz82dgAQx19fdjsB42/ 3BWQ+YeLKjwJBZdCMkSsEKXK9u3Uj6OjPHA/TnKQM6lLVYXYgEggsGFsjXBwYvFVib8P gDsb77E2jBI0PCNAB/hoAmdiRKVG+joXJSl4G7lfjtYif9DWrThLKbezIgQXMn5e1ufQ JfhXvxA6WSqJZkBJFEkhymoM29si15VjsptDH4SZt0iuGk+ylb79unEnqNONmLrxx/v7 y7IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=7I6hcG9VdLhyAul2A2yjj03hYHBrXiB3SEPb73zhtoM=; b=cPPznCYUNGWSFMC0Spas905CWvpC1ISnYlNX2ChTnHeY3ffeKniyvgyjLUfms3HICG tIOGgI9STy6LurrNJOLTOcKSFo/KjnpMoDhZfAPb/exJ1mdTgsmVH4iVVPZsSVWUfVNQ oU3bqheMLqN6T4qX8Pr6OBYgRAkaqfXPh95DIggl24jEmfdKvC2e3sI10SVIYGqC90Lm ai75L7ASTiL616TV2zSC7F8Erp0KWNrlhD4WRD1Iwdf+SsI5QWJVZ/CN6DWcuqLXTO+2 iYt1c1eqIClF15JJOdT3ZwH/QmOES4IVx0M1nFOpcgMARxDZV+c17/XGcL4doAa25HEm uOpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kIbMK9FT; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b16si2489614edr.270.2020.05.01.16.17.03; Fri, 01 May 2020 16:17:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kIbMK9FT; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726394AbgEAXNo (ORCPT + 99 others); Fri, 1 May 2020 19:13:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:56758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726045AbgEAXNo (ORCPT ); Fri, 1 May 2020 19:13:44 -0400 Received: from lore-desk.lan (unknown [151.48.155.206]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 10696205C9; Fri, 1 May 2020 23:13:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588374823; bh=5hBIs7ynppiec+Mcrs9/TWvkac65MInCkhDPsnn8QSk=; h=From:To:Cc:Subject:Date:From; b=kIbMK9FTS0+NRU3PUiXNElYXSAkBb+/jI/70vX+9ne/hXzpLPys9c8PBDZNlZ+zRP r2ROEhVt+1y1pIVpPK9qppuN9v/Cx1xCFzf9laCAWdeMcnh0YiUGf52NjIgG99mBcQ Kp4gl4j2O7+Q4dIPg415e5sNBDe9M4z1GBNykqpk= From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com, sean.wang@mediatek.com, linux-mediatek@lists.infradead.org Subject: [PATCH] mt76: mt7663: read tx streams from eeprom Date: Sat, 2 May 2020 01:13:11 +0200 Message-Id: X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Read tx stream configuration from eeprom/efuse partition Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 11 ++++++----- drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c index 521705015036..7440ad13c74b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c @@ -130,14 +130,15 @@ mt7615_eeprom_parse_hw_band_cap(struct mt7615_dev *dev) static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev) { u8 *eeprom = dev->mt76.eeprom.data; - u8 tx_mask; + u8 tx_mask, max_nss; mt7615_eeprom_parse_hw_band_cap(dev); if (is_mt7663(&dev->mt76)) { - tx_mask = 2; + max_nss = 2; + tx_mask = FIELD_GET(MT_EE_HW_CONF1_TX_MASK, + eeprom[MT7663_EE_HW_CONF1]); } else { - u8 max_nss; u32 val; /* read tx-rx mask from eeprom */ @@ -146,9 +147,9 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev) tx_mask = FIELD_GET(MT_EE_NIC_CONF_TX_MASK, eeprom[MT_EE_NIC_CONF_0]); - if (!tx_mask || tx_mask > max_nss) - tx_mask = max_nss; } + if (!tx_mask || tx_mask > max_nss) + tx_mask = max_nss; dev->chainmask = BIT(tx_mask) - 1; dev->mphy.antenna_mask = dev->chainmask; diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h index 3dd7009e5836..aad82b600c63 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h +++ b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h @@ -39,6 +39,7 @@ enum mt7615_eeprom_field { MT7663_EE_TX0_2G_TARGET_POWER = 0x123, MT_EE_TX2_5G_G0_TARGET_POWER = 0x142, MT_EE_TX3_5G_G0_TARGET_POWER = 0x16a, + MT7663_EE_HW_CONF1 = 0x1b0, MT7615_EE_MAX = 0x3bf, MT7622_EE_MAX = 0x3db, @@ -55,6 +56,8 @@ enum mt7615_eeprom_field { #define MT_EE_NIC_CONF_TX_MASK GENMASK(7, 4) #define MT_EE_NIC_CONF_RX_MASK GENMASK(3, 0) +#define MT_EE_HW_CONF1_TX_MASK GENMASK(2, 0) + #define MT_EE_NIC_CONF_TSSI_2G BIT(5) #define MT_EE_NIC_CONF_TSSI_5G BIT(6) -- 2.25.4