From patchwork Wed Dec 23 15:39:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 352252 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57862C433E6 for ; Wed, 23 Dec 2020 15:42:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29DB920578 for ; Wed, 23 Dec 2020 15:42:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729378AbgLWPmL (ORCPT ); Wed, 23 Dec 2020 10:42:11 -0500 Received: from mail-mw2nam12on2078.outbound.protection.outlook.com ([40.107.244.78]:27104 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729276AbgLWPmI (ORCPT ); Wed, 23 Dec 2020 10:42:08 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KGMl6HftnihIbgOcYVgNkNn1wEHCezwdauDJ5uGd2JPPaWMZUXDEjcUADbsMppf8NIvV80jm67r+jOYpdbBY2LehjnEJshN47as9Vvx16q3ejP5rnc2rYOoL6gn9RF0jqd4UZbIK/2Kgl09Jg+adlb+Fm0+QrDbZYSXMogjhNX9W1f6bEqHY3KtvO5RER9zyE68q6yTlZ+8L9ohQYcLHHDlrTiCKDaC3sM0orV4AQd+mHGRCm280O5RIqiQvmHoxVxBuWe9KzSncEEpTmwDURPpeF/cMpF5sKVS01NTKk3Y2Y/bepbc21m1bKdybyb+n0CoYW5zybRSUxy3O5PufbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CQc6ZYUK2M+3BmwXyEkzV68I/OmK35WRLPH8bgVx02s=; b=UOQnEOCU+AVv6MI9gaR2FAoVpbOyjKawkensLOl/Fy+EB754wx5l8hPs8MJfW7JeGRqZa+yq+JvBRIQAeDUkDG4STuEij14wa2s6yf9op8YJacstQ+evrLtD85QTSKqbJKx119OCMoCZc3ZPSnabLejLFGUJYY0GOZSq9v1jAi1IGzTpoAHQRCSDf1Qw6i3knNfz1qBoLwt8QxDibLPA/wy/yt8J0kTzWzAQ6NVMWjPxpWMbvxZ8+BcAXRtQS3ujSTMakbXh1ioFbdg2vtKDJSxVNndSGU4C3BqETvDc3TM64igkG3/wKNFI6ZlrxHPbVbDaz6EsfdvOcfHU+43Ipg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CQc6ZYUK2M+3BmwXyEkzV68I/OmK35WRLPH8bgVx02s=; b=CX/BdndxKstEERq7qIl7rafLmaADcs6LC8hlH3u5zZi5hFpN680w2lbLoOQwqnErXGuEL9ZDC29TWOhax0nN4jWRb5C5oSQBpD5aM+Ryt1nL/Y7V47YlXsp4kQPTft4GxcnJ95D8ftb0t/ickJ4kkDpMppo3AQG1rPdKR3bbjhg= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) by SN6PR11MB2815.namprd11.prod.outlook.com (2603:10b6:805:62::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.25; Wed, 23 Dec 2020 15:40:27 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::a989:f850:6736:97ca]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::a989:f850:6736:97ca%5]) with mapi id 15.20.3700.026; Wed, 23 Dec 2020 15:40:27 +0000 From: Jerome Pouiller To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , devicetree@vger.kernel.org, Rob Herring , linux-mmc@vger.kernel.org, =?utf-8?q?Pali_Roh=C3=A1r?= , Ulf Hansson , =?utf-8?b?SsOpcsO0bWUg?= =?utf-8?q?Pouiller?= Subject: [PATCH v4 20/24] wfx: add scan.c/scan.h Date: Wed, 23 Dec 2020 16:39:21 +0100 Message-Id: <20201223153925.73742-21-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201223153925.73742-1-Jerome.Pouiller@silabs.com> References: <20201223153925.73742-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: SA0PR12CA0024.namprd12.prod.outlook.com (2603:10b6:806:6f::29) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (82.67.86.106) by SA0PR12CA0024.namprd12.prod.outlook.com (2603:10b6:806:6f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3700.27 via Frontend Transport; Wed, 23 Dec 2020 15:40:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d4a22d4-8513-4f61-f3e6-08d8a759129f X-MS-TrafficTypeDiagnostic: SN6PR11MB2815: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ITE5UdYo5XgfXtZ1kVA8JIjtsr1O1qF4MGKKOGHQQbBhWQ7QzEc/0aYTp1ASJmfp849bQiy17DCt6PHhDon80YFqBDnEdEF9zrUVsowEQH1sOpPRrssOkXEWOqRuA5Wma7i2OZJmV03gYmBmSZlzCItSIj2yDsvFQNssX/WV4C1Wpq5buPh2Ss+9R02HxKr/GgR/NWJsG6O7xu3pHDnZMbRPnbUWG/qQbQVlndvBcdvasaIXGwyELPIedVlEmM0C48xHEOJY83MUufQJ/q9XhTa0RnKzlUmCd7MQ0EkULj/OYXAh++tnnHip2BddN92mAiRaGn7WT9I03TIfMFmoeocS/2lf3YvlG3intj6kaUgeVKrTH/aoKBxbOxOC9AV2kzOvE0U2wzg+HGcT6dJG0g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB2718.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(136003)(366004)(376002)(39850400004)(346002)(66574015)(478600001)(83380400001)(8676002)(186003)(2906002)(8936002)(26005)(52116002)(107886003)(16526019)(7696005)(66946007)(7416002)(6486002)(956004)(2616005)(54906003)(66476007)(316002)(4326008)(6666004)(36756003)(5660300002)(1076003)(86362001)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?e1uxHh1WCp5+PuFrYPPhJnBWCNF?= =?utf-8?q?KfT9gpbXRbGIANRlj8+591a5G0Ksh1Y1Jm/O0s2u6ePyeN6OBBkpZbFa?= =?utf-8?q?XrD4I6a8FX90d2x7DHad1APEjiHI3IMruY+2uuqpmvYaLiFZjD1Cjs0s?= =?utf-8?q?ESXqXAPnjrK5f5dVHDtdLKy7iuAdkGRpYqvBkOHNQcgOPpq7WC+VCi9S?= =?utf-8?q?Vvog/JXN9YLnT9+BLhMGOG49/DMbmvVpTGp0oeQu4VictXSSnrG4SrHQ?= =?utf-8?q?oG1EuD+haKY1kx4Dmng7oZZwXVhVBGHZNK/MTDRx5dqvddcgeTs+Yp9c?= =?utf-8?q?fC4z6jrHK9c3IKv3GLCD7szWrWBDOAmgCGuHsKxtrkcK8hlIf28jb9e9?= =?utf-8?q?MzmFS0lBiUCITRCFSsXDH/sDo9RMUkbPZSyOj41M9fKlg8qpF+DSKZUJ?= =?utf-8?q?W1ASIzvDpvlhoGw0SD64E4hFR0qpAPs41gamdRI6hXLWRnSe0prB2uGs?= =?utf-8?q?ukLJU/Zx/Rd+tkO+U9NUcZsYA1FeETdO4y2PphvZr9ssh3r2+roUwAWe?= =?utf-8?q?VEpE2u1OwFx9jO6gCeds8Yb6XRGjpZOmE1uh2KkFjOOUdUQFPlmqF7Xs?= =?utf-8?q?fL2xXjiFb+ucXGsW18GN3E66d1uVB13tlX+3+vMwiYwMSKP4LdTsA0M6?= =?utf-8?q?jUWGquBmwALCB5yjq1IwPzU3ndRt/dBoqiJ0FDJpzBnXsoHKq8UYzGbD?= =?utf-8?q?idgXX+VCRIheTowBtmEwcjdVxsPYmWC+WUOsqs8p3HKJQX4dlyjN5OuX?= =?utf-8?q?Rj3UAHHz+BKaFz3g+krbB8k3q3dnhUQKwece/AKrQeQAv59OOxnBpSsN?= =?utf-8?q?dtxUCqJNvF2a059TyyglJESD8r/5w2XvGvdCmSdo7KWX71hnsRDRDhlm?= =?utf-8?q?XbKPd/ATU/Xl2yM0b4xNjXNViANrNoTamou4VY/lecZb5I1lG1p9vjaT?= =?utf-8?q?cIW4QK5oT8Z3zIFmlvRhFQaVWvW2zvMPEqi7igVqy0RHgyvbzkbh0A4S?= =?utf-8?q?vYKWchKHTjXR39y6c+Wuoqgs/CLHgUJ8VQ/56dHYHtJRh?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2020 15:40:27.8146 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-Network-Message-Id: 3d4a22d4-8513-4f61-f3e6-08d8a759129f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XPAckouN2EFk3To7narz9hH+r/31EFDT534qJttOR3EM61RckLDkI1wxLAgiAlA4BxlbdZ+IOCUdf04mWg6fLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2815 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Signed-off-by: Jérôme Pouiller --- drivers/net/wireless/silabs/wfx/scan.c | 131 +++++++++++++++++++++++++ drivers/net/wireless/silabs/wfx/scan.h | 22 +++++ 2 files changed, 153 insertions(+) create mode 100644 drivers/net/wireless/silabs/wfx/scan.c create mode 100644 drivers/net/wireless/silabs/wfx/scan.h diff --git a/drivers/net/wireless/silabs/wfx/scan.c b/drivers/net/wireless/silabs/wfx/scan.c new file mode 100644 index 000000000000..3d5f13c89bac --- /dev/null +++ b/drivers/net/wireless/silabs/wfx/scan.c @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Scan related functions. + * + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. + * Copyright (c) 2010, ST-Ericsson + */ +#include + +#include "scan.h" +#include "wfx.h" +#include "sta.h" +#include "hif_tx_mib.h" + +static void __ieee80211_scan_completed_compat(struct ieee80211_hw *hw, + bool aborted) +{ + struct cfg80211_scan_info info = { + .aborted = aborted, + }; + + ieee80211_scan_completed(hw, &info); +} + +static int update_probe_tmpl(struct wfx_vif *wvif, + struct cfg80211_scan_request *req) +{ + struct sk_buff *skb; + + skb = ieee80211_probereq_get(wvif->wdev->hw, wvif->vif->addr, + NULL, 0, req->ie_len); + if (!skb) + return -ENOMEM; + + skb_put_data(skb, req->ie, req->ie_len); + hif_set_template_frame(wvif, skb, HIF_TMPLT_PRBREQ, 0); + dev_kfree_skb(skb); + return 0; +} + +static int send_scan_req(struct wfx_vif *wvif, + struct cfg80211_scan_request *req, int start_idx) +{ + int i, ret, timeout; + struct ieee80211_channel *ch_start, *ch_cur; + + for (i = start_idx; i < req->n_channels; i++) { + ch_start = req->channels[start_idx]; + ch_cur = req->channels[i]; + WARN(ch_cur->band != NL80211_BAND_2GHZ, "band not supported"); + if (ch_cur->max_power != ch_start->max_power) + break; + if ((ch_cur->flags ^ ch_start->flags) & IEEE80211_CHAN_NO_IR) + break; + } + wfx_tx_lock_flush(wvif->wdev); + wvif->scan_abort = false; + reinit_completion(&wvif->scan_complete); + ret = hif_scan(wvif, req, start_idx, i - start_idx, &timeout); + if (ret) { + wfx_tx_unlock(wvif->wdev); + return -EIO; + } + ret = wait_for_completion_timeout(&wvif->scan_complete, timeout); + if (req->channels[start_idx]->max_power != wvif->vif->bss_conf.txpower) + hif_set_output_power(wvif, wvif->vif->bss_conf.txpower); + wfx_tx_unlock(wvif->wdev); + if (!ret) { + dev_notice(wvif->wdev->dev, "scan timeout\n"); + hif_stop_scan(wvif); + return -ETIMEDOUT; + } + if (wvif->scan_abort) { + dev_notice(wvif->wdev->dev, "scan abort\n"); + return -ECONNABORTED; + } + return i - start_idx; +} + +/* It is not really necessary to run scan request asynchronously. However, + * there is a bug in "iw scan" when ieee80211_scan_completed() is called before + * wfx_hw_scan() return + */ +void wfx_hw_scan_work(struct work_struct *work) +{ + struct wfx_vif *wvif = container_of(work, struct wfx_vif, scan_work); + struct ieee80211_scan_request *hw_req = wvif->scan_req; + int chan_cur, ret; + + mutex_lock(&wvif->wdev->conf_mutex); + mutex_lock(&wvif->scan_lock); + if (wvif->join_in_progress) { + dev_info(wvif->wdev->dev, "%s: abort in-progress REQ_JOIN", + __func__); + wfx_reset(wvif); + } + update_probe_tmpl(wvif, &hw_req->req); + chan_cur = 0; + do { + ret = send_scan_req(wvif, &hw_req->req, chan_cur); + if (ret > 0) + chan_cur += ret; + } while (ret > 0 && chan_cur < hw_req->req.n_channels); + mutex_unlock(&wvif->scan_lock); + mutex_unlock(&wvif->wdev->conf_mutex); + __ieee80211_scan_completed_compat(wvif->wdev->hw, ret < 0); +} + +int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_scan_request *hw_req) +{ + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; + + WARN_ON(hw_req->req.n_channels > HIF_API_MAX_NB_CHANNELS); + wvif->scan_req = hw_req; + schedule_work(&wvif->scan_work); + return 0; +} + +void wfx_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif) +{ + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; + + wvif->scan_abort = true; + hif_stop_scan(wvif); +} + +void wfx_scan_complete(struct wfx_vif *wvif) +{ + complete(&wvif->scan_complete); +} diff --git a/drivers/net/wireless/silabs/wfx/scan.h b/drivers/net/wireless/silabs/wfx/scan.h new file mode 100644 index 000000000000..6d70717f2bf7 --- /dev/null +++ b/drivers/net/wireless/silabs/wfx/scan.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Scan related functions. + * + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. + * Copyright (c) 2010, ST-Ericsson + */ +#ifndef WFX_SCAN_H +#define WFX_SCAN_H + +#include + +struct wfx_dev; +struct wfx_vif; + +void wfx_hw_scan_work(struct work_struct *work); +int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_scan_request *req); +void wfx_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif); +void wfx_scan_complete(struct wfx_vif *wvif); + +#endif