From patchwork Thu Sep 21 21:34:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9964835 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 9C3C86056A for ; Thu, 21 Sep 2017 21:35:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C88F28DD3 for ; Thu, 21 Sep 2017 21:35:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E09A2967F; Thu, 21 Sep 2017 21:35:04 +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 D9EF428DD3 for ; Thu, 21 Sep 2017 21:35:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751850AbdIUVfD (ORCPT ); Thu, 21 Sep 2017 17:35:03 -0400 Received: from mail-bn3nam01on0045.outbound.protection.outlook.com ([104.47.33.45]:56553 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751801AbdIUVfB (ORCPT ); Thu, 21 Sep 2017 17:35: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=z7aDNQDhJe5yGb++ZSpe075feS9GFfzs5IaQOM9u+2PFAOdo0CyYrKuPfNocJ89lpUaszJ7FhQAVax5kSWVe8F+8BKV96pGroMndYeich9L21Bhi3t+JHZbw2VsHNHvk6VlgfjYbaB3pFNsQGiTyyJOPKEyOhmpBiGWNSH5srYc= Received: from dodo-dell.quantenna.com (12.131.200.68) by BLUPR0501MB2035.namprd05.prod.outlook.com (10.164.23.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.5; Thu, 21 Sep 2017 21:34:47 +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 V3 3/9] qtnfmac: retrieve current channel info from EP Date: Thu, 21 Sep 2017 14:34:31 -0700 Message-Id: <20170921213437.27457-4-igor.mitsyanko.os@quantenna.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170921213437.27457-1-igor.mitsyanko.os@quantenna.com> References: <20170921213437.27457-1-igor.mitsyanko.os@quantenna.com> MIME-Version: 1.0 X-Originating-IP: [12.131.200.68] X-ClientProxiedBy: MWHPR13CA0006.namprd13.prod.outlook.com (10.169.208.16) To BLUPR0501MB2035.namprd05.prod.outlook.com (10.164.23.17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e72ff618-d7a4-464d-079e-08d5013898d4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR0501MB2035; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 3:6H/0PyRmRnpaixF6BRuqbgvsZHz9dz/EaJG+GQ6A0dXhADzjv8vx/4mkYr+J5yaaQCoV6M8yryJc32I87P5t17IpDm3Jk40FFF1xEeUWrruj+tomvf0FE9NHvGHzJKGy5bSL0QqUiONOPx1CCdO5HvUN5BOfcmOV5ig4mIO//ncyPHKjbMaTK/FnAXmEfyC/68ySYoDtc+EMSjVs5ah04STcn6HW/8hOww/USdqHe16ddTe+2+pCZf27+weWxbZM; 25:BI43dZCPIkgu06BgN2LBe6MMup6jHsVO5Lk6UcYBSuj52pM+HFmYLKO119AJXhbpd0Ff53GBjdOfPSljl0juPZ6uAcac8qX0zbsFjxFz0WH7poUXRgUCN4dS5+jTclQ0x2e4Y7nQcLzkVWKc7E5IBvV0tFWtvrTwNJ3Ke914eh0/Wv/U4/ckVChZTrjYkHGfbAKUZblS+tj/Gg8VS5aJAvDyvv0Aru4xKmwyhTr3ryOKBne5n8V31m5gvM4/MvhfSqGOcbTlNefu7Q0k+Wuh8MaJZf/dO7a096giw3L/HvMBYZYxx4YrRk5uxbBI9G81t95qAhWCi/fyHQauqCNt4g==; 31:CUk/R3SBen4dn4qMcH/JLQEKe2KgGtIOxcRNjKDz8vKEgggnjf+rOQwFS8a6NICKzaTZPGWhQbuL0COpQ8FO8bhab/R3lIgIA29RwZoGBDZ3gUSV28R0m4GmxlZZwzxiNqDrD9TaaDBW4KmoPkE68Im979BvTmCCHJrRLgxySpWapeESQMMAJa516cl3AbA+wfiQo86Y2K6IG3mHTpmNKSxOpXMdLzAIeObjV2ifpbk= X-MS-TrafficTypeDiagnostic: BLUPR0501MB2035: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=igor.mitsyanko.os@quantenna.com; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 20:swBD812YCTUxqjcnLrccVimh59y7oofYdGIi3zU/oSHoN7rovf7fsu/UaXlG+bUyAx+caa2XtwQqVURLr2M4K/rkAUfDhSeGYhnAazPAzzYX91mluObI8S1Twv1FCaZWP7Rz+h6Gx+5wN1AMHvnlx6MjqS4KzNVVbenfFdpSDoKxsxARRETZDbs2v5lS3Awbd03qV5A1l9TwLF5/1/3nflHPC/Z1rJB9cDncQuwq3/TOB5BzuSdbziUq0W/891bUy3ruXlBIizEO2N6V3HNo++RuGQjteOlZ2r4nR8meaqzDKZ2s004T29P21IS4beDy/1ohA0t6qUQLPBeUg4YiKnh+FlN4tlWeKdDFCV9qKSvIQb+FWOdPu2KVdutAIsr+guQLyiMUns/ixA5Y7f1EjuLvZ/iI5y4Mg7lZtMQ1EFNaaKxSyQeJ/VoN9LTzIPCKmMJIrCI99FaUH80o5xny2shBHtEaEuMfd4Qb9YXz2Ll6ijKqlD4A02TiYhXjD7GS3n53xES7KA9jmZmeYpkL1YHnFozfAzb1R9iqyLtndtdbWToV5/sD8llGyGEFSkdB4wtR3lF25bUTx3sbzABNvBLO9jwyxaYYFK8nR2chgGg=; 4:e9Nm8mhFdEZZqSlh3QGuUsRj/qaTVh/gWQNsDgKq0gllByTYGWJbRVcxwpV7RiF1vQFrGzKStY1avBCmMtEk4aCm2/sG2NCZ2HEVvCcI4nUocL5JU2JZezpon+JeMFdOsl/idMN/MpQoyKRirCI14HIjtxLLudasBBd8dbD+EsnnEfiYNDQaU3aa9QWJDXJ/RTjEYBxxIP+12jZkVBN7JDvCPJfKnZZq2j0qW13LL3/mZqQ8bMZZKnTBfJv5gwSH 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)(2401047)(5005006)(8121501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0501MB2035; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0501MB2035; X-Forefront-PRVS: 04371797A5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(6009001)(376002)(346002)(39830400002)(189002)(199003)(106356001)(2906002)(105586002)(6486002)(6116002)(53416004)(48376002)(9686003)(50226002)(3846002)(1076002)(36756003)(103116003)(2361001)(76176999)(68736007)(189998001)(33646002)(66066001)(2950100002)(6916009)(478600001)(50986999)(50466002)(47776003)(25786009)(2351001)(101416001)(8676002)(86362001)(69596002)(5660300001)(81166006)(81156014)(305945005)(53936002)(16586007)(85782001)(7736002)(16526017)(6666003)(97736004)(8936002)(5003940100001)(316002)(4326008)(85772001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0501MB2035; 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; BLUPR0501MB2035; 23:5kU5pCU3eYzIb8yJEH/AmXepAR5VnMlXHWNS7pC?= =?us-ascii?Q?Xup7TMJ09eSSlRBwKhQ9Tfxqj8TlD2j4O05f9AlrctyatpKKNhLM2kjLGl+Z?= =?us-ascii?Q?OjXb4RXxUQ7wSsgUAickfzdP2XFYMY0GCS+R/X7Y1KDtTNHeLrQu30Ll4sOZ?= =?us-ascii?Q?JXrl/dUzXnWk84d+t3SPCb10HhyBsHDOzoeTwEwcXP319Fu0hzPdT9684sjh?= =?us-ascii?Q?xTuEFTBF7/SRUYDGyxDM+BnBxiRNGsrJAcdRU3wByNPbb20ZPzor/xbIpYXX?= =?us-ascii?Q?g4xhzxZIcQg5sd+UUPupx6j91VEWOAeb7cPFc/6ErhNJHtOrRSu73KR2mZDM?= =?us-ascii?Q?OKXuwo1d0F8ggamw6hP31tzck110gAmlKQxch8nhJ8gj5uzcnG6UIPKIOxqo?= =?us-ascii?Q?dsfftZYqPdiAhzswgarJMM3sRZ+b01UbAUS7CpD5hgrpodhqc99EyXhQhmk4?= =?us-ascii?Q?IWTq4JpZYMtzo8Bp1ydyrzpdMrAjW6OdbL05jEIwabeGS/sPhNGuXXTj4ln/?= =?us-ascii?Q?pFIPI6dRem6dODh63NmMrtgyCUjQV/vlVsj9ZFlCda+smkncgWIW03KQetQU?= =?us-ascii?Q?HjuXXf7+5YDnWHGDbasHm7cfD5H8HGc+kMvgp9bCKd1aLDOhAyhBrO868iTR?= =?us-ascii?Q?1Xqy5UPl1P5bdI/nVZeIDxhKs68wXggK5hXk/TmurezO5jNHhYwKGESRwK5e?= =?us-ascii?Q?9f8qnc6Ja5OmCpiRv5qeeSHe823FsZpuLAD3xIaLWybD2fmFhQDPlCqjuQ6o?= =?us-ascii?Q?WKuV6bAWsAlI7ONBmnyq+uQgd7OUUR8SzEszbt5/DnB0svmC03D4UR1KTIkJ?= =?us-ascii?Q?BG0nwRZKc/RsC/a7Ii5xx0K68U4jBUlLuMS0zLlGpXUuqcTPJ46blqlRWp0P?= =?us-ascii?Q?2ywz6iTsi3M+qlADV8ILJya4TimokgXi30N5WWKIL4YYIKyGcC+uglBXjt3H?= =?us-ascii?Q?0p7fDAVAwnNJdVyuudgyck+qbrMLSiyJ3HjfKtOIQXdvZstISFmp1H01WErX?= =?us-ascii?Q?sKAWnEkNUOAF6v+u2pFKQuQrMD+Q48221XGGPJtw3rrEuz0KoDTuu9qPt2Hz?= =?us-ascii?Q?dr3dRN0TJ3Qd5hNKj7cgpyk84QrimwNAMIvw8ADrkk7ZssTV+lt+O3mcetfG?= =?us-ascii?Q?whbcE5NtsVqzFGqTUlY75j6ZJv80PYpRQeVUwPPw5IrH2TWc5d2XPO9Dgzpd?= =?us-ascii?Q?+mmlfAHvvzE33ZXBHjQgsy1+yvbqhbouGiOb8ahsm+35DtX283FogewSBz2F?= =?us-ascii?Q?b1mzIRI6Nl7R8wYF6wyypfguXbVVKa1TkLinFwxs//BeXDULvJzxp9sLAp68?= =?us-ascii?Q?xLibxcOzqGq7VZWuBKum5Gh/QraeCqR4L97iUP6Ea1a//?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 6:uZbjymw1GeJ6hCg1fBBqo9OxfiFysaQs/WbVOhhZI89miVgWeKVPEgLDqM2PzIzxIQxH9V4fxTksq4dyEThOQXef5FF97oIRoZoHiyplmURo4oALZqYYxB3XWCxEpJVpUK8gXiT919YHaX3PXEl2K7gDWacWTPiFp1CeH5euNhN1XTEKgrK+wqvzquDWaEz7L2jpsKD5J7jv4Me2Q3i8VJ3gXZnMm3Qy6sKdyRrvRrvPg00NrfSsGPmf/tTJBzJgSjdA4nMcDkLDLjXXYYQ9unQ9mZcvwIyTpyBhH/EPDN0OOAi/doIovjubDHl6jzr3jGnJNNcExJhRbIxvDVcKcQ==; 5:fL/tkkBZTn9x6G2u6vyWll0MpvC8CYXutkYln8W6bYNrD8TCvZi8csFL18bAQZeFJitwcndRNCVxgfCnJIQQRqnjNimjgL0Y7diMEBCFSiPLlCIbWE+EUyFeVxtdojZluEufdqe24Zk3w1+cBpqr0A==; 24:Fmrp43hFCsdEgQp8FPhZ57oqWSefc8GINjGpH1+MmRWDHcHxRF2r9DqSVCIQmND0o0LzBYhjTsWbjsQ6aTizXJANyCfv0RHb5yFS7PKsVwA=; 7:JF2B3BQkhCc6YORM6sGmWP7t78dgH2CMVElvgNfWZ8EKet6irKmoteESWGXjihy82o8z9Ycw2Ib7utvBTeRy3kUAN8VJkWFahXhkgLNDYqFewL8FHAxyXo6rk0zUqHDDLuAMqfSy5P1O0WygwGkCKTdAer+BVqfhPRG12Yuxgoqp1AQItrm8i6PHp9jGntc3BGkomhgQwmdZxSL5LfeixTTyIBZfu7nt0ouD15UKdoM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2017 21:34:47.4898 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0501MB2035 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 */