From patchwork Sat Sep 2 01:44:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9935443 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 D83CA60216 for ; Sat, 2 Sep 2017 01:45:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA7BC28542 for ; Sat, 2 Sep 2017 01:45:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF89428552; Sat, 2 Sep 2017 01:45:19 +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 3FF8D28542 for ; Sat, 2 Sep 2017 01:45:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752312AbdIBBpS (ORCPT ); Fri, 1 Sep 2017 21:45:18 -0400 Received: from mail-co1nam03on0052.outbound.protection.outlook.com ([104.47.40.52]:13344 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751236AbdIBBpB (ORCPT ); Fri, 1 Sep 2017 21:45:01 -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=l8oiuQj9yuM+asYCMDVeNMmWgkG5ZlzFkI+RBE3jIis=; b=JiENVNzBlX7VuoyDI18tgjxzx4gGqWOqC/xrkEXU3Q04C407/bRaEIbxDPiBotkVqYy9FGj/ozzaJBT+pz0HiwO6+PN0vDqL4d3FL1paJlDMFgF3K/kVVhS8HF/dOKJk1ZaiuLDyZAJCi8yJ8EsdUIG+sR7pJSwEuSGzkzJ8G9Q= Received: from dodo-dell.quantenna.com (12.131.200.68) by BY2PR0501MB2039.namprd05.prod.outlook.com (10.163.197.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.3; Sat, 2 Sep 2017 01:44:58 +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 Subject: [PATCH V2 3/9] qtnfmac: retrieve current channel info from EP Date: Fri, 1 Sep 2017 18:44:45 -0700 Message-Id: <20170902014451.17766-4-igor.mitsyanko.os@quantenna.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170902014451.17766-1-igor.mitsyanko.os@quantenna.com> References: <20170902014451.17766-1-igor.mitsyanko.os@quantenna.com> MIME-Version: 1.0 X-Originating-IP: [12.131.200.68] X-ClientProxiedBy: MWHPR1301CA0021.namprd13.prod.outlook.com (10.174.164.162) To BY2PR0501MB2039.namprd05.prod.outlook.com (10.163.197.26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0233e085-d37a-4b98-7f65-08d4f1a43826 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BY2PR0501MB2039; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0501MB2039; 3:mpDDAxKzGqHE4AiMQ1/s8/p1F28K9rl8+AbFRawVLZpQyRl5dRD0eqZIwQ28YSwCVHq9fVrqaduQPS1m6q74y/QokSBrZO0UVGrfpdR5aPFLt7kXEP/Ybl84sL3wGcgG7LvfrtEBx1il7utzmaylRlLTjmU8A2gy7RxNJkkIJ7Grtkjp1Phc6FG7pVhgc4oxfABQRlkK1u9SHHXqsWsHvhg/8aoM/z+Y5HcoGHcp8c6lUEqY8BRANUIGSxRbmatO; 25:rgo0ZYxcFO35yg7KGKmQBgu7GinlC6216MmToSytSW2Rhrme16ax4Y8/O07/YlUo1ZCnFUE4vAcIUiMqzC4vVn0NqCCUtoPq/ypusN0kQSwROU1xpLRrNr9dMtWU183CjksBK0p2Un2R46DDMmVeAoXGaXLGXCmm0XP1v+0pG4zywq//laCpdZAXNXPsuVaccxiQe2whZJ8DTfo5COXCnK5zWl+dM/P5us23gU0I+vl1lDpqlke1SViwypbxnPEtbVyb0xdGAwmZDnUrMKcyaCvJhGBogc/vt+zssD+CMCavV+jrLbRBvnzf+WUn9eneBEz7slfCrY+jbkbmnM+cXA==; 31:DHE+AX5y+onH+F+ee05T3IbwFcpnuT7kef1F9Ye1xDNUN1fX7mxtVLDB5CcSVl0HPLLlIRJQXd7afDDTURQ4fdRY0cvjwB/qx9KcANurdHAbBHgZ+H5g8QrD69o00l471ou/+YLFRkdQmWoTqBsdq7EyCTN2Yoe7JmdFszQF7rE9Acvim7cyAtqpx1yTCUcnw0r3Q/ZROSo5HPpE1/xc5A8yFlpkDPYAcV7wkGn1cCE= X-MS-TrafficTypeDiagnostic: BY2PR0501MB2039: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=igor.mitsyanko.os@quantenna.com; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0501MB2039; 20:84aHy6U3xACsZyWqWZLETPaZGL+0SKQhbv3++rqIim9g3dDQV9NFPUjs3aPe/vlg/c+i+S3FI83phzBGz6Wq4QlnmXDS7o1bg8VDoyPDk4vh2cnyw+/8SFwl25LRC0HJo7znX5suhCn/sWUr4a/PfZ5yD1lrjoZUdNqYdlZFi/Wd/B2LgC2DpQasZ3cUPTG4dmySWREA+im08rm+serraPdhdaZU0O3uGirobRQlDZ5E5eBO4rYYPOE1kbai52B+ZiIvlgueZZqhlCMP3DfQNyAuDNuulhJhlKNWdsd3DFJI51sxwaqCk1fuSFO7VAS+RT3ycRnFdihdBx+qzIJcwRcGIrtGFRcgJESyiJjlK/0WepHwaxjDlYS2ulrrDk4IlO8SHlFwGKOsn2jTmdlPj9nUGgNHKo3t2d5nNy1JIAJCWuTJm4MwfzdpPsKKRG608x1SWSDUWfPwuiHutbazWN/WpZUjWFyRqVP2DtV2DN5QeiH0Zx5bgp7V9SGWLjJ+rRFEzyxcKcby/4cGC6iKal3QlHrNaH7GMRwh8XBtK9iq+8vpF7HQPzVwVwi/MICRSFppKuAjmsV3erJmbKqFiNpZ/Z5BNstb6vZhTo7/Siw=; 4:InG3sCl97/1zou2CrqlAYpxYvapQX2Hzj6mnUtq0NNqgzS2u/XyYe4GdgFgkeYiBzoHL1JvgEJzPh11OrOhnNTRbppgyV2h4ZZnYvn1tMYsUkEUFM8iKtF9L64oiTmra6KKys8IecN97JvsDHlLtfbTuYHlA9Uv3C4rH5XAaRtCekQjFMvkHinjfCzJBo7DzKb2nKsMHsT1UK681vtEXMiPUDLSLPnfGEi29EQrzrd75z2XVQS3kOCXOTp4pi/Iv 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)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR0501MB2039; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR0501MB2039; X-Forefront-PRVS: 04180B6720 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39830400002)(189002)(199003)(103116003)(97736004)(50986999)(1076002)(6116002)(3846002)(76176999)(8676002)(50226002)(81166006)(85782001)(81156014)(8936002)(5003940100001)(36756003)(68736007)(2906002)(53416004)(86362001)(106356001)(478600001)(33646002)(6916009)(50466002)(2950100002)(48376002)(47776003)(2361001)(2351001)(66066001)(6666003)(4326008)(7736002)(9686003)(5660300001)(189998001)(42186005)(6486002)(53936002)(305945005)(110136004)(105586002)(69596002)(101416001)(25786009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0501MB2039; H:dodo-dell.quantenna.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: quantenna.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0501MB2039; 23:JyDe5T/bJiu06zBZTKzlBGyy562pkQBYIRBu9m9?= =?us-ascii?Q?ELszaILpTeH/um5MdbUEh+svyMpO1E/1Ovn6ciEbsr9Ttdat/67cTlgpwhFm?= =?us-ascii?Q?xy+U37SgoiOJcqezqIDXStop92BPptR3yQeucPKcQbOKHt34ApbnU0dWDL6s?= =?us-ascii?Q?J6rv5eMjfq+DrIYAScHomZ34TdBXl7BLEwP7tAITJaDAvi6+K/1Vuo6vI7th?= =?us-ascii?Q?IvgbE5LwUqBKMj+DxCrMLzC9gbKPggf1EQhTjpolS54ZLgL4p2pPS4hg1Jg/?= =?us-ascii?Q?wQyhJiNJ0HMKBlrz1dC8xrCQU/N/mbfeSzlGL2s6hT6UyOk/0+3l8WiSmaFr?= =?us-ascii?Q?ZHYv87yCz3fWwNBi908UIAqW2ioTQC466WYxb4e9DeJjtl6g6Vsy6PgVk1pr?= =?us-ascii?Q?/rXo1c91wNhNsG7sX7EsYT9LJV2lVQ/al0J+OEyZEs4DXWx3i36KtNozPP4r?= =?us-ascii?Q?OSAD7hHBElA/I6eP0/Xe/yxxSfIHD8dMsNvWmW4bk6mks+SWgerQo0u6xebt?= =?us-ascii?Q?5i61BZSY5G+pg/b/WjWaEzX/io20Pvfnyhyh1i0I2TN1AONq+pxnfKg8vhJ3?= =?us-ascii?Q?EGdi6BGhXcl4IyJ056QsTaWtTggk+OGue2A1i5yPko4NR5E3RDR0/3ERSODy?= =?us-ascii?Q?feZ2wgXWOUTDz3A9m0zHs3/+MRnEyU2VfTjYwBW0uOjvnWv8KKOcWXBS+Rut?= =?us-ascii?Q?8WMEtpxDY7Lnw0yom6QaMduKWY2U3kjqg9YNE7C/bSEVCl2VzaZWesueysek?= =?us-ascii?Q?FjS5GIevL29YUUgAdaNGEOAOLzlOI86UAUCIhaQocXgb6jjlHsJWIazA+Qcx?= =?us-ascii?Q?tEhYB6q1mESv8IwVmNbk3+ePYTv4HXwIsrQ59yuv3Oij5E+irydc+n4UQd3U?= =?us-ascii?Q?xCXoLACYDxf6Ac+Y6whV1s61bXV8Mek83bzGoOHFPu2QLiALQlHpxp1XOQZp?= =?us-ascii?Q?cG2MtCf6S8RSTjvqeVuNhrIGpTZZEtCkmYOAnQtlgWwHDSLfrsNVZ5z+qc/M?= =?us-ascii?Q?PTXzmArk0eRtjm6fIT/I7yeElIgJCO47duhFc/QbzfppsBe2wmEA0gJQ+38+?= =?us-ascii?Q?7wFw12ejWloNtPNvmAO6x4F0dT/eJEC42+mVJ/O1eGS3BAKngGEzZIars6rp?= =?us-ascii?Q?8XxFAsYeiEqFMAZKE3MCtqtWmPIWYVaSXf3yrV+AYPNivdxhsBCMmH1RO8HC?= =?us-ascii?Q?HV28TqWK0nR/iMCA=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0501MB2039; 6:BFFGzDWX5yyhz1ULJPV8Jm69kRcm9XPuvhA1JVKFBkk8F/MbebEK4orLrW/u8PxJWb3c4sa3np9jVp/MbCn8PdCp/19iVwCGuWD4DFbNHD/s75PCkaCGvoTF5FvlRewxMN9CJ4BtUE0UtAGbLGFq7B0ukhpEjXDiwwaY1F7Nj6Hnk5a9gw6SOxSQAkrdBNGfk/aEZ599MFLEjjur72hY+vhS/oouC2oR9r3B5+n/SPzYqmho+y9zLyrsBse245d3a6HiS3Y2oTmqpMQw0xBML3rEV8EeJ8MgDs7+KrNAFAVl4+zCp3pbMkpRDqZvulYoZkScs75PTe6xLDT9AXgQEA==; 5:DUeuc8aeQDfRCUqiwyUhX0IPnU0daVz8FxRwsatwSrTGVLnU9d0D+Cf5FzqCZjoZfOIQcL3LupbtV6vK8T3YhaC7c7BGoPxNLVmMNLPbHU3iS5e0srhGkCU5hEUA2wyP5YrbPQeIxVxoadcXueYk4Q==; 24:d6ukz4slZkiMs50t1GlPOl6rU2btotRYGj9JJQAA0GoOildjDKUGLtdZb7HuoHgKY2qHzd/cLO413+u5PNp69JtAcg2acEbxQKiaO0U9LTw=; 7:0TFETQTzK/uyZmKvtnRDSQJ9Z6sKSe3mm687HbXuYDxMthA1ZBUJq2fkQceCVHQjD+DM+xFqVgo3I4Npr6oXk37yZhPw38taEzkNSVWu8NiJw5A8WWVgWz3FT/sgorfVrZcwzdvp2lhORkxNVtO7gjGS7HZeNkXJoweJ1leIcSa2C7p3ZQ4cVSK6QFUCYzmxqw9MmoXxXOLQ13wO2PFtrnBMzbsNJFM1bpbXpqLARVU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2017 01:44:58.1935 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0501MB2039 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 Do not try to cache current operational channel info in driver, this is a potential source of synchronization issues + driver does not really need that info. Introduce GET_CHANNEL command and process it appropriately. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 35 +++++++++------------ drivers/net/wireless/quantenna/qtnfmac/commands.c | 38 +++++++++++++++++++++++ drivers/net/wireless/quantenna/qtnfmac/commands.h | 1 + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 11 +++++++ 4 files changed, 64 insertions(+), 21 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index 856fa6e..0ef1285 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -793,37 +793,30 @@ qtnf_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, struct qtnf_wmac *mac = wiphy_priv(wiphy); struct net_device *ndev = wdev->netdev; struct qtnf_vif *vif; + int ret; if (!ndev) return -ENODEV; vif = qtnf_netdev_get_priv(wdev->netdev); - switch (vif->wdev.iftype) { - case NL80211_IFTYPE_STATION: - if (vif->sta_state == QTNF_STA_DISCONNECTED) { - pr_warn("%s: STA disconnected\n", ndev->name); - return -ENODATA; - } - break; - case NL80211_IFTYPE_AP: - if (!(vif->bss_status & QTNF_STATE_AP_START)) { - pr_warn("%s: AP not started\n", ndev->name); - return -ENODATA; - } - break; - default: - pr_err("unsupported vif type (%d)\n", vif->wdev.iftype); - return -ENODATA; + ret = qtnf_cmd_get_channel(vif, chandef); + if (ret) { + pr_err("%s: failed to get channel: %d\n", ndev->name, ret); + goto out; } - if (!cfg80211_chandef_valid(&mac->chandef)) { - pr_err("invalid channel settings on %s\n", ndev->name); - return -ENODATA; + if (!cfg80211_chandef_valid(chandef)) { + pr_err("%s: bad chan freq1=%u freq2=%u bw=%u\n", ndev->name, + chandef->center_freq1, chandef->center_freq2, + chandef->width); + ret = -ENODATA; } - memcpy(chandef, &mac->chandef, sizeof(*chandef)); - return 0; + memcpy(&mac->chandef, chandef, sizeof(mac->chandef)); + +out: + return ret; } static int qtnf_channel_switch(struct wiphy *wiphy, struct net_device *dev, diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index 4206886..806b88b 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -2358,3 +2358,41 @@ int qtnf_cmd_send_chan_switch(struct qtnf_wmac *mac, qtnf_bus_unlock(mac->bus); return ret; } + +int qtnf_cmd_get_channel(struct qtnf_vif *vif, struct cfg80211_chan_def *chdef) +{ + struct qtnf_bus *bus = vif->mac->bus; + const struct qlink_resp_channel_get *resp; + struct sk_buff *cmd_skb; + struct sk_buff *resp_skb = NULL; + u16 res_code = QLINK_CMD_RESULT_OK; + int ret; + + cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid, + QLINK_CMD_CHAN_GET, + sizeof(struct qlink_cmd)); + if (unlikely(!cmd_skb)) + return -ENOMEM; + + qtnf_bus_lock(bus); + + ret = qtnf_cmd_send_with_reply(bus, cmd_skb, &resp_skb, &res_code, + sizeof(*resp), NULL); + + qtnf_bus_unlock(bus); + + if (unlikely(ret)) + goto out; + + if (unlikely(res_code != QLINK_CMD_RESULT_OK)) { + ret = -ENODATA; + goto out; + } + + resp = (const struct qlink_resp_channel_get *)resp_skb->data; + qlink_chandef_q2cfg(priv_to_wiphy(vif->mac), &resp->chan, chdef); + +out: + consume_skb(resp_skb); + return ret; +} diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.h b/drivers/net/wireless/quantenna/qtnfmac/commands.h index 783b203..e1bcb83 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.h +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.h @@ -75,5 +75,6 @@ int qtnf_cmd_get_chan_stats(struct qtnf_wmac *mac, u16 channel, struct qtnf_chan_stats *stats); int qtnf_cmd_send_chan_switch(struct qtnf_wmac *mac, struct cfg80211_csa_settings *params); +int qtnf_cmd_get_channel(struct qtnf_vif *vif, struct cfg80211_chan_def *chdef); #endif /* QLINK_COMMANDS_H_ */ diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h index 5936854..fb88f3e 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h @@ -169,6 +169,7 @@ enum qlink_cmd_type { QLINK_CMD_REG_NOTIFY = 0x0019, QLINK_CMD_CHANS_INFO_GET = 0x001A, QLINK_CMD_CHAN_SWITCH = 0x001B, + QLINK_CMD_CHAN_GET = 0x001C, QLINK_CMD_CONFIG_AP = 0x0020, QLINK_CMD_START_AP = 0x0021, QLINK_CMD_STOP_AP = 0x0022, @@ -694,6 +695,16 @@ struct qlink_resp_get_chan_stats { u8 info[0]; } __packed; +/** + * struct qlink_resp_channel_get - response for QLINK_CMD_CHAN_GET command + * + * @chan: definition of current operating channel. + */ +struct qlink_resp_channel_get { + struct qlink_resp rhdr; + struct qlink_chandef chan; +} __packed; + /* QLINK Events messages related definitions */