From patchwork Mon Sep 13 08:30:14 2021 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: 510326 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=ham 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 BAACEC433F5 for ; Mon, 13 Sep 2021 08:31:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7BF160F12 for ; Mon, 13 Sep 2021 08:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238087AbhIMIc3 (ORCPT ); Mon, 13 Sep 2021 04:32:29 -0400 Received: from mail-bn8nam12on2070.outbound.protection.outlook.com ([40.107.237.70]:61217 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238048AbhIMIcY (ORCPT ); Mon, 13 Sep 2021 04:32:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fSmbgsVr0AOlbXywbqbjbhOwzaoNWXa20Ku1NyM5mRRH2CL2r8r+OYDiyOquY8h7DEFAozT2HCxl3i23RFrpEV/LtagfEh0/n6ytz3Ge89MPXSay+wayryBuawFoOYLH9RteBrg7oxhw7ZFBKXWWmVQ3rDmlnuwgcnW2CGLlWtiw1Ovq7IkzplAOw+YGTKcbCPC62xrq2UiOkQjx/olHUddDSHmM9fiB8TmU3Gsw5OlSS2f2pQq3aNRoscTBiykymNnkQOtzKOP+KWT8Vb7KpbfA6PbwwpO8MpoplkxfV69jSJnH/9kID6t+atQmE9ENGAHMsC+zeIqkO1iE1N7qfA== 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; bh=3TsJ441Hxc5w6kwdECytocZuGWRAv1M22Qp1aIMK6mk=; b=dzRg2PSUSC31gMa/fJMHAru5F4S7o507LtOVzY43EeqoCBBe3l7L0x6K0W5ktHrSQ+JB3vHB+shXbKHOyWVM5dmY4HRwZnmy7rJWRaka9ozq4KPoGzyvcIUlOGqDOH86wpOX/w308cLOHvKZPhExVFRWhSXgx88dSRjaMsOQtxd1xxQzpyBypGS8JgjetbtWYH6tCdol5rnVkK0uGcLbZN8NeGemcZLr5QbIVDx86/eNGel3rwJQwujLnREAFysf3X1J0mKjpO3XhzEBE8kaLnsf0cK7UnV9WRiUz/GnIBLg185BElSpfCqUd63qE746XrgOp0Gz9z3100FyacuAUA== 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=3TsJ441Hxc5w6kwdECytocZuGWRAv1M22Qp1aIMK6mk=; b=CPmf60byl1bCyyXm4zPW8+sg5nmI3JotNpdJgMi2JgpZ8MeCxLvrOyI+YIxpEeSN5/HRknZJZBhV7m84U/JFViNu+i7uuwteo2IoDtCYkioGk2keBbR+ABmjycqOLMvjhCzJbHYsfjcsofDW1DnNP96cfVhqRgvIjzb8vFptmwU= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none; driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (52.135.97.18) by SN6PR11MB3263.namprd11.prod.outlook.com (52.135.109.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 08:31:07 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::7050:a0a:415:2ccd]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::7050:a0a:415:2ccd%7]) with mapi id 15.20.4500.017; Mon, 13 Sep 2021 08:31:07 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH v2 02/33] staging: wfx: do not send CAB while scanning Date: Mon, 13 Sep 2021 10:30:14 +0200 Message-Id: <20210913083045.1881321-3-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913083045.1881321-1-Jerome.Pouiller@silabs.com> References: <20210913083045.1881321-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PAZP264CA0067.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1fd::10) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 Received: from pc-42.silabs.com (37.71.187.125) by PAZP264CA0067.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1fd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 08:31:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8604fd4-5d78-4d75-90de-08d97690d517 X-MS-TrafficTypeDiagnostic: SN6PR11MB3263: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fuX4Tu7ugrGwpJAQvpJVwRUGk7yQJ4d2BNFA1FuC9vWSiEkdDsLubw6L3kwa+B5ZPmAHN3E7MDVfSST0AYBx6FgIHfui/n+/ocHwcCQxAg2W0BNGca1KNLRSRuBxkylLDiAumUIGB7an4U0/Y9SI+RJPAXwOBBHwTqVYSCY4MyEUPoybtjDM7NY43pPS8uXeOx2VTnmC1LcvvExfVcr6flF0jo7Yv1e56vWdUjWlpcjzdxXzN4RgTRMJ+z7NZl6rvSSxeaMOsdU6xOz5rgtfsQ+mZKyxXyLyuzI7OiRNP5UaKLfEdb99c2Pa1jWb5cYa1AXT0VK8gjYqvzU1GXUb1LcTgfZgbOTnqMSdMBaVNAVtuvbLNwLQBO7v9fi+ZKS2r8MECw24T13OZ8cdSj+YTn1GtOOpluL0kAV1z0CBkQHPVmab9tLkUsUBvoWgeQDDA3kS6cehtJqw+w0vpprjrTPmkdLOyixgfseDcH5zTqrWozln52SUrUMCukCtefUTcIO9YP4LhAG1tpdlbuMP7019DLNGy1gSNnI7amthl4qhiJN15Jq3M7o2jlb2nulNnl34ybJZCSWrh8ViJ+fwyI6tKVgvj6sc37oI8Zd4ldWNctH4bzXz2yklhtCL6hwhwDO02kVogBg2KPRYvt7fL2u88ChrpUuSvuBuPJVdfAUNQD7GExbSqRcOfnqkeVQ1V3JACXn14KkEqwxh66ijoQ== 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:(366004)(83380400001)(66574015)(107886003)(956004)(2616005)(5660300002)(54906003)(38350700002)(4326008)(6666004)(316002)(38100700002)(66946007)(26005)(66476007)(66556008)(186003)(8676002)(36756003)(8936002)(86362001)(508600001)(52116002)(7696005)(6486002)(1076003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?uVD0x0hSzx1o10oi0A0VQa8cU?= =?utf-8?q?+rQJoH2WO5E8h1ESOd+J7TzJ2gvXPPtCQiCM1eUerzt8QKYhRnwgxDV0?= =?utf-8?q?7V6g34UtPPBtsu+R2xF80rjF8RFvhNFoPpQPZbHcRdLb9VFZlLO6pfCN?= =?utf-8?q?+RhtApEDPt6+yhOwRUy6Hq54dFkzDcg/YyQ7l7lE7/2HNN10bmcgFvra?= =?utf-8?q?8LZXMR6DlwP/UnncSYG4xU0k3wA5z1fUKKMC6HQjNZStZ0WS7rlV8r6d?= =?utf-8?q?FnIDmImytdGqkch4ra2YkW9miTBGTDFaSVK/uK71vdTjYs6aeSsBTkvn?= =?utf-8?q?BW9IwXknzJHGcLvo+xhMGPjb8C8KZ/Xewrq9rKrbSjy23Qsx9yVcuXlr?= =?utf-8?q?LquR8rtHj7RFZCKkqgoXEPBion2G9MOthDz0ptYnSoX9yPReSwKUsu1p?= =?utf-8?q?O4M2+gvF8xpmMmUAgbDBqkmH12Vs26huoD4KJ76q8jbsVzXy6nqOhU7g?= =?utf-8?q?xTqLB+WNarmwr/Rc4WInc8XmHpCEZY4XEUubR42I67U8Hhh3rffGs+kF?= =?utf-8?q?rXmL3ju9I9nyd4ql4B7o9OXnZsVk5dYzrUU3El0FnXVoz438SMjrz5UG?= =?utf-8?q?ApJtcVA1c1vu5lbxYGTQaTiu+DJLPeLjEbfHGJeaI6m/pHu3igbuHVgH?= =?utf-8?q?DqRY83tnY79EOYmWYKAtIWwNQOVdumdhFpJw/aOuBPYw9grHt4rp+h/g?= =?utf-8?q?kRe8tQrUNgYhbcQQwLqIQlSkfzcx8N0aYG80MZPyiD3ei7P7zewRnBkx?= =?utf-8?q?VePJE0CGf6tej3nOW7kvsNy5DnBgBbg9Mv6eeX/b/Iobx194Qdlutf5z?= =?utf-8?q?SZ+AHT+qjwTtSRiWIC++CgVUgUf4evHTSNNstMODrIiZh8zk+Ft876D5?= =?utf-8?q?VDW7I2bTzzS9TMXmYpse5XqIoYw4rzIDaGTyPnlAeQvV6wqC9eGSzJet?= =?utf-8?q?qZt/UIqJu6dWMQ/xoONMUwPfvhLrqMQ9f4LX/VhlE/+D/ZyVWJxUNo3Z?= =?utf-8?q?4GPTeLlb6Qxepk7PpObE6cPDVEnuyThXqVAb8QgO7TEEWDKjfV1jn0sz?= =?utf-8?q?1bmTg/1p92dzLdPpKGaiIXuZX3Aijst6TphfdrPdnjdeCkRIW8oRrYX3?= =?utf-8?q?YGuevmkAi3JkJOJujuiGFwTwWTJ6nrwbuP+/azJ/icQoxM5Q8ShFOFPe?= =?utf-8?q?Mix1dxATfwQkuiEf2fCfhxZPFSWuOFxcPN/LQwDBJAkCBnyVOB4inqid?= =?utf-8?q?HcQsfrhnXXuscz5sj5I673aKF/A74aYnHAiVR5iLRwR8xh8RdhJrN8VD?= =?utf-8?q?Md8kmG5bz3cfjc5fqLLI1/tP7lTSKzbn9zCScCLOj/U3jNIH/IuyimV1?= =?utf-8?q?3OlZ7kLqyoImIqI5j5nt6E4szH4suag?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8604fd4-5d78-4d75-90de-08d97690d517 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 08:31:07.3344 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rgjFfsh/iDSFY0I6nOO1wUSG4l4Ge9YcL/INlKjzwr/PTIMWK9QMQk6LALvf53Xac0e+stspsk1C6OLgIiCecw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3263 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller During the scan requests, the Tx traffic is suspended. This lock is shared by all the network interfaces. So, a scan request on one interface will block the traffic on a second interface. This causes trouble when the queued traffic contains CAB (Content After DTIM Beacon) since this traffic cannot be delayed. It could be possible to make the lock local to each interface. But It would only push the problem further. The device won't be able to send the CAB before the end of the scan. So, this patch just ignore the DTIM indication when a scan is in progress. The firmware will send another indication on the next DTIM and this time the system will be able to send the traffic just behind the beacon. The only drawback of this solution is that the stations connected to the AP will wait for traffic after the DTIM for nothing. But since the case is really rare it is not a big deal. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index a236e5bb6914..5de9ccf02285 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -629,8 +629,19 @@ int wfx_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set) void wfx_suspend_resume_mc(struct wfx_vif *wvif, enum sta_notify_cmd notify_cmd) { + struct wfx_vif *wvif_it; + if (notify_cmd != STA_NOTIFY_AWAKE) return; + + /* Device won't be able to honor CAB if a scan is in progress on any + * interface. Prefer to skip this DTIM and wait for the next one. + */ + wvif_it = NULL; + while ((wvif_it = wvif_iterate(wvif->wdev, wvif_it)) != NULL) + if (mutex_is_locked(&wvif_it->scan_lock)) + return; + if (!wfx_tx_queues_has_cab(wvif) || wvif->after_dtim_tx_allowed) dev_warn(wvif->wdev->dev, "incorrect sequence (%d CAB in queue)", wfx_tx_queues_has_cab(wvif));