From patchwork Fri Aug 25 02:30:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9921171 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8A67C600C5 for ; Fri, 25 Aug 2017 02:31:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73222204C1 for ; Fri, 25 Aug 2017 02:31:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67A29205A4; Fri, 25 Aug 2017 02:31:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C61A4204C2 for ; Fri, 25 Aug 2017 02:31:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754511AbdHYCbJ (ORCPT ); Thu, 24 Aug 2017 22:31:09 -0400 Received: from mail-cys01nam02on0057.outbound.protection.outlook.com ([104.47.37.57]:63780 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754480AbdHYCbF (ORCPT ); Thu, 24 Aug 2017 22:31:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantenna.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=+S+IHkuCJjsFjJ9FaC5lOCNloNiauXy6UJVPfsNZOMY=; b=V0/RTEKtHgboHx89WlhtbZTanFRx5W3O6baZvXLQyXjdOOHYHdO8Dahshbssj/eje21NTxgWDwf0kMOrLD8FoLNy5JBGwrBJgZeGfCY9LP/1H7Hm2TuDfXZUvtTlyeM7l7z337Bu73CmMPL7WYMa2vSu4OXFPX6ApCbd1G+6tUQ= Received: from dodo-dell.quantenna.com (12.131.200.68) by SN1PR0501MB2047.namprd05.prod.outlook.com (10.163.227.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.4; Fri, 25 Aug 2017 02:31:01 +0000 From: igor.mitsyanko.os@quantenna.com To: linux-wireless@vger.kernel.org Cc: sergey.matyukevich.os@quantenna.com, avinashp@quantenna.com, johannes@sipsolutions.net, Igor Mitsyanko Subject: [PATCH 19/27] qtnfmac: initialize HT/VHT caps "can override" masks Date: Thu, 24 Aug 2017 19:30:16 -0700 Message-Id: <20170825023024.10565-20-igor.mitsyanko.os@quantenna.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170825023024.10565-1-igor.mitsyanko.os@quantenna.com> References: <20170825023024.10565-1-igor.mitsyanko.os@quantenna.com> MIME-Version: 1.0 X-Originating-IP: [12.131.200.68] X-ClientProxiedBy: CY4PR15CA0017.namprd15.prod.outlook.com (10.172.74.27) To SN1PR0501MB2047.namprd05.prod.outlook.com (10.163.227.20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 75a11199-b277-4665-ef0c-08d4eb615437 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN1PR0501MB2047; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 3:CZN5YjmqdwuYMIc/AatTy2SN+s321K6IhCcdJLmPnzpSWYNvAFyqrXL2V5b7cxhKLGh2wNcJBsjo3ylqRWCD2lJg8b5RdrxvlhvbOkaogTgG0v3+S3UHfYNrp59t1SgbsW+6HLZlSJpLcvZHc2mL7UAHyTSFq5UC7qIUPpx0YJisilRV1cWanutt7kvAY4Rg+KE1dbAFJs2Qvp0cEPkbkm1jziDNbdetjabcJeuBkwJCjo4anDbGTQ4wZIYAyg4d; 25:QpwopPcMdeuvx0Nx45+GXYKJHlRMyBwZfGW2YVMLknBS0Kw3qY+RyZVEi73hKxjqYGTchtz3WY49r2Oz63KRySFl/SiZS2mLPDz+yG1iXGF6CQdI8iZKY8wYGaPDgelJucdSZNNyDgc5AER3ALKl/1QQrlrFwq5GIppLBQlZMm/2e8hui5/ofs9kJaCVCNK77xRIuGTjrq6UMCiTNgCxOjKgZI5v11ADx6YPpm+ctReP5H9FD8uaDCMFJCTrPCiPydMlu6+ojWmeBChN24/VRAwfaX8jUz/OQ/hAs1xqbbCh021AMyK2r7oJDNtIpxZqCZ4wB6KtTBV4LqiG69llOg==; 31:Se/PSf6mKy3ypVJ1TlHUqwwiAyNlkuGeC2vKD/bJs8yW/pA1ojTETI8Foyim/SqPe4MbnLhU0/bL1rXrKoNJPG+kZS/S1mznKss88Q/Tc/j+n8Ud+QV5ZFtyoJIWNMo5FvePKg5izvbpOE2zKsN4Im5dh2Cx55wmnuHxW6QuEJuccGID2e+GQ0ZcAWNh4q3xHZOlEKPux8D6b/B90HQxSfWm6zRjr7PcucgBh2yLVtc= X-MS-TrafficTypeDiagnostic: SN1PR0501MB2047: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 20:RW3JBJzI+WvUdiWma95ahT6qTtEAAvEpg1KWmE73IX/6kxEqLtQtgzcJErmJMdtacOddRF3YGe4gp7DXjV19HjNnlwVbdOwlM5MBgrbS+TqOfLvZ9qrOv8OaUtvAyX5Pq+b9wG5DuGc8DmerCIxJvO5rIcV57ew0JNYcfRpDSPQUpAMjj0KU3b/VkSSuSoDXovj486g3hzhdx922P4EFBWQp4DBsDTgVLGUpZsmbQsGK/+tfndPMI4diQKOQQRU9ldfAWKEE+9ssx6WyABJIFvdGFtlJU7tyCPclufWbZ53B3TCk888rYZugTOYtfaHNopMK0OMluYpoqH0laVJrO+2cKPlBb0cvLg8yAFhWk+dLoktncMrr++mjy2CJwLceluBKAwQg4ewuvJwGJa428lt6AKOk0JQlv1lBcct4/7goNBlfnPcJYdj9uxF+g1J1p9/nxV04aWmhdSRbFPO00/bRp3h50rbE60gnf8kJtI6/Jrdg3NeCBL3WI7ok83Uihf2+IbXuXtTNTk6lrQ/SpP7tTOIHj43tk6SXZOl9EGfBdWM13tSF388XKVC4BXbVvqxFhu6B2ygxCXehS6wCUztgD2bqdZPwpEpiyhOfnnM=; 4:MCkmBfUp7SBEivsy9ATlJop0UxqmvrXl69K9LT3Hx8rSME8jfno8fUchiYdocn+Bwwo32QZKgTlYLvnnEx2NALTyUH9lXeQ980SY0p1ph9MjjCkA5/WTCfILbzPI1RVk2wVTx+1C1shARUEZkZL9s8FnMICX68i8mXr/WQ3ETbnekCtg3bqJjnx1kqfjQ03AJi+awLV3qPxMoE3Pb8+fQxKPemvf9Vl7bs/afw5BHt5J2BPmOetIl+fL+vpC0JQx X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR0501MB2047; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR0501MB2047; X-Forefront-PRVS: 041032FF37 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39830400002)(199003)(189002)(76176999)(53416004)(50986999)(110136004)(7350300001)(6916009)(6666003)(2950100002)(47776003)(2906002)(9686003)(53936002)(66066001)(2361001)(106356001)(105586002)(2351001)(86362001)(305945005)(33646002)(575784001)(7736002)(42186005)(81166006)(81156014)(107886003)(8676002)(103116003)(478600001)(85782001)(68736007)(50226002)(50466002)(3846002)(6486002)(25786009)(36756003)(97736004)(5660300001)(1076002)(6116002)(69596002)(5003940100001)(101416001)(4326008)(189998001)(48376002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0501MB2047; H:dodo-dell.quantenna.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: quantenna.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=igor.mitsyanko.os@quantenna.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0501MB2047; 23:xBiM2jorxojP9kZvc8x5JGHWdBuZSIOgXSS+zU2?= =?us-ascii?Q?3NktBa+o5N3gvjsgHKTxumYJvIzgLOd+g7UaF8kp9G5eQGazaOYrFcAaCs4p?= =?us-ascii?Q?5H7+8J/7AbhPI1Cf2Hk67qM0N2v00hHAruUTu8S4cbt4Y8Tnex8hRSGM9zLB?= =?us-ascii?Q?HyxvlEsR1ANC01DI12zyl5d93EyGonCAlZ0ACfiGBq3tfBTuEwqzkN3iYiZI?= =?us-ascii?Q?NRz6uA51Z4taCAuuIZCXGdJcxCfIeiPvXQXa/s7ESuc9xDW7jxkjx65jLxyc?= =?us-ascii?Q?CMjpKaIlryJypnNrlEAqcrqYl1CptK6uABsP4rSy6kowSnN4wpu1KlCKt058?= =?us-ascii?Q?SCFp4Wp4XOFbGru6PZH7VvICVtPZs1VCALi+Pd5vqlf1OMImBoPJq4LD2f4O?= =?us-ascii?Q?rJeStdZ77LKSTpNIA/bc/hqMcsrNzS34DKgwFbUpGSXzoV7JQlcO39PcR9/x?= =?us-ascii?Q?QDUThjXCeKqiyMKpiMqjQqy/dVAHnnsllZDiAVRwQLOpfyywXktrXicFlwfB?= =?us-ascii?Q?Ah20cSXMJgohgwZ01afLmfZobJqK8dutkWXvQq8SoZL+9ijGKW97P1HqLPjX?= =?us-ascii?Q?0MzgMy/NEzNNWDz5RlMA05mzF6j76+1EbfWdi00LmfJzmEgOQsHg9hJf0LUO?= =?us-ascii?Q?nhFA2wJJ2KyjbYySwxj75CLpgd2m/Y3snTR5HO15ZM1+xUEz4/uZUFALnVfv?= =?us-ascii?Q?FHhegHOmejiZvvDw9XQpyV4Ww+uz5xIldP1G6BKZZtTTQ2fzbDMm09se9Qeh?= =?us-ascii?Q?kIE0qDyeiTu3ufY9jcAPu3A351cfZDR4O+QCPcMmzlPs9mbOpNbK6fq1Vw4H?= =?us-ascii?Q?VAsgh/+By839bqXP8vmBrvzQvJTJ9BsD3fo1NpW+DB4eWqPUAJPwGCtElgJb?= =?us-ascii?Q?Hc5QfxsUOKzVnyDbVbeNTBBMhfIGSdNGb8cfMLBA9H/4QPEuyYmQ9dntGfda?= =?us-ascii?Q?mawqpIHeKf6uUhPVf7ViNXQID9LXPDA54k9lOz+HmGxip+ZaRrCpmWNayY/5?= =?us-ascii?Q?O0PzW/Utxnc0dSXbvPysNhgBlDVLtxBf00ykV8OEYpTUVv1vbPKiAMIFhAf2?= =?us-ascii?Q?lzKepBbCF96wQQrn8JXu5x7170huV6bqtnl3gPuYJZrvzuCQla8F42ZmpBC4?= =?us-ascii?Q?ex3CXaV2KTwSFBhA0HoWTlVvtmEBqN1XMA8UxDrdWDY8NZ2nGljWQtHd5ke2?= =?us-ascii?Q?pq7Di0goFqRnnhq4NnCEXXJuMaslRlj2uQ+ImvyOunx5FOPy4tlzGsEXo7O+?= =?us-ascii?Q?dO4X04C6c3avRNVAygxoHMoGx7obpKgxq+L8lnt6taswFEeYib6SWLeufgBf?= =?us-ascii?Q?xiQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 6:ntcN1ChWs8l4X6KqI9QynM3/XdJO3OXLH+00IT0thwtekU9IKgQohfwzKrWqCeqnLYJ0C6wgMMiSRaurhqxk63iRpW/EID7jsLTaO9W48dl3gS0hUm2ioo5+AocTrv6Td4tiQk+glzoQfBlcZfGvBE9BK1CjviEOAGy903VKnPPaij3SOIiE/gtvM1+exbB66Y5Gxa4xTawh2HQJBv9n7+zo5OYLs8ogmtFu+PQhRxzRIYF/bX7eTg6g20NVfLRQjpLA8BY51n0Wa1mkYswnb26DYDNOryyfnWNplfGYMF628a0Z2Mk4mQc8mleDevr7H28cLNTEE1hFSAbQJZqPDg==; 5:QXwDCFkFd0BT7Ql1eAuKCqDFTOfoAfW9vIJa4S8UNoF7yvnXzxp13wgy128B4ZLMZ15cde/1hsNlxbEM3kU4jOlDS16t8Q/9GVoTFrMC86kaC/b5oif3QCubiZIs5uc4vvvd8Sl0Gp1z3JcMMMwPow==; 24:Ea+ACZw5ztqW6x+sZPwm/swj8k5ljMz/0LZZ5HgQe98B19+IhzoVeI7ivSAE+rpwCKSKq2fW2Osy00/4nIE0Pt+OoPJ0Z8CP/kZBCofHBTs=; 7:eC/4xoxTbvfVlsLCoxUAwBRZrF7OzbS5usOH4UNztLjmALm1HQsKA56QGrd06XDXcGYmQWOiR+MuE8YyTjeaPXjmRbrom01EGKNovMofzi1qG4YG3mM0P1SbCITF3+1/jYA99JqoqFBV0hqn6GwxtB9UoRl3X5fZhd6IsymraHCM74GbsvWYsQUJDCaJdrRlx5famW3hVv3C5fONP3hXqYUGnJK8epO9ShCH3698mS0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2017 02:31:01.7764 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0501MB2047 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Igor Mitsyanko Information on which HT/VHT capabilities can be overridden is reported per-MAC by wireless device. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 2 ++ drivers/net/wireless/quantenna/qtnfmac/commands.c | 7 ++++--- drivers/net/wireless/quantenna/qtnfmac/core.h | 4 ++-- drivers/net/wireless/quantenna/qtnfmac/qlink.h | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index 28612da..d6780f42 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -913,6 +913,8 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac) wiphy->available_antennas_rx = mac->macinfo.num_rx_chain; wiphy->max_ap_assoc_sta = mac->macinfo.max_ap_assoc_sta; + wiphy->ht_capa_mod_mask = &mac->macinfo.ht_cap_mod_mask; + wiphy->vht_capa_mod_mask = &mac->macinfo.vht_cap_mod_mask; ether_addr_copy(wiphy->perm_addr, mac->macaddr); diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index 065a93f..b26cd01 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -1108,9 +1108,10 @@ qtnf_cmd_resp_proc_mac_info(struct qtnf_wmac *mac, qlink_chan_width_mask_to_nl(le16_to_cpu( resp_info->radar_detect_widths)); - memcpy(&mac_info->ht_cap, &resp_info->ht_cap, sizeof(mac_info->ht_cap)); - memcpy(&mac_info->vht_cap, &resp_info->vht_cap, - sizeof(mac_info->vht_cap)); + memcpy(&mac_info->ht_cap_mod_mask, &resp_info->ht_cap_mod_mask, + sizeof(mac_info->ht_cap_mod_mask)); + memcpy(&mac_info->vht_cap_mod_mask, &resp_info->vht_cap_mod_mask, + sizeof(mac_info->vht_cap_mod_mask)); } static void qtnf_cmd_resp_band_fill_htcap(const u8 *info, diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.h b/drivers/net/wireless/quantenna/qtnfmac/core.h index 44a2cbb..3e74736 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/core.h +++ b/drivers/net/wireless/quantenna/qtnfmac/core.h @@ -103,8 +103,8 @@ struct qtnf_mac_info { u8 sretry_limit; u8 coverage_class; u8 radar_detect_widths; - struct ieee80211_ht_cap ht_cap; - struct ieee80211_vht_cap vht_cap; + struct ieee80211_ht_cap ht_cap_mod_mask; + struct ieee80211_vht_cap vht_cap_mod_mask; struct ieee80211_iface_limit *limits; size_t n_limits; }; diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h index de0e5b9..a9f410b 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h @@ -627,8 +627,8 @@ struct qlink_resp { * specified WMAC). * @num_tx_chain: Number of transmit chains used by WMAC. * @num_rx_chain: Number of receive chains used by WMAC. - * @vht_cap: VHT capabilities. - * @ht_cap: HT capabilities. + * @vht_cap_mod_mask: mask specifying which VHT capabilities can be altered. + * @ht_cap_mod_mask: mask specifying which HT capabilities can be altered. * @bands_cap: wireless bands WMAC can operate in, bitmap of &enum qlink_band. * @phymode_cap: PHY modes WMAC can operate in, bitmap of &enum qlink_phy_mode. * @max_ap_assoc_sta: Maximum number of associations supported by WMAC. @@ -640,8 +640,8 @@ struct qlink_resp_get_mac_info { u8 dev_mac[ETH_ALEN]; u8 num_tx_chain; u8 num_rx_chain; - struct ieee80211_vht_cap vht_cap; - struct ieee80211_ht_cap ht_cap; + struct ieee80211_vht_cap vht_cap_mod_mask; + struct ieee80211_ht_cap ht_cap_mod_mask; u8 bands_cap; u8 phymode_cap; __le16 max_ap_assoc_sta;