Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp161644pxb; Fri, 17 Sep 2021 22:24:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXNyZpoGup8r63qNuYDxw4dHfRzRznc0Y2AX3PtMH2rCQXXi8VWsYYIsN5p1B/ZIBM2YgV X-Received: by 2002:a17:906:7c52:: with SMTP id g18mr16256915ejp.246.1631942688344; Fri, 17 Sep 2021 22:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631942688; cv=none; d=google.com; s=arc-20160816; b=xYgBOV6az/ZmEROZOGVZOxvXF/hubh7WZgzx2VDKzbd9vYx15CuZsq/W9jw9PdWHpG q6xgsg64lNtIiQ84X/MDanV/t8jc/TBHiM1cs97HR6F55YoENHKR7XT4nNuPPPGNuHrR gOhyKPod1wDU7BBP82hhUK82vqvFNFGUWQVSMD4RxEAVhOMqJoHBeRtQcvLVkTbNkAjK sTFECTjZmbPsZLQDuQtSj7XfCgcKBSuW/ruEiW7YgC4DQXkq1IEZJOX9Fp9OykyZsCx6 w6+Bh95faxDZlYzf47DH29vtix/ef2GiPAHyPC1a1JjFYxlVsRwCCt6J7OCVlgLyP509 Plng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=UxHdpYWodGX9gDt4G96iMPsXbEZK17cBCV3puo6yG90=; b=SAR3ipbiX/e2MY6GKUHf1az7limKeM9KkvcVxat3/AG7qNTePBVdPieAW3fNRH3n88 Rsvu7y5+FIRE2XLoyPqjMwvYUIrg4fdRerlvhL8hRiaRvWxF1JP0Y1G3DuyS2KD6EWea P56yrOeDliVVNSJIQP4ggTfCVyQIYM/qUfxvS3ODm0r6GlmPwWBH42BZMFKivx7y/RCF meWvhfhkliOlMb7oIu138wQUWZAA8C2nqwW6mEankwW/Rakt3pg4oznqpWq2Qb2/u3y/ FmDDwan+nvAcZpq5w11T0bdE6CDdsC/7RVZxvDLOjor1GOSHcAVW7cRlohGsDNWJ91DQ lvyQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c24si9141010edn.26.2021.09.17.22.24.29; Fri, 17 Sep 2021 22:24:48 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241898AbhIRAG1 (ORCPT + 78 others); Fri, 17 Sep 2021 20:06:27 -0400 Received: from mailgw01.mediatek.com ([216.200.240.184]:15779 "EHLO mailgw01.mediatek.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229986AbhIRAG1 (ORCPT ); Fri, 17 Sep 2021 20:06:27 -0400 X-UUID: aeeb651dfba94734bc506c5fa55a21f5-20210917 X-UUID: aeeb651dfba94734bc506c5fa55a21f5-20210917 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 498995568; Fri, 17 Sep 2021 17:05:02 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 17 Sep 2021 17:00:24 -0700 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 18 Sep 2021 08:00:24 +0800 From: To: , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v2 12/16] mt76: connac: extend mcu_get_nic_capability Date: Sat, 18 Sep 2021 07:59:28 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Sean Wang Extend mcu_get_nic_capability to obtain tx resource for SDIO device, MAC address, and PHY capability. Tested-by: Deren Wu Signed-off-by: Sean Wang --- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + .../wireless/mediatek/mt76/mt76_connac_mcu.c | 66 +++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index 55c5642740de..50743a2bb6a2 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -512,6 +512,7 @@ struct mt76_sdio { int pse_data_quota; int ple_data_quota; int pse_mcu_quota; + int pse_page_size; int deficit; } sched; }; diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index a53f6344a184..cee17b48b296 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -1716,6 +1716,61 @@ void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb, } EXPORT_SYMBOL_GPL(mt76_connac_mcu_coredump_event); +static void mt76_connac_mcu_parse_tx_resource(struct mt76_dev *dev, + struct sk_buff *skb) +{ + struct mt76_sdio *sdio = &dev->sdio; + struct mt76_connac_tx_resource { + __le32 version; + __le32 pse_data_quota; + __le32 pse_mcu_quota; + __le32 ple_data_quota; + __le32 ple_mcu_quota; + __le16 pse_page_size; + __le16 ple_page_size; + u8 pp_padding; + u8 pad[3]; + } __packed * tx_res; + + tx_res = (struct mt76_connac_tx_resource *)skb->data; + sdio->sched.pse_data_quota = le32_to_cpu(tx_res->pse_data_quota); + sdio->sched.pse_mcu_quota = le32_to_cpu(tx_res->pse_mcu_quota); + sdio->sched.ple_data_quota = le32_to_cpu(tx_res->ple_data_quota); + sdio->sched.pse_page_size = le32_to_cpu(tx_res->pse_page_size); + sdio->sched.deficit = tx_res->pp_padding; +} + +static void mt76_connac_mcu_parse_phy_cap(struct mt76_dev *dev, + struct sk_buff *skb) +{ + struct mt76_connac_phy_cap { + u8 ht; + u8 vht; + u8 _5g; + u8 max_bw; + u8 nss; + u8 dbdc; + u8 tx_ldpc; + u8 rx_ldpc; + u8 tx_stbc; + u8 rx_stbc; + u8 hw_path; + u8 he; + } __packed * cap; + + enum { + WF0_24G, + WF0_5G + }; + + cap = (struct mt76_connac_phy_cap *)skb->data; + + dev->phy.antenna_mask = BIT(cap->nss) - 1; + dev->phy.chainmask = dev->phy.antenna_mask; + dev->phy.cap.has_2ghz = cap->hw_path & BIT(WF0_24G); + dev->phy.cap.has_5ghz = cap->hw_path & BIT(WF0_5G); +} + int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy) { struct mt76_connac_cap_hdr { @@ -1758,6 +1813,17 @@ int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy) case MT_NIC_CAP_6G: phy->cap.has_6ghz = skb->data[0]; break; + case MT_NIC_CAP_MAC_ADDR: + memcpy(phy->macaddr, (void *)skb->data, ETH_ALEN); + break; + case MT_NIC_CAP_PHY: + mt76_connac_mcu_parse_phy_cap(phy->dev, skb); + break; + case MT_NIC_CAP_TX_RESOURCE: + if (mt76_is_sdio(phy->dev)) + mt76_connac_mcu_parse_tx_resource(phy->dev, + skb); + break; default: break; } -- 2.25.1