From patchwork Wed Oct 7 10:19:37 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: 11820365 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 0971AC4363C for ; Wed, 7 Oct 2020 10:20:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A48BB20870 for ; Wed, 7 Oct 2020 10:20:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="PewbHmVn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728064AbgJGKUQ (ORCPT ); Wed, 7 Oct 2020 06:20:16 -0400 Received: from mail-bn8nam12on2073.outbound.protection.outlook.com ([40.107.237.73]:13506 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727527AbgJGKUK (ORCPT ); Wed, 7 Oct 2020 06:20:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SkdEBkfoFkfx1Md3wFg1dOoig328oJ5v/4oH8K+uASHoWl274Kq1cDCPn+DeIr8qFWovx02+scBebPx0BIBs1vJLnaFys9mGx95pe5vwUTtNVfUhyJu7lm8F1xmOu2nCOuckAILuWUTuFyShKZ6rnRKQXQeyR0JAVZHr9Se8jN2a1UO+vE6HGQTk3giWLuu9JUdNg++KfImEHz+zg7pH6EEU7ZzQ11PRN+8RaNqG0oFuFFGIW4At8GazFHz1926NTBfB4VyBdkmKk+JPhP4DBJBJgCinmet1VJTVdEVIdBNrqoOlP8/6bxjyg6wVy4hBLE4cb3FI/NkyMWM8afyVGQ== 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=5YJVambf0o+sPW9rei/7XbS5sUYTZmIjQNXI9rbr5kM=; b=DMDNzHYYsoPPGnC1Z1JvUgU3F20pZSOvOqoz5HdBE5mS+wYLprDPVPkB5dP9zvOcHPoK4yM3dd1HbGcwxyNRdxd3mN4qtzEWmfgMrPj7BzZXDoduRWjwcwvvLoxgucUrvGl3QT39q/Glu+K2a2gIXCEOcjXkZggMh485CyFg0lTTv9xRWbBH0PQTN0qpL2CdlqgNY+AHqyX514SnEZuflWYGaSed6yfAy4QQ1Xi4xXk4NPniCofbChiSfSY+X3nHntLVPbjmXrTcU9K7yhNMVebjwf2QYCAnNmg1w6jSr7W1EbM57vCRISXL9wRsw8zWxyX5VdXUYfKc87VD55eAKA== 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=5YJVambf0o+sPW9rei/7XbS5sUYTZmIjQNXI9rbr5kM=; b=PewbHmVnYV5/Y3xPNdCj2kn/W9m0c73kPJ37VlKfXKbSNTtU92zUkVAF4ANXkz+IIyY1kumLlkiwD9UWQ98QnSiJfhQ66O6dWLSwQH0y6XfXv9CoFRN4vnuQE6+iL09siL/WFnFcuBDm6JqZDYBxJtrdec0uKWZGeqh5PbFtVPQ= 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 (2603:10b6:805:63::18) by SA0PR11MB4670.namprd11.prod.outlook.com (2603:10b6:806:9a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Wed, 7 Oct 2020 10:20:04 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3433.044; Wed, 7 Oct 2020 10:20:04 +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 1/7] staging: wfx: fix handling of MMIC error Date: Wed, 7 Oct 2020 12:19:37 +0200 Message-Id: <20201007101943.749898-2-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> References: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Wed, 7 Oct 2020 10:20:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86fd68d7-d78f-4a36-44e6-08d86aaa8ed6 X-MS-TrafficTypeDiagnostic: SA0PR11MB4670: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ayzdFoTbbW55tlYIFvKc206LHh2zCJF0lJr1sGzoHbIJG1O2mWpvvK29jRg2uIo8Q2HrX+jWpWllo/RhaA/epfaJriLUNlPXLKjr29r8xiN9uZB/L09wWfEoqR2plEy+r/xB+ruZPWK0eAL/Sn9uUREuwcHKw4UPGWPPFjukNIKRdwHKiA4WkAeS4XO/MtM+27+MWRmBhwlJE7vwbl+0EwfDsUkbW1jabmu+EjYd/e27CNxyDQ5PbcUmGStMf0RwFnNAwR9/CW48K4jOLSfQk6/VXz2Brlj7TAycCzdG5FguQ3t/Xu0od1cD/zNbOHYFrPxYmSKTfTnFYJAnK7cDdg== 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:(39850400004)(346002)(136003)(376002)(366004)(396003)(66556008)(66476007)(6486002)(66946007)(316002)(54906003)(4326008)(478600001)(2906002)(1076003)(5660300002)(186003)(8936002)(8676002)(16526019)(52116002)(83380400001)(26005)(6506007)(66574015)(2616005)(86362001)(956004)(107886003)(8886007)(36756003)(6666004)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: WTongtvW8dCb5qKhABwfQJkU8rQsUKllyq7r+hfg6c/1isYoyvDlogCoh0wjBpkArCqE9E07pLcy/mME0W1/Uz/qyNFJI+PGcYRZvM0lwBWioURt0jwPuHc6skwL3v2mqm+wSwFI1Y8QKKuq7BWfqZvV2LVK3fI4cDNz50aPgWywwLF7gu83XJTbHyoxcdKT+cD34eh4IoiD3SN3pS8RwbeM4kAEpd6j/bqyGyZ65OoVi2Ysa6y8g09vGf3iWQD8W3Buv9KD+RQdm0GnqCo58NJwjriMJIoE0nbWtEydWrU0ABTD7od24Fcvo5wX7fAcNhEXZZieHEwn4IRhqddArwl1zf/POxVwZJjK1XIacrq+EWAe+zIqIv5B/plf58PdQRHRFQguZVjZZPe+wtNr2ZX85dpkC7+DYR86Vx3HZAqxWhgPRuHv40TvNg5Cc1R8SaSbZj1rXbP1yOpiNB2eQCyw3Nl5JtHeQEcBXhf0xMjljxL7H5OUvmXfVuSqtEZxwyuadIR7trfiVKMWw23Dc+QRKTGdEeTtWX3MY1SWCG6TDoqDWHxvhq01MgMZsuO7Ja0vNBx1n7Bv1XtVEsR8E2afv8BdvMGFsX+BdxHnproMRYTogK4OPQJsa6+WLtnvfl5sv4jbsMez+KQw28dnqg== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86fd68d7-d78f-4a36-44e6-08d86aaa8ed6 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 10:20:04.8065 (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: 1C74Y0G68pxu97llWSz4gaHaCdZmcEad/G9ccOpdmPczBk4vEngPMmHx+bdJ5W5akqngZT4n55w6Hn0USWsPZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4670 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller As expected, when the device detect a MMIC error, it returns a specific status. However, it also strip IV from the frame (don't ask me why). So, with the current code, mac80211 detects a corrupted frame and it drops it before it handle the MMIC error. The expected behavior would be to detect MMIC error then to renegotiate the EAP session. So, this patch correctly informs mac80211 that IV is not available. So, mac80211 correctly takes into account the MMIC error. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wfx/data_rx.c b/drivers/staging/wfx/data_rx.c index fe111d0aab63..86781098edc0 100644 --- a/drivers/staging/wfx/data_rx.c +++ b/drivers/staging/wfx/data_rx.c @@ -41,7 +41,7 @@ void wfx_rx_cb(struct wfx_vif *wvif, memset(hdr, 0, sizeof(*hdr)); if (arg->status == HIF_STATUS_RX_FAIL_MIC) - hdr->flag |= RX_FLAG_MMIC_ERROR; + hdr->flag |= RX_FLAG_MMIC_ERROR | RX_FLAG_IV_STRIPPED; else if (arg->status) goto drop; From patchwork Wed Oct 7 10:19:38 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: 11820361 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 B2C77C41604 for ; Wed, 7 Oct 2020 10:20:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5105520870 for ; Wed, 7 Oct 2020 10:20:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="JIjqI6/+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728029AbgJGKUV (ORCPT ); Wed, 7 Oct 2020 06:20:21 -0400 Received: from mail-bn8nam12on2066.outbound.protection.outlook.com ([40.107.237.66]:19424 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727623AbgJGKUR (ORCPT ); Wed, 7 Oct 2020 06:20:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TK3hzUFMV6SS+JA8ar4yKYOln8KnVu9TNiSTLEZqBYi7mVmjMkhv0ydGKiGnfYAsPhkJyfk0+opbh+nWW7mph2tA5ymuwBUAAy0sv8M2q69KLaOe2jiRAlHHWTl4RtSSmeGZA38B+LZ0itffdVOC5y+9SyDUQSikbW16WbRZRCfUGUGV4Btv/IJgpBgFQfMULfV5UoqVQcHVkPQao8LpymBNgYVQ6HhB5WgFv4j7dlX1ovpzNmXburoOJ3a+94Dxyqe4ypHLVZ/yh8l+rBIJI6oovubuuagUpNBuZ5AWCgM/rpTGlwXc45rAEgKDKt5tcs4mhiEypt/j0aw/fgaGeQ== 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=Rh8rU3iw4pr91IwT9End/AcLY2Vp/Cx2fpEvjXsBWfM=; b=BfbqJsgZSAxOpYvwjI6HF8Qq2x2J2OBZRKYHMhlRxHwt7CRTrNZAQSYw6BhOYWrEsB06E6M28ZnQl1ge+c6K8Gm5W1oFv9EhFDZ1MiObtfKCNzijlf9xDXGkoet2OCl0qS4nyJF8xht67XDg7+6JDBXD+L5HCO1DEXKlZh9QnsPIvuV1xLWjnvuxIpwIIBMGuZH2hGL7yf0pYXVk0616RvjJM0yHizoQC1cSIDftTzAfNDJewfkwuUPekFl+4Zh/xXzQIhIuWinyNC68FUO78BKQy/VblWk21Wx1qSJ0as6v07SAff+sFQ/2ggYlmAJu4n8QjCYPHSses5i3S1Bqhg== 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=Rh8rU3iw4pr91IwT9End/AcLY2Vp/Cx2fpEvjXsBWfM=; b=JIjqI6/+ycsNz0QnofDP4qt8M6mJEQ/LZvHHeDQ4jW8cI2A3JnkgN+gx076of8dyLcbKL6tezlCtYHvi4SdEAyLYEo321L0rAlM9000AcjH+FyD4ku1DHhi9oN+2rHJO1pGl1iyTBfDRsK1xYIwO1I0cuSPrx62MtlFKNSyKeW8= 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 (2603:10b6:805:63::18) by SA0PR11MB4670.namprd11.prod.outlook.com (2603:10b6:806:9a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Wed, 7 Oct 2020 10:20:06 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3433.044; Wed, 7 Oct 2020 10:20:06 +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 2/7] staging: wfx: remove remaining code of 'secure link' feature Date: Wed, 7 Oct 2020 12:19:38 +0200 Message-Id: <20201007101943.749898-3-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> References: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Wed, 7 Oct 2020 10:20:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f240aa9c-03dd-4d4c-4894-08d86aaa8fd1 X-MS-TrafficTypeDiagnostic: SA0PR11MB4670: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DhWTB4XO3ph8XFWRLCJhMEdCRRA/3SvxfqypFq8JmUFhsx4Y5p3aiEqI1qz/uCRa/I/ZbhTAxjOpF4L8x4oONgZrvqn/ANJHAs7uH9CEycHa0DPT7zwSiY5xkoy/t1JMi3ldK35zkSoNbSeMTiG3WezA+KusLqKzOTccC9iFI409mGHbK4MmtQbD3dTHt8uixnuVaFSUUSyE0U+EtoBaeh1BJrLkT1LjZ6buDpKutJd5IQ+IlLjB2qEG6FpEKcOaWYiSu/IwJviohyrUDTw4qTioBiEQtNZCNHSNNbcTmFXpFbEt5bUprx2zVoE0DSBWBvL1L4RcrPaoHPywplCNNQ== 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:(39850400004)(346002)(136003)(376002)(366004)(396003)(66556008)(66476007)(6486002)(66946007)(316002)(54906003)(4326008)(478600001)(2906002)(1076003)(5660300002)(186003)(8936002)(8676002)(16526019)(52116002)(83380400001)(26005)(6506007)(2616005)(86362001)(956004)(107886003)(8886007)(36756003)(6666004)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: caHlJ/MCCGmz4QR2rZEyRJq6TRzrV6lJiAotWgJop6zfqw8Gx4INGPSwkiLh7BqKychAf27BXEZBQSrUCLBibvd+xE7K/bTBpYnGFG9WRUnnS2e3tSlk3tdXrxwJF1y6g0/zrwt+teC7x6aQqeK41ywrkVrhx6AbJBJelhwl9Z2ZIyBW1or0fIkyTvAYp2goX8SPFdDFImgGhrEL2tG2mJ0ZkbV1ThJft6oRY5bVmaqE5S3ePjPrATRZNwcj7aTp9//Nitfgq7dWzrLfdIFCzNq48VLsTSTwbhkGxyG4j/Wy6jsv/6QorBk5mtHceusOe4GsMfoDHdHsNM4Ns0lr7X84E66kHeRiO2em4Jdcfgc+2ukXczxuPBYvneGVA3G77qUwJjHu+qs/F9Alxd7Quy7sbB2BHLf6PFsOlAWBCjGzMF00ni+IHBja4kPptK9tM5TKRztnqatR7iLLEhTLepLbKj0UVKNDLkPY1egc8cKmxngOesbBDfs15bZSWB/D9oAc/gWws9NhT/lIx1ayWQLbE2a4x5udEaJ+x3ogeLWIu4SBbyHaN6PRn4znF/ByY/SoTFWgl+d3a5t0+dpS1V3mVZl/wz0VjnBCiFLNiYkacaOSSEp9V7CxGwwuMHeWShmlruxg2hk3/bA2KDgLng== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: f240aa9c-03dd-4d4c-4894-08d86aaa8fd1 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 10:20:06.7224 (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: 8WuwOOFQveMC2KuX0FSbN74GGcXDZNybpWlD3QpJkJundD12/oFNc5G5AInAJ3wTc+laHz6LEWeyYeITQUbuDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4670 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Commit e8d607ce0c81 ("staging: wfx: drop 'secure link' feature") had removed the 'secure link' feature. However, a few lines of codes were yet here. Fixes: e8d607ce0c81 ("staging: wfx: drop 'secure link' feature") Signed-off-by: Jérôme Pouiller --- .../bindings/net/wireless/siliabs,wfx.txt | 2 -- drivers/staging/wfx/debug.c | 17 ----------------- 2 files changed, 19 deletions(-) diff --git a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt index 17db67559f5e..db8d06fc4baa 100644 --- a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt +++ b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt @@ -90,8 +90,6 @@ Some properties are recognized either by SPI and SDIO versions: this property, driver will disable most of power saving features. - config-file: Use an alternative file as PDS. Default is `wf200.pds`. Only necessary for development/debug purpose. - - slk_key: String representing hexadecimal value of secure link key to use. - Must contains 64 hexadecimal digits. Not supported in current version. WFx driver also supports `mac-address` and `local-mac-address` as described in Documentation/devicetree/bindings/net/ethernet.txt diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index ae44ffb66e34..4bd5f9fa21a1 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -230,21 +230,6 @@ static const struct file_operations wfx_send_pds_fops = { .write = wfx_send_pds_write, }; -static ssize_t wfx_burn_slk_key_write(struct file *file, - const char __user *user_buf, - size_t count, loff_t *ppos) -{ - struct wfx_dev *wdev = file->private_data; - - dev_info(wdev->dev, "this driver does not support secure link\n"); - return -EINVAL; -} - -static const struct file_operations wfx_burn_slk_key_fops = { - .open = simple_open, - .write = wfx_burn_slk_key_write, -}; - struct dbgfs_hif_msg { struct wfx_dev *wdev; struct completion complete; @@ -366,8 +351,6 @@ int wfx_debug_init(struct wfx_dev *wdev) debugfs_create_file("tx_power_loop", 0444, d, wdev, &wfx_tx_power_loop_fops); debugfs_create_file("send_pds", 0200, d, wdev, &wfx_send_pds_fops); - debugfs_create_file("burn_slk_key", 0200, d, wdev, - &wfx_burn_slk_key_fops); debugfs_create_file("send_hif_msg", 0600, d, wdev, &wfx_send_hif_msg_fops); debugfs_create_file("ps_timeout", 0600, d, wdev, &wfx_ps_timeout_fops); From patchwork Wed Oct 7 10:19:39 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: 11820363 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 1C2E4C4363C for ; Wed, 7 Oct 2020 10:20:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B1B6F20870 for ; Wed, 7 Oct 2020 10:20:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="KsspoNOz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728087AbgJGKUT (ORCPT ); Wed, 7 Oct 2020 06:20:19 -0400 Received: from mail-bn8nam12on2073.outbound.protection.outlook.com ([40.107.237.73]:13506 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728029AbgJGKUS (ORCPT ); Wed, 7 Oct 2020 06:20:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NtNNG95vaS1Trnf4Gy/0twCs+7n/kzy9wkIEO0IJgT7SpbhALRMFrxEwhDgzksDx8iI8vt3Xo2g4PI93OvWk1B07JKCXa9mI0A/snzdytn4q/rGuPzBm6OY9OV3+AkQY+2qkocYKsgKEwrKr67RbTLnicMdi3yBRrXYnsVKxZklwWOp+bCzJjub6zEcSohlqYiyrr2QPRMc7DEyax84V1vTRCEK+yQiro9fhMDggE9GBUxpF1/1p8aZ/U9B9NiQqhaNvlBqk4ZBuejiiIu3bzArMH6aVPm2aNBO4ST8MAnqx/CXMmQdzj76HzdZWiybCO7xiT9c9d3ZrDmAPCNaY5Q== 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=fqPnL0gi5acflRGc9mweGH3oOEzMLHjkZgZJqC9mTFo=; b=EeQ5GbkdAQjgVWW4EP6XRSir3oipH30CCuyJhV99WGQ6XAAtr1K+SNzU7j+OHtO83uc0kAuO+bEuqD6pOZmwYMEKKP0+1PuU6fBLanDm2XEVy4uI7GL+dCd/+YMQthEenDjRC6DfaHThZiOPcH/x+kaNoeRihGFfdDSuMQJuCwh+DJWSMThxV1hzWMrnpni9ZC6m413bDNephSQvw3LRb4TbbOu558FnSjkcgYzvDEyqdqY9t/b44C9DQD84/H7d3XVA0VReRCksSwUNEttdl9qwaYXnGuFS6kFOqRpbSjYZoW93QNEZ7vbkXqGnfpHOoiHp1NO2RA5BzSIMvHAyyw== 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=fqPnL0gi5acflRGc9mweGH3oOEzMLHjkZgZJqC9mTFo=; b=KsspoNOzBJf4GvZAq2T2VERLZpp8GQcSJfEY8dNgWE5IOS4r5JxAdAetkmUffJ+oxM4JINATvjHD7HArOyqK2UkyMc4Isu4xYJUCo2NIobAg+3uGpjEqr+WkNCYpTgRfCCGbgYQpnWAgklCI2APJYf8OHwVXDrBS8i6lqduTbmk= 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 (2603:10b6:805:63::18) by SA0PR11MB4670.namprd11.prod.outlook.com (2603:10b6:806:9a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Wed, 7 Oct 2020 10:20:08 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3433.044; Wed, 7 Oct 2020 10:20:08 +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 3/7] staging: wfx: fix BA sessions for older firmwares Date: Wed, 7 Oct 2020 12:19:39 +0200 Message-Id: <20201007101943.749898-4-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> References: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Wed, 7 Oct 2020 10:20:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c43c7c16-7c07-4aa7-3b97-08d86aaa90ff X-MS-TrafficTypeDiagnostic: SA0PR11MB4670: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c0yT3ytOczOF2iE5SEqBwP85SdUFnGPNKSTL6j+PzMG8q2MeXyIgW/xIRFgKjiV0s5w2qJ0bM4mIhg0PNipIHdergj6I0N3P8Wbs1EeqYuO/ObqZrOqVEEGifEBl1bCn7JtQFLdW5pYIuWN7+HCmjaE1CWYEwH18FWzrOBSNrDx63P5Rcc9QTF7qT5TywMokwFNp1Z+StD9i5yQxi4PjOQMaNbQFEY4N1UBQ10OgkMdUR5ZJYNfjIJhQhu5EFre5N6e786WUMzjSxXNUu30OhTJeQ2yTNUvf7AoOEewr2Nnr/XKAw2MSiBa1EU0dcbbj 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:(39850400004)(346002)(136003)(376002)(366004)(396003)(66556008)(66476007)(6486002)(66946007)(316002)(54906003)(4326008)(478600001)(2906002)(1076003)(5660300002)(186003)(8936002)(8676002)(16526019)(52116002)(83380400001)(26005)(6506007)(2616005)(86362001)(956004)(107886003)(8886007)(36756003)(6666004)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: d+2Fgue/VsMbnoo1i46Ujlw4Gg8KO1W1ZJAFJ4d4JpmN5b/v9IW1MVsF5y2EfPyZsg77PpN0OXDct8ZmOujfm1JWPKo3A/Wr+MBUOFcpuElr8ZxlhznaoqK1JID/sJZ1I2qlXLh+kvQhIxRCDOAYEV9mZEjOGhGNBu5JlamgNgfTjjNcEgWKSgb8o50c2MjR7LD2hMpQ5cFy5g9CbQ0LWoFg8ujCOr19RqfAYj+igwqr1IvlT+0WDnxqWZ6V1HiJ7MDMveXcz0MZcGs2ZYpGQU2Z+ELBAa9KU8OF79TjrFb2e96Bjt/5EERj2zdlAjwTmvDCtUveqdx9KEDlaVVIKg2vTfiT4Uoloc64nwEATOCpm2AJec/hxQ4FjpG2OeSTbWNS98KXic/RXTi8CfUGojn2xOsei2kJ97lvWjyWkw3i4XwY6fgTMxrG1HZklL694EFwUpW71nhPoIL37ke1oGPgi1f7i0r3oJSBM8S+uP+zS/SXmkLdUDjoVZ1zHcrwi38+c1JdLK0TLQ4l6LQqaqc5+RrVtVS2U6LJopOLT1UU/8UPw+0/Vu1s+7Nuj/PMhawRVM3xYX8yn/MMLwRoTNMsLpecssvpr2iursyO/jNIR4wn1q9canB1pMfPM4ENVxBPIyVFG2uclvJDYsePeA== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: c43c7c16-7c07-4aa7-3b97-08d86aaa90ff X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 10:20:08.4044 (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: uZ2tmvqCLU8AGuF7pzL+mYSjBzf2pNz9Nnmb9ykdHoJ8sz9HOn1oTZvOZQAmG19jtp5K753B7YKu73hqq1lutg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4670 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Firmwares with API < 3.6 do not forward DELBA requests. Thus, when a Block Ack session is restarted, the reordering buffer is not flushed and the received sequence number is not contiguous. Therefore, mac80211 starts to wait some missing frames that it will never receive. This patch disables the reordering buffer for old firmware. It is harmless when the network is unencrypted. When the network is encrypted, the non-contiguous frames will be thrown away by the TKIP/CCMP replay protection. So, the user will observe some packet loss with UDP and performance drop with TCP. Fixes: e5da5fbd7741 ("staging: wfx: fix CCMP/TKIP replay protection") Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_rx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/staging/wfx/data_rx.c b/drivers/staging/wfx/data_rx.c index 86781098edc0..3822a22b9fe3 100644 --- a/drivers/staging/wfx/data_rx.c +++ b/drivers/staging/wfx/data_rx.c @@ -17,6 +17,9 @@ static void wfx_rx_handle_ba(struct wfx_vif *wvif, struct ieee80211_mgmt *mgmt) { int params, tid; + if (wfx_api_older_than(wvif->wdev, 3, 6)) + return; + switch (mgmt->u.action.u.addba_req.action_code) { case WLAN_ACTION_ADDBA_REQ: params = le16_to_cpu(mgmt->u.action.u.addba_req.capab); From patchwork Wed Oct 7 10:19:40 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: 11820373 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 196B5C4363C for ; Wed, 7 Oct 2020 10:21:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A9FFD20782 for ; Wed, 7 Oct 2020 10:21:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="cTQXabH+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728118AbgJGKUj (ORCPT ); Wed, 7 Oct 2020 06:20:39 -0400 Received: from mail-bn8nam12on2066.outbound.protection.outlook.com ([40.107.237.66]:19424 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727527AbgJGKUU (ORCPT ); Wed, 7 Oct 2020 06:20:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fFP2rKdAfIwLyYCsScja1LCh4QiQGDFRw5H+ijKaD2LS890MfsJw8y5lbvpLIQCJ9/lwDDG/5G3qTChhSxS2AJwTCV8hByMTF5cRJCOCRrZtPZN9V/SzfUrmGLl8oAu0OB2aToOR88b2sB4cgb8OnijOUUXZaLq6LVMGcf5P8sgTjctjvXRhbt8haHtomR9w/GJdSLAt2HpwAmAZeTJkS9j2h2iYWuyKBuuFRgL7VDvFdOA1BgEIXHQ4PteJFJpkBbGwdTEC9Tuwq1pmep1vqaUUNpBNj3LiXRdSVvlvceC7o1xEfjYeBKtgwHO7VcM/GGGF8S2QnT7AGhxwiRXsAQ== 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=6o3ILcCIWqLfEBgzOO4npMJ9j0rWoU4kQ/wh+Dukeok=; b=h9hf5++hGML8GOIXEY6L2g4hLkI7U+JvYXKm2z4GOToT5asJjwCTaCxXNh/zdEuLKf15PbgDwowP8IxCdk5Y6g7MigNAVa2P4gqtiSRuLEL3Pjiqk8CMCS1fKNbF3H1HOFcBar5zvomrIDsKBLbwP1mWddagu6aqMSZRGc6VakCYIu0+QCfQgjAacHpi2dXusRvWTNCZO3nwSr88qm5oCbSKATRAMK/p/VPSKT6oT7OIe4VmdGjaVBGTfv9Et6pqIXis2z5m3OTHdkWPKewGPwnRzonhuzwVJdW1ASVwH7S8Rpsp2kvb7Syu3ex18Qt60lAAEj9KnHcbuqOSBGNtRg== 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=6o3ILcCIWqLfEBgzOO4npMJ9j0rWoU4kQ/wh+Dukeok=; b=cTQXabH+//47H9mcLmImUUzcQ2MHinxItUAyZFOb8Zw4k8mhWTFnzwoTQxeyb5Q0BkJ1IjN9v7+KhDHqDHM/tq2y7yzWOABUQy1UhzbZVaiAjrNSp7owpSgtlNgLJZ2a22WWSvW6acpO1U5ZTuHKBF6Xtw4zOkcL4xboqLMkX40= 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 (2603:10b6:805:63::18) by SA0PR11MB4670.namprd11.prod.outlook.com (2603:10b6:806:9a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Wed, 7 Oct 2020 10:20:10 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3433.044; Wed, 7 Oct 2020 10:20:10 +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 4/7] staging: wfx: fix QoS priority for slow buses Date: Wed, 7 Oct 2020 12:19:40 +0200 Message-Id: <20201007101943.749898-5-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> References: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Wed, 7 Oct 2020 10:20:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 541e8a23-ee36-4005-7ac6-08d86aaa920b X-MS-TrafficTypeDiagnostic: SA0PR11MB4670: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IfN3WIrzhrVztlpYB4BYy59gQaGBEsbEM/Obn6K3NH4CKqFbPqKgW3ooUCI90PO8PPjdGPqnwDW+iMMAs0MShQ/RmD8KVoaaUJz0RBScffiLMF6ukQT3B/Xd8rvjkHjIgbdlzz1qIMj5Eb3E7qZAEDVQ8LLp6H1BVKkIokkqAx0I0ZJU0TeDTJQAUo6nONE1a9p9vPqxSSOa2iAFa7Rh7zvhkjl3JI3qchkfvK6U/7rQkHz2ZBQvHRfy/pJGWEPep3KnUR+pjXb7wYI+Ree0wYlEOA1StYlDa7ZBikhJw3rhkAdjbzNoE3EWc2JvFaa/ 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:(39850400004)(346002)(136003)(376002)(366004)(396003)(66556008)(66476007)(6486002)(66946007)(316002)(54906003)(4326008)(478600001)(2906002)(1076003)(5660300002)(186003)(8936002)(8676002)(16526019)(52116002)(83380400001)(26005)(6506007)(66574015)(2616005)(86362001)(956004)(107886003)(8886007)(36756003)(6666004)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: VHGdQmD4bqjOXMlqXomi/u8plX5pn+ranfggQLYCNhk8mHyi7MT8B873vZA7q3+PLOAdK5e+Ru/e7BUxxzTJrvdwWNB0eYVjP8gDu/PCjxN6C+Hh26I1ZBKgTb9YmgJTZVHAC0VyFuLdVZZIGCKEinaHlNpZZrAxdwtxADG1oug2VysigSb0G9ps0iodEUAAnMMwyxLcSoILaAtWq4SWss9jTBo3gDghtElSW4qWAyL1uIcjvh/Exe3Hx5atDHn4PdPIyb/D9wHR6oUg7k7b/7LIwBXGhDnPaqUpJRjaVgabBZnNbIjSXexFUtLV9Vqt+nCe+KhLdQUECNBXHXqEDsgJTmgOrDiTOM3G+8hglVYg5pa8n5FhOHEkaI3qFb2kO2UlkJJzH9RXCoYjkfm9tDLLQhS+oHF+P5QGBcYU4Tmo5LelyVquyrJwYUV2bATyXtfPNCePiZpoPRF7K0g38gBRQnqMpH0dh+o8F3lCoNnGRjg3b4YpRcOBg9Rnq6SJdaLFeu+vPlw8DGPEskHyNjLWFb+OAYhujCKzuMVQRmMZovjenHMFE7BSWTOcA7q/yKMX1s6e+1d0De+fslk2rtZi3GBzPigS88KrzLwPMc2/118UVsjc1QZ0C3n0yUy/pE6B6HqemBa6JdOdG0GTuw== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 541e8a23-ee36-4005-7ac6-08d86aaa920b X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 10:20:10.2394 (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: 9LM2wDyWEsqmGBt00V7eRrOvn01XevOISUGRd7m0tXd1D/7N8P89G8hT+QP4JDM2PFcT3p+Q9cg4i7u55X6/bQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4670 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The device is in charge of respecting the QoS constraints. The driver have to ensure that all the queues contain data and the device choose the right queue to send. The things starts to be more difficult when the bandwidth of the bus is lower than the bandwidth of the WiFi. The device quickly sends the frames of the highest priority queue. Then, it starts to send frames from a lower priority queue. Though, there are still some high priority frames waiting in the driver. To work around this problem, this patch add some priorities to each queue. The weigh of the queue was (roughly) calculated experimentally by checking the speed ratio of each queue when the bus does not limit the traffic: - Be/Bk -> 20Mbps/10Mbps - Vi/Be -> 36Mbps/180Kbps - Vo/Be -> 35Mbps/600Kbps - Vi/Vo -> 24Mbps/12Mbps So, if we fix the weigh of the Background to 1, the weight of Best Effort should be 2. The weight of Video should be 116. However, since there is only 32 queues, it make no sense to use a value greater than 64[1]. And finally, the weight of the Voice is set to 128. [1] Because of this approximation, with very slow bus, we can still observe frame starvation when we measure the speed ratio of Vi/Be. It is around 35Mbps/1Mbps (instead of 36Mbps/180Kbps). However, it is still in accepted error range. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/queue.c | 14 ++++++++++++-- drivers/staging/wfx/queue.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index 6e3159165143..55b801a02959 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -60,11 +60,16 @@ void wfx_tx_lock_flush(struct wfx_dev *wdev) void wfx_tx_queues_init(struct wfx_vif *wvif) { + // The device is in charge to respect the details of the QoS parameters. + // The driver just ensure that it roughtly respect the priorities to + // avoid any shortage. + const int priorities[IEEE80211_NUM_ACS] = { 1, 2, 64, 128 }; int i; for (i = 0; i < IEEE80211_NUM_ACS; ++i) { skb_queue_head_init(&wvif->tx_queue[i].normal); skb_queue_head_init(&wvif->tx_queue[i].cab); + wvif->tx_queue[i].priority = priorities[i]; } } @@ -219,6 +224,11 @@ bool wfx_tx_queues_has_cab(struct wfx_vif *wvif) return false; } +static int wfx_tx_queue_get_weight(struct wfx_queue *queue) +{ + return atomic_read(&queue->pending_frames) * queue->priority; +} + static struct sk_buff *wfx_tx_queues_get_skb(struct wfx_dev *wdev) { struct wfx_queue *queues[IEEE80211_NUM_ACS * ARRAY_SIZE(wdev->vif)]; @@ -234,8 +244,8 @@ static struct sk_buff *wfx_tx_queues_get_skb(struct wfx_dev *wdev) WARN_ON(num_queues >= ARRAY_SIZE(queues)); queues[num_queues] = &wvif->tx_queue[i]; for (j = num_queues; j > 0; j--) - if (atomic_read(&queues[j]->pending_frames) < - atomic_read(&queues[j - 1]->pending_frames)) + if (wfx_tx_queue_get_weight(queues[j]) < + wfx_tx_queue_get_weight(queues[j - 1])) swap(queues[j - 1], queues[j]); num_queues++; } diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h index 22d7c936907f..2695c10d6a22 100644 --- a/drivers/staging/wfx/queue.h +++ b/drivers/staging/wfx/queue.h @@ -18,6 +18,7 @@ struct wfx_queue { struct sk_buff_head normal; struct sk_buff_head cab; // Content After (DTIM) Beacon atomic_t pending_frames; + int priority; }; void wfx_tx_lock(struct wfx_dev *wdev); From patchwork Wed Oct 7 10:19:41 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: 11820367 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 27C75C4363C for ; Wed, 7 Oct 2020 10:20:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA13720870 for ; Wed, 7 Oct 2020 10:20:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="jtBReu3R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728131AbgJGKUk (ORCPT ); Wed, 7 Oct 2020 06:20:40 -0400 Received: from mail-bn8nam12on2073.outbound.protection.outlook.com ([40.107.237.73]:13506 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728071AbgJGKUY (ORCPT ); Wed, 7 Oct 2020 06:20:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hdUwTGTACKXeRq1Tcyr9+0+mtuo2GUnI+DMHB/ca7eDY99NKZxk+Ms5TQcweIXlQgp6yGGlqN180y2Nh4WiQcC/98IhR0xTjW6km/ZdBW79q1yWwYgW4O/vhrK1uK+Rhv+FBXIzuIW8evGG/TNKzao7E5iMCpx7wrgkdfTuNhX6Q6NFH6DBeIajGe2mW2zLSOkxeoMBF7YyLk84glMH6LPz8PHoS7hVoEJZ/WeYJSLDJoINtJ4L6jMl8Fq8fgSR92JwJbxfTiTQ6JDN+IvT8Hn0uxiUMqlkALAxrkVPEZBB2K4xLm5Auxm25NWuwATm4Y6vNE/+p02d0eAUoXNButQ== 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=MxMsncgj488X/mXGl/oDLjYU83vZPcgFwvd7aQqEqOE=; b=WM6AkXeJ/84AFiirCvaC9erYa2fhIV4aHuO4VfQmcgTVXXKsngJUaBsY31iATQKcUVtiBnkcUizDwSES2XM2ZUFUleueyObRDoiV3gBUszLtv0/+JXnkVjjhtAhk4Y2RkfZShbUbBQjSmbJpTomjP7chu7aQfwPNLg9jD+T8HAr1WgAQ+NwBLQoJam0/dPQhM6NhpqiYjEBbF+l/Y1fM/B0sZYz1bwbQDcEGR6ldWD8ygc9M6feDK3Dx/GXzJMEXBfISJqovzYREYqkCn0jwxcQTZt4kZbVUjQhkDPMqmU2QIfGGQHS5/AgEOEJME6g9hQt6sbMem/h3aAumB/4hLA== 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=MxMsncgj488X/mXGl/oDLjYU83vZPcgFwvd7aQqEqOE=; b=jtBReu3RT3ZlJ+HWtLcsmRTVty+B6lJkxbVyIw/LAXh07FconWiHkJ8Iwu9isWvhMK34oCQHmsfQlvxlnNwem304ZvudPeWdA88o3hypmhe656WTn6qwkNDLjdKUF/ZQhsjEAsGXx5oqQpXO8MutGIj4t/4qAvXVF0t1VeP8mYA= 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 (2603:10b6:805:63::18) by SA0PR11MB4670.namprd11.prod.outlook.com (2603:10b6:806:9a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Wed, 7 Oct 2020 10:20:12 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3433.044; Wed, 7 Oct 2020 10:20:12 +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 5/7] staging: wfx: update copyrights dates Date: Wed, 7 Oct 2020 12:19:41 +0200 Message-Id: <20201007101943.749898-6-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> References: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Wed, 7 Oct 2020 10:20:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b45cb2d-027e-4428-b247-08d86aaa9346 X-MS-TrafficTypeDiagnostic: SA0PR11MB4670: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7R0V2CsOwJVjhqS7umug1pQV40qWqPoQA8hdjR+InPGe8tsw5O+upQVNNFEom7QAbbD3qoe2KvBDE0i386bDV1J9C3tZDIg0uYmm6Stxq7vxiViyZQ7mlLOpxAwj4o0PUWpkJKbssWGlN3eDlS+63K7el4QsFUlBcqJDVP8ACiJ29ts9N+Ign9u/dFiJIbBEj/70u0l+AlwCVVyCLanz//ZZTZHkKKzXVgmYDMpVE1dwWBc3nOZxqeT0tx6fcZnGZK/10pDjYfTuONN0dFc1/PWp/hbJ8GdVRL6MaMiZRwzWRBqrawxiQq5rFb4cR9ps 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:(39850400004)(346002)(136003)(376002)(366004)(396003)(66556008)(66476007)(6486002)(66946007)(316002)(54906003)(4326008)(478600001)(30864003)(2906002)(1076003)(5660300002)(186003)(8936002)(8676002)(16526019)(52116002)(83380400001)(26005)(6506007)(66574015)(2616005)(86362001)(956004)(107886003)(15650500001)(8886007)(36756003)(6666004)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: WdkORPVm1VsVcQa4xE+q7cdwcWUZfUTVr2e7AcAeiFi/uw8KxP+U2cYxSIyPgXNMB6VTZyGb4a97kxg0YJrHeYTP5VsgioKk7Z9rw0mdy+lzGXF8ayMmgMlpicntTy/PZRS+zr6WygSp+GF7Y90uB+XRuC9j/d47fs26yVuAvPniCIoT/WYXgzMwBeWMzxWSQp/HNzD9OrzoDJHZ/l/pEdfHWl3nGcMqJE6gojQEU1V28apdCgifgLXCAJNQPkVPfTJHjXWPw604w9HO4M31aWlgItqHpaQKu9NfHfPrqywJNfBDGZGnA4BApdpIdHLEpFixGdwNelqCgdxI4j3M3LVWqu0ZDApyJKy8BNxgYwoXgCrPYCI1eabGLakzxgk/J8wzPdUR+y2ipi/iIjv09nZ/4UXcsLXV2sAsqVb9Z7vO18eAGAFg9c1fVmcM00h+VyGqjwogtnew14FQ8wqJoS9CqbAvhgvXDiZX6cF0e1Kp2rU95qhwvCw02RxgZh5xflFPze0xz56g9Y2Jtz0GcrySGWJV+gdK1LV7sfBc3VUayw5x/SFJ0I57BfhFK9jLuboPHvt0PesqHzY+Byat0BbjgAG4OkK0AjU9tLlFEPpIxQRNPcGcBerGmUCw+D3WpfWba95RS46YaSfUtcKNLA== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b45cb2d-027e-4428-b247-08d86aaa9346 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 10:20:12.3851 (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: e69c1IxlB8ghZ1u8YawnPL0KXaEqRgyt0iqMWrq/ZFrDbgdNLdHskB6Y0Dv4xwZs+9SICy52ZZucSh2TqI3ung== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4670 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Most of the files have been modified in 2020, so update the copyright notices. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bh.c | 2 +- drivers/staging/wfx/bh.h | 2 +- drivers/staging/wfx/bus.h | 2 +- drivers/staging/wfx/bus_sdio.c | 2 +- drivers/staging/wfx/bus_spi.c | 2 +- drivers/staging/wfx/data_rx.c | 2 +- drivers/staging/wfx/data_rx.h | 2 +- drivers/staging/wfx/data_tx.c | 2 +- drivers/staging/wfx/data_tx.h | 2 +- drivers/staging/wfx/debug.c | 2 +- drivers/staging/wfx/fwio.c | 2 +- drivers/staging/wfx/hif_api_cmd.h | 2 +- drivers/staging/wfx/hif_api_general.h | 2 +- drivers/staging/wfx/hif_api_mib.h | 2 +- drivers/staging/wfx/hif_rx.c | 2 +- drivers/staging/wfx/hif_tx.c | 2 +- drivers/staging/wfx/hif_tx.h | 2 +- drivers/staging/wfx/hif_tx_mib.c | 2 +- drivers/staging/wfx/hif_tx_mib.h | 2 +- drivers/staging/wfx/hwio.c | 2 +- drivers/staging/wfx/hwio.h | 2 +- drivers/staging/wfx/key.c | 2 +- drivers/staging/wfx/key.h | 2 +- drivers/staging/wfx/main.c | 2 +- drivers/staging/wfx/main.h | 2 +- drivers/staging/wfx/queue.c | 2 +- drivers/staging/wfx/queue.h | 2 +- drivers/staging/wfx/scan.c | 2 +- drivers/staging/wfx/scan.h | 2 +- drivers/staging/wfx/sta.c | 2 +- drivers/staging/wfx/sta.h | 2 +- drivers/staging/wfx/traces.h | 2 +- drivers/staging/wfx/wfx.h | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c index 72da2f4af49f..586b769c0446 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/staging/wfx/bh.c @@ -2,7 +2,7 @@ /* * Interrupt bottom half (BH). * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/bh.h b/drivers/staging/wfx/bh.h index 4b73437869e1..78c49329e22a 100644 --- a/drivers/staging/wfx/bh.h +++ b/drivers/staging/wfx/bh.h @@ -2,7 +2,7 @@ /* * Interrupt bottom half. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_BH_H diff --git a/drivers/staging/wfx/bus.h b/drivers/staging/wfx/bus.h index 0370b6c59863..ca04b3da6204 100644 --- a/drivers/staging/wfx/bus.h +++ b/drivers/staging/wfx/bus.h @@ -2,7 +2,7 @@ /* * Common bus abstraction layer. * - * Copyright (c) 2017-2018, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_BUS_H diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c index 496bfc8bbacc..e06d7e1ebe9c 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/staging/wfx/bus_sdio.c @@ -2,7 +2,7 @@ /* * SDIO interface. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c index d19c0478e8be..a99125d1a30d 100644 --- a/drivers/staging/wfx/bus_spi.c +++ b/drivers/staging/wfx/bus_spi.c @@ -2,7 +2,7 @@ /* * SPI interface. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2011, Sagrad Inc. * Copyright (c) 2010, ST-Ericsson */ diff --git a/drivers/staging/wfx/data_rx.c b/drivers/staging/wfx/data_rx.c index 3822a22b9fe3..385f2d42a0e2 100644 --- a/drivers/staging/wfx/data_rx.c +++ b/drivers/staging/wfx/data_rx.c @@ -2,7 +2,7 @@ /* * Datapath implementation. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/data_rx.h b/drivers/staging/wfx/data_rx.h index 125dbfc1f875..4c0da37f2084 100644 --- a/drivers/staging/wfx/data_rx.h +++ b/drivers/staging/wfx/data_rx.h @@ -2,7 +2,7 @@ /* * Datapath implementation. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_DATA_RX_H diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index e2fb770e98fc..b4d5dd3d2d23 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -2,7 +2,7 @@ /* * Datapath implementation. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h index 87e1b9b62dbb..46c9fff7a870 100644 --- a/drivers/staging/wfx/data_tx.h +++ b/drivers/staging/wfx/data_tx.h @@ -2,7 +2,7 @@ /* * Datapath implementation. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_DATA_TX_H diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index 4bd5f9fa21a1..eedada78c25f 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -2,7 +2,7 @@ /* * Debugfs interface. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/fwio.c b/drivers/staging/wfx/fwio.c index c99adb0c99f1..1b8aec02d169 100644 --- a/drivers/staging/wfx/fwio.c +++ b/drivers/staging/wfx/fwio.c @@ -2,7 +2,7 @@ /* * Firmware loading. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h index bdd468800189..11bc1a58edae 100644 --- a/drivers/staging/wfx/hif_api_cmd.h +++ b/drivers/staging/wfx/hif_api_cmd.h @@ -2,7 +2,7 @@ /* * WFx hardware interface definitions * - * Copyright (c) 2018-2019, Silicon Laboratories Inc. + * Copyright (c) 2018-2020, Silicon Laboratories Inc. */ #ifndef WFX_HIF_API_CMD_H diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/staging/wfx/hif_api_general.h index 9d522bc1aa69..24188945718d 100644 --- a/drivers/staging/wfx/hif_api_general.h +++ b/drivers/staging/wfx/hif_api_general.h @@ -2,7 +2,7 @@ /* * WFx hardware interface definitions * - * Copyright (c) 2018-2019, Silicon Laboratories Inc. + * Copyright (c) 2018-2020, Silicon Laboratories Inc. */ #ifndef WFX_HIF_API_GENERAL_H diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h index 55bd399ccdfb..ace924720ce6 100644 --- a/drivers/staging/wfx/hif_api_mib.h +++ b/drivers/staging/wfx/hif_api_mib.h @@ -2,7 +2,7 @@ /* * WFx hardware interface definitions * - * Copyright (c) 2018-2019, Silicon Laboratories Inc. + * Copyright (c) 2018-2020, Silicon Laboratories Inc. */ #ifndef WFX_HIF_API_MIB_H diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index b40af86356f1..d6dfab094b03 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -3,7 +3,7 @@ * Implementation of chip-to-host event (aka indications) of WFxxx Split Mac * (WSM) API. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 1bd7f773209c..e61cc2486761 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -3,7 +3,7 @@ * Implementation of host-to-chip commands (aka request/confirmation) of WFxxx * Split Mac (WSM) API. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/staging/wfx/hif_tx.h index 960d5f2fa41c..3521c545ae6b 100644 --- a/drivers/staging/wfx/hif_tx.h +++ b/drivers/staging/wfx/hif_tx.h @@ -3,7 +3,7 @@ * Implementation of host-to-chip commands (aka request/confirmation) of WFxxx * Split Mac (WSM) API. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson * Copyright (C) 2010, ST-Ericsson SA */ diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c index c375b9052a07..1926cf1b62be 100644 --- a/drivers/staging/wfx/hif_tx_mib.c +++ b/drivers/staging/wfx/hif_tx_mib.c @@ -2,7 +2,7 @@ /* * Implementation of host-to-chip MIBs of WFxxx Split Mac (WSM) API. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson * Copyright (C) 2010, ST-Ericsson SA */ diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h index 6c25015173cd..812b3ba0f00e 100644 --- a/drivers/staging/wfx/hif_tx_mib.h +++ b/drivers/staging/wfx/hif_tx_mib.h @@ -2,7 +2,7 @@ /* * Implementation of host-to-chip MIBs of WFxxx Split Mac (WSM) API. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson * Copyright (C) 2010, ST-Ericsson SA */ diff --git a/drivers/staging/wfx/hwio.c b/drivers/staging/wfx/hwio.c index 777217cdf9a7..36fbc5b5d64c 100644 --- a/drivers/staging/wfx/hwio.c +++ b/drivers/staging/wfx/hwio.c @@ -2,7 +2,7 @@ /* * Low-level I/O functions. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/hwio.h b/drivers/staging/wfx/hwio.h index 4b6ef061b40b..0b8e4f7157df 100644 --- a/drivers/staging/wfx/hwio.h +++ b/drivers/staging/wfx/hwio.h @@ -2,7 +2,7 @@ /* * Low-level API. * - * Copyright (c) 2017-2018, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_HWIO_H diff --git a/drivers/staging/wfx/key.c b/drivers/staging/wfx/key.c index 728e5f8d3b7c..2ab82bed4c1b 100644 --- a/drivers/staging/wfx/key.c +++ b/drivers/staging/wfx/key.c @@ -2,7 +2,7 @@ /* * Key management related functions. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/key.h b/drivers/staging/wfx/key.h index ff31fc9c565a..70a44d0ca35e 100644 --- a/drivers/staging/wfx/key.h +++ b/drivers/staging/wfx/key.h @@ -2,7 +2,7 @@ /* * Implementation of mac80211 API. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_KEY_H diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index 2a9098bad1f5..df11c091e094 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -2,7 +2,7 @@ /* * Device probe and register. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson * Copyright (c) 2008, Johannes Berg * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). diff --git a/drivers/staging/wfx/main.h b/drivers/staging/wfx/main.h index 2457cb595b0f..a0db322383a3 100644 --- a/drivers/staging/wfx/main.h +++ b/drivers/staging/wfx/main.h @@ -2,7 +2,7 @@ /* * Device probe and register. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson * Copyright (c) 2006, Michael Wu * Copyright 2004-2006 Jean-Baptiste Note , et al. diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index 55b801a02959..31c37f69c295 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -2,7 +2,7 @@ /* * O(1) TX queue with built-in allocator. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h index 2695c10d6a22..80ba19455ef3 100644 --- a/drivers/staging/wfx/queue.h +++ b/drivers/staging/wfx/queue.h @@ -2,7 +2,7 @@ /* * O(1) TX queue with built-in allocator. * - * Copyright (c) 2017-2018, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_QUEUE_H diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index 02d4e653d594..fb47c7cddf2f 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -2,7 +2,7 @@ /* * Scan related functions. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/scan.h b/drivers/staging/wfx/scan.h index 2eb786c9572c..c7496a766478 100644 --- a/drivers/staging/wfx/scan.h +++ b/drivers/staging/wfx/scan.h @@ -2,7 +2,7 @@ /* * Scan related functions. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_SCAN_H diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 0d27ca27e48c..a246f0d1d6e9 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -2,7 +2,7 @@ /* * Implementation of mac80211 API. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #include diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index 610cfb0fcd02..d7b5df5ea4e6 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -2,7 +2,7 @@ /* * Implementation of mac80211 API. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson */ #ifndef WFX_STA_H diff --git a/drivers/staging/wfx/traces.h b/drivers/staging/wfx/traces.h index d376db2f1891..e34c7a538c65 100644 --- a/drivers/staging/wfx/traces.h +++ b/drivers/staging/wfx/traces.h @@ -2,7 +2,7 @@ /* * Tracepoints definitions. * - * Copyright (c) 2018-2019, Silicon Laboratories, Inc. + * Copyright (c) 2018-2020, Silicon Laboratories, Inc. */ #undef TRACE_SYSTEM diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 56fbfab05651..94898680ccde 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -2,7 +2,7 @@ /* * Common private data for Silicon Labs WFx chips. * - * Copyright (c) 2017-2019, Silicon Laboratories, Inc. + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. * Copyright (c) 2010, ST-Ericsson * Copyright (c) 2006, Michael Wu * Copyright 2004-2006 Jean-Baptiste Note , et al. From patchwork Wed Oct 7 10:19:42 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: 11820371 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 A9351C4727E for ; Wed, 7 Oct 2020 10:21:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 499A320782 for ; Wed, 7 Oct 2020 10:21:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="MBUpT2Jq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728160AbgJGKUx (ORCPT ); Wed, 7 Oct 2020 06:20:53 -0400 Received: from mail-bn8nam12on2066.outbound.protection.outlook.com ([40.107.237.66]:19424 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728045AbgJGKUm (ORCPT ); Wed, 7 Oct 2020 06:20:42 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a4QYaIxgJ6swNs/R17nKh4kTfXET9cwoXJRSjwfQ64r3LQz0Pd3jrO7o5VUgXHS8W/QZGRLdEHtg2oDRR2ghVfV/9x/ZzAfad4TnblISzL2cs7PVlOaNEuRl8+IrnNWlFKMd/FMJONk2sHk8evVRKjHbnrUgRUOvV1kYqmuAGGIZbha69IEHwyrJZ3kCIFje+4G62tP12L760yJSDUi10uBGWtm6UlFN2VHnZYulQmBvoLG1sGFBs+JZO0b0rXtQBNr5Go/nzG8lxtsoRjLGwzqStw1oVMLZV6RK+9hec6ClCPV2HT1/anKyqaJWx5lsTsWh7hYq/6QmajkBqTiubw== 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=YshTyCVlBSg6TtTEsaosnE6qGyRXW/hXTsignDLHlCU=; b=niQolFoUEKr6mmF3q8rg1d+2qFyfi9IWiqVeFbXLk8v1jmvN72oacxbAWJQLE1mqEzZ/lGQdw3M9ra/9BPQwPfEZYwkocF6BaxgvkXP/gxg/izN0Gau4EP41TqNErBzFwrCEmVy4Uc8ghtQn1giLCLZv8dpqC28f6hvpckMefJYYok1zmrclXU2wpjcs8SL8JOFfsLNEHXnT9mwnGA1CokDQHaAhkwVQWr0Sm3Y4ZGagIJc1OMr+E937MMfgHF1Bqd6j0mZkIsEDlIuSPqxGeeF5v0eve29cLndJv0bt5gAK7HXs0/VHsqx3iATA03OODeyfYx4iDMi+Jg38gO/F+Q== 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=YshTyCVlBSg6TtTEsaosnE6qGyRXW/hXTsignDLHlCU=; b=MBUpT2JqjISYbtbR4z1LtJC3g+IYJk5gl27SR9iggQ3rTn022bAfn1wvcIF0ighE6iqVGdI9Tqp16IrN56HO19XWhpnmh5EJmT0cvWRwMAljnwExayBLhCWPN5ve6+6LFTYRr1QHZaWtgrD6nsH4M+8SQ87fAiS8kmFwxrT2F68= 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 (2603:10b6:805:63::18) by SA0PR11MB4670.namprd11.prod.outlook.com (2603:10b6:806:9a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Wed, 7 Oct 2020 10:20:14 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3433.044; Wed, 7 Oct 2020 10:20:14 +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 6/7] dt-bindings: staging: wfx: silabs,wfx yaml conversion Date: Wed, 7 Oct 2020 12:19:42 +0200 Message-Id: <20201007101943.749898-7-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> References: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Wed, 7 Oct 2020 10:20:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f5ea77c-ae14-4f7d-c5f1-08d86aaa9454 X-MS-TrafficTypeDiagnostic: SA0PR11MB4670: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eQyR7Se3WNQfSO1gdE4OXMEpGosB0UB7BRYqWzZ5FamY/6xLTr0ZLWTCY6DaS9xrXLiZMckLPPNS7tdRkXKs+0D2qaLwXpi/OBKjaFnJWVEPxs/k9TlnxdCv+CF88VozLi1XUylj+8t+pv7ylYvvjtkboAqieM0O4z4sJvJwz5E7zauEcYFbIufEjSTU3CS5Nzelxg/utH7lw5/XxDdXjiGOBGfsp+K8BHmuwamLyZApoEJYfZojFrjhJMij5c1kHbgDVpkb1v5heohZ0VaVACysc0QLC17fZKEHfZXUZ0QG1LBRA4smF2KV1mkBL4O9awQ7S9zZWaEcO2IljqqDegImckwhO+Api8uY1Mn6rwf7/vkN82/uJrMMnVRCyz0bW0UagAfY9MI0YQ5UayBLcQ== 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:(39850400004)(346002)(136003)(376002)(366004)(396003)(66556008)(66476007)(6486002)(66946007)(966005)(316002)(54906003)(4326008)(478600001)(2906002)(1076003)(5660300002)(186003)(8936002)(8676002)(16526019)(52116002)(83380400001)(26005)(6506007)(66574015)(2616005)(86362001)(956004)(83080400001)(107886003)(8886007)(36756003)(6666004)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: RX0FrWJytR/5fWqldBQPinH3d9X5/vZEryGLMGOsYJzBwowdYxlyO7GfJ6VlKt/E/o24SFoas8SaC/Al0JIrcxv93fvheD8haVtK2GMdNXo0+DT8KHvdy59lYfOEQcx41wwj+leGslOyjeMbI3pMvT6/gCGo6MqsFQvWEy4p7sPu8erE36o+isl/F6K5CLyd9kDLAojTvt5iCbI+wzPKIk0e1Cnnt4nnEGn9QK/a8AQZPRkfAgMPp9KQTZiNO7sWzccO0aPFVsscAnHcnfKFSQEtdeGS+kMdSO+CUuKQTEU67mQMp8OguY8nEI9rcaY2353dohKJFJV1DjVOLthA9heit0406FDZe5GPlqdStQIeZiycpTWzqCUGdGZTFz3T+S+K9WOaGx0muE+cv+NOYPy00/wjvy4er6jWqPbeBNcpeVmmUQvyskXF1kWGeKOD8wYNl9vlkW+vd5r7bd6Fogtrr1Q5WaVnDO4zlQmnwVL7AlDqSdfETHasc03sAxSFD0D7xq+Ii9kFbnc7VU/OTWvSdWRGTgBFbtZki/AwHN+C2zZ+gPPegGHQgf8th/7FP06pZy7eZRSjJ3IcoxlQFMmw1CgehplS9IP6GKoVwT8+W/U2Qcrlm9gEI9+UpgBZ0XwYN6vB3IJTIRokT9XiRg== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f5ea77c-ae14-4f7d-c5f1-08d86aaa9454 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 10:20:14.0192 (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: u6702Q+lI4pVzTksHIs/DjSvbrkRDyQQjRkrL7uIfDYHejcRNTOQWo4Pt9QR8EESMbSQapLI748itwOfTfMN6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4670 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The device can be connected on SPI or on SDIO. The original file described the two options separately. So, most of the file had to be rewritten in order to match with the Yaml requirements. Some device requirements are still written in the comments since they cannot been expressed with the current scheme (e.g. reg must be set to 1 with SDIO, interrupt is mandatory with SPI, reset-gpio in SPI is replaced by mmc-pwrseq in SDIO, etc...). The examples provided have also been reworked in order to make dt_binding_check happy. Finally, also fix typo in the name of the file (siliabs instead of silabs) Signed-off-by: Jérôme Pouiller --- .../bindings/net/wireless/silabs,wfx.yaml | 125 ++++++++++++++++++ .../bindings/net/wireless/siliabs,wfx.txt | 96 -------------- 2 files changed, 125 insertions(+), 96 deletions(-) create mode 100644 drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml delete mode 100644 drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt diff --git a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml new file mode 100644 index 000000000000..43b5630c0407 --- /dev/null +++ b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml @@ -0,0 +1,125 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (c) 2020, Silicon Laboratories, Inc. +%YAML 1.2 +--- + +$id: http://devicetree.org/schemas/net/wireless/silabs,wfx.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Silicon Labs WFxxx devicetree bindings + +maintainers: + - Jérôme Pouiller + +description: + The WFxxx chip series can be connected via SPI or via SDIO. + + For SDIO':' + + The driver is able to detect a WFxxx chip on SDIO bus by matching its Vendor + ID and Product ID. However, driver will only provide limited features in + this case. Thus declaring WFxxx chip in device tree is recommended (and may + become mandatory in the future). + + In addition, it is recommended to declare a mmc-pwrseq on SDIO host above + WFx. Without it, you may encounter issues with warm boot. The mmc-pwrseq + should be compatible with mmc-pwrseq-simple. Please consult + Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt for more + information. + + For SPI':' + + In add of the properties below, please consult + Documentation/devicetree/bindings/spi/spi-controller.yaml for optional SPI + related properties. + + Note that in add of the properties below, the WFx driver also supports + `mac-address` and `local-mac-address` as described in + Documentation/devicetree/bindings/net/ethernet.txt + +properties: + compatible: + const: silabs,wf200 + reg: + description: + When used on SDIO bus, must be set to 1. When used on SPI bus, it is + the chip select address of the device as defined in the SPI devices + bindings. + maxItems: 1 + spi-max-frequency: + description: (SPI only) Maximum SPI clocking speed of device in Hz. + maxItems: 1 + interrupts: + description: The interrupt line. Triggers IRQ_TYPE_LEVEL_HIGH and + IRQ_TYPE_EDGE_RISING are both supported by the chip and the driver. When + SPI is used, this property is required. When SDIO is used, the "in-band" + interrupt provided by the SDIO bus is used unless an interrupt is defined + in the Device Tree. + maxItems: 1 + reset-gpios: + description: (SPI only) Phandle of gpio that will be used to reset chip + during probe. Without this property, you may encounter issues with warm + boot. (For legacy purpose, the gpio in inverted when compatible == + "silabs,wfx-spi") + + For SDIO, the reset gpio should declared using a mmc-pwrseq. + maxItems: 1 + wakeup-gpios: + description: Phandle of gpio that will be used to wake-up chip. Without this + property, driver will disable most of power saving features. + maxItems: 1 + config-file: + description: Use an alternative file as PDS. Default is `wf200.pds`. Only + necessary for development/debug purpose. + maxItems: 1 + +required: + - compatible + - reg + +examples: + - | + #include + #include + + spi0 { + #address-cells = <1>; + #size-cells = <0>; + + wfx@0 { + compatible = "silabs,wf200"; + pinctrl-names = "default"; + pinctrl-0 = <&wfx_irq &wfx_gpios>; + reg = <0>; + interrupts-extended = <&gpio 16 IRQ_TYPE_EDGE_RISING>; + wakeup-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + spi-max-frequency = <42000000>; + }; + }; + + - | + #include + #include + + wfx_pwrseq: wfx_pwrseq { + compatible = "mmc-pwrseq-simple"; + pinctrl-names = "default"; + pinctrl-0 = <&wfx_reset>; + reset-gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + mmc0 { + mmc-pwrseq = <&wfx_pwrseq>; + #address-cells = <1>; + #size-cells = <0>; + + mmc@1 { + compatible = "silabs,wf200"; + pinctrl-names = "default"; + pinctrl-0 = <&wfx_wakeup>; + reg = <1>; + wakeup-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; + }; + }; +... diff --git a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt deleted file mode 100644 index db8d06fc4baa..000000000000 --- a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt +++ /dev/null @@ -1,96 +0,0 @@ -The WFxxx chip series can be connected via SPI or via SDIO. - -SPI ---- - -You have to declare the WFxxx chip in your device tree. - -Required properties: - - compatible: Should be "silabs,wf200" - - reg: Chip select address of device - - spi-max-frequency: Maximum SPI clocking speed of device in Hz - - interrupts-extended: Should contain interrupt line (interrupt-parent + - interrupt can also been used). Trigger should be `IRQ_TYPE_EDGE_RISING`. - -Optional properties: - - reset-gpios: phandle of gpio that will be used to reset chip during probe. - Without this property, you may encounter issues with warm boot. - (Legacy: when compatible == "silabs,wfx-spi", the gpio is inverted.) - -Please consult Documentation/devicetree/bindings/spi/spi-bus.txt for optional -SPI connection related properties, - -Example: - -&spi1 { - wfx { - compatible = "silabs,wf200"; - pinctrl-names = "default"; - pinctrl-0 = <&wfx_irq &wfx_gpios>; - interrupts-extended = <&gpio 16 IRQ_TYPE_EDGE_RISING>; - wakeup-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - reg = <0>; - spi-max-frequency = <42000000>; - }; -}; - - -SDIO ----- - -The driver is able to detect a WFxxx chip on SDIO bus by matching its Vendor ID -and Product ID. However, driver will only provide limited features in this -case. Thus declaring WFxxx chip in device tree is strongly recommended (and may -become mandatory in the future). - -Required properties: - - compatible: Should be "silabs,wf200" - - reg: Should be 1 - -In addition, it is recommended to declare a mmc-pwrseq on SDIO host above WFx. -Without it, you may encounter issues with warm boot. mmc-pwrseq should be -compatible with mmc-pwrseq-simple. Please consult -Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt for more -information. - -Example: - -/ { - wfx_pwrseq: wfx_pwrseq { - compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; - pinctrl-0 = <&wfx_reset>; - reset-gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; -}; - -&mmc1 { - mmc-pwrseq = <&wfx_pwrseq>; - #address-size = <1>; - #size = <0>; - - mmc@1 { - compatible = "silabs,wf200"; - reg = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&wfx_wakeup>; - wakeup-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; - }; -}; - -Note that #address-size and #size shoud already be defined in node mmc1, but it -is rarely the case. - -Common properties ------------------ - -Some properties are recognized either by SPI and SDIO versions: - - wakeup-gpios: phandle of gpio that will be used to wake-up chip. Without - this property, driver will disable most of power saving features. - - config-file: Use an alternative file as PDS. Default is `wf200.pds`. Only - necessary for development/debug purpose. - -WFx driver also supports `mac-address` and `local-mac-address` as described in -Documentation/devicetree/bindings/net/ethernet.txt - From patchwork Wed Oct 7 10:19:43 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: 11820369 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,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 D5CAEC4363D for ; Wed, 7 Oct 2020 10:20:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5769220870 for ; Wed, 7 Oct 2020 10:20:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="LHxYhKLj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728174AbgJGKUy (ORCPT ); Wed, 7 Oct 2020 06:20:54 -0400 Received: from mail-bn8nam12on2073.outbound.protection.outlook.com ([40.107.237.73]:13506 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728111AbgJGKUn (ORCPT ); Wed, 7 Oct 2020 06:20:43 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jrXHZd7sdlfR6jo5enihrV9LE5LmlsKHV7xk/fWhfW42kEEC4C8BYNY6msRsTADzcAtNVKlfaeUVl+zvKwEw537wHot93K6n622fVUc7eF/5J9qLw+rGNGjok8pLyVyQSbMPxYSxLK46OhZJ6hxo/znNjiQCVwboIVxkwVjcOTi4eyEuQV6dQE+Ijx1HK3BYqar3GuzaXa/CbURFk7WL1apDYi+R8OdUtAHRJBVM7YaDPtuacaz0G2Bb7kBxkfTweL/Bd7NnZWe5D4aR+CqSHa8RQ0evUXGgRt3P3ANwtQtXwKDqU3ZY1tTq6/hZ3L+yY2CQ7VT6dCXIEcL9DCoSBA== 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=Sy5jYT/0IhuYuSa2Nvf4qfQV+lWo6NGHGvT6YcIJ7Wk=; b=drH/5eyEEJqKQJsnftRtQQb7zGZsxuA3jdoBAULslMvtAa0XeSPROZyPFNL7lOyTgOgjIKqSBlPRHMqjZBleRXq22CqiUQ2NrmoaKpD5+wCNVLDVS/CrA9IMNhx4lRchzwVAydVPNChlB6CtfiLArJWStMXt9H+dVX5C5bf+fjl1mR9zc8v2FsQySLrSRXEORuQ1IhkwPFjHJgGAEiMz3hZGDO51/hK+7WeTmkL4qKScq7ev2Bg7rDK7dm/e1wjspgIn0msJug02TK//0yKBDvfxDhz62dguSp0HQBSKa1FnoTtrySIjaPCIO7rSnGZNA8CTg9clSWd22jlVmnB0eg== 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=Sy5jYT/0IhuYuSa2Nvf4qfQV+lWo6NGHGvT6YcIJ7Wk=; b=LHxYhKLj+fNILGedveeUGhYdujhFW3pD3DergE43vrNP3GJfoMvQ1Q4V9Q2tPrpkMluBJt7bvj1hE5cQucWx/7j4yteqRmhEzRd1UpJBaLKvcbY8Faxg2FV2quPNTtTPitHg91Ao30KwT5/jv/Eg27LRXFQwi7tNyXHjY4foNcw= 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 (2603:10b6:805:63::18) by SA0PR11MB4670.namprd11.prod.outlook.com (2603:10b6:806:9a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Wed, 7 Oct 2020 10:20:16 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3433.044; Wed, 7 Oct 2020 10:20:15 +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 7/7] wfx: move out from the staging area Date: Wed, 7 Oct 2020 12:19:43 +0200 Message-Id: <20201007101943.749898-8-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> References: <20201007101943.749898-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR0P264CA0111.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Wed, 7 Oct 2020 10:20:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 12daf8fd-6efd-4775-2c24-08d86aaa9561 X-MS-TrafficTypeDiagnostic: SA0PR11MB4670: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qbZpm2nGneFt7JzSlsuB+hyBqlGSUBU0Ovcduh9+2VNTrOgQ3l4BUmn31HnULzVdR1MgPRgrkwULJIZGAZJKAAE8kk8QPgRdO3t7DBhEZTfCkFEtcnTz0JzoDb5IrEWXm5RJ7gZscPCuMhOTB9s7nbL6ofACYHeKDsSmYOo3B9NbM2TrPrsVY0MR3NcjRMY9gDwkruLwCMYsYKnKR6U4ANNx34frWmLNkvzDsnkgttgKcHQT03sYXUckZ1ojFsD2+vq5flGv/5EcWYE9Aqox5FgpPmnaKrfeavmNr7h5X1Bq9fhf4Oks0+MGCdKPm7UYmezywkNc0pUF6CBa/PrspA11FYsjhNGuwUDgDW5LQmtZxUUrifviTHyNbs0wnr/JGMfxTmdP7O12huHEogl6YA== 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:(39850400004)(346002)(136003)(376002)(366004)(396003)(66556008)(66476007)(6486002)(66946007)(966005)(316002)(54906003)(4326008)(478600001)(30864003)(2906002)(1076003)(5660300002)(186003)(8936002)(8676002)(16526019)(52116002)(83380400001)(26005)(6506007)(66574015)(2616005)(86362001)(956004)(83080400001)(107886003)(8886007)(36756003)(6666004)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: KNUM0qWlt+aZh9xbwP2KThSjIMGsbiAfpRqwZI9MPBb/mfRvGFGFsFYMrm/S/1JIhpzNu8J61fohnWpFrliGxkcUKJBdlP9nKE9FD8CF8JF53RkwK4ZKX+hgA1NW4HLrdTnMk4F+f+3CYNr5nJWCktsvxohU9OC029KJlBt8yYeZ3DQW/AMwFJQNcLSDyeGYpyfIhC4E+nxKFNW8zwUj1snxNnPycjKJ9iGw/ORnrs6TlWcOZWaa+XtTYlWtXbHW1uWRgvJocZ1oFVZlxZMmD5l+1zGOqjNdqgS32r/HiCCY+YhhfI4cjTf4xKkceM022JTXWyBcBixI8aOglpfZT2BWXYQpyqyVG2VWnNFFFGvXxc58MsDNxhojgcO1/CwGeF5uCwMJY0keh5rwalBqnY3JJVBV1hv7OXEu92loYHlet+I83QXlVcRxjjPyV5tVknVoONhBMfcSVf2bqeohE+clgXQVhQQAfDft/2TyiJX4jzwGXUUQazMB4o3XLvOF9dlh4NzcWa/svbrrDkMEawP7pfZHo/WyyGx6zygkmWTIN4lXZrw6FgRKUgItfMgdM9kRtX0nwFHsSkYluKdxXibq7LSLIkw6R+evegDALE5jd/lFGVGbX6wrKmCr5DcSjyJDE+o6j0LOERcliiEbNQ== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12daf8fd-6efd-4775-2c24-08d86aaa9561 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 10:20:15.8671 (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: lu+DGVCfzOvEhmaoNp/9UFbP4Y7NorZX8GlKWa7+VnLn5QVP2QHsn1yOzXRKmj6y+l1X02jGBzKZMa4bUDyOsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4670 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The wfx driver is now mature enough to leave the staging area. Signed-off-by: Jérôme Pouiller --- .../bindings/net/wireless/silabs,wfx.yaml | 0 MAINTAINERS | 2 +- drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/Makefile | 1 + drivers/net/wireless/silabs/Kconfig | 17 +++++++++++++++++ drivers/net/wireless/silabs/Makefile | 3 +++ .../wireless/silabs}/wfx/Kconfig | 0 .../wireless/silabs}/wfx/Makefile | 0 .../{staging => net/wireless/silabs}/wfx/bh.c | 0 .../{staging => net/wireless/silabs}/wfx/bh.h | 0 .../{staging => net/wireless/silabs}/wfx/bus.h | 0 .../wireless/silabs}/wfx/bus_sdio.c | 0 .../wireless/silabs}/wfx/bus_spi.c | 0 .../wireless/silabs}/wfx/data_rx.c | 0 .../wireless/silabs}/wfx/data_rx.h | 0 .../wireless/silabs}/wfx/data_tx.c | 0 .../wireless/silabs}/wfx/data_tx.h | 0 .../wireless/silabs}/wfx/debug.c | 0 .../wireless/silabs}/wfx/debug.h | 0 .../{staging => net/wireless/silabs}/wfx/fwio.c | 0 .../{staging => net/wireless/silabs}/wfx/fwio.h | 0 .../wireless/silabs}/wfx/hif_api_cmd.h | 0 .../wireless/silabs}/wfx/hif_api_general.h | 0 .../wireless/silabs}/wfx/hif_api_mib.h | 0 .../wireless/silabs}/wfx/hif_rx.c | 0 .../wireless/silabs}/wfx/hif_rx.h | 0 .../wireless/silabs}/wfx/hif_tx.c | 0 .../wireless/silabs}/wfx/hif_tx.h | 0 .../wireless/silabs}/wfx/hif_tx_mib.c | 0 .../wireless/silabs}/wfx/hif_tx_mib.h | 0 .../{staging => net/wireless/silabs}/wfx/hwio.c | 0 .../{staging => net/wireless/silabs}/wfx/hwio.h | 0 .../{staging => net/wireless/silabs}/wfx/key.c | 0 .../{staging => net/wireless/silabs}/wfx/key.h | 0 .../{staging => net/wireless/silabs}/wfx/main.c | 0 .../{staging => net/wireless/silabs}/wfx/main.h | 0 .../wireless/silabs}/wfx/queue.c | 0 .../wireless/silabs}/wfx/queue.h | 0 .../{staging => net/wireless/silabs}/wfx/scan.c | 0 .../{staging => net/wireless/silabs}/wfx/scan.h | 0 .../{staging => net/wireless/silabs}/wfx/sta.c | 0 .../{staging => net/wireless/silabs}/wfx/sta.h | 0 .../wireless/silabs}/wfx/traces.h | 0 .../{staging => net/wireless/silabs}/wfx/wfx.h | 0 drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/staging/wfx/TODO | 6 ------ 47 files changed, 23 insertions(+), 10 deletions(-) rename {drivers/staging/wfx/Documentation => Documentation}/devicetree/bindings/net/wireless/silabs,wfx.yaml (100%) create mode 100644 drivers/net/wireless/silabs/Kconfig create mode 100644 drivers/net/wireless/silabs/Makefile rename drivers/{staging => net/wireless/silabs}/wfx/Kconfig (100%) rename drivers/{staging => net/wireless/silabs}/wfx/Makefile (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bh.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bh.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bus.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bus_sdio.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bus_spi.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/debug.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/debug.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/fwio.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/fwio.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_cmd.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_general.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_mib.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hwio.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hwio.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/key.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/key.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/main.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/main.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/queue.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/queue.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/scan.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/scan.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/sta.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/sta.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/traces.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/wfx.h (100%) delete mode 100644 drivers/staging/wfx/TODO diff --git a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml b/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml similarity index 100% rename from drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml rename to Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml diff --git a/MAINTAINERS b/MAINTAINERS index 5e10735be654..1c74a7c173c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15799,7 +15799,7 @@ F: drivers/platform/x86/touchscreen_dmi.c SILICON LABS WIRELESS DRIVERS (for WFxxx series) M: Jérôme Pouiller S: Supported -F: drivers/staging/wfx/ +F: drivers/net/wireless/silabs/wfx/ SILICON MOTION SM712 FRAME BUFFER DRIVER M: Sudip Mukherjee diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 170a64e67709..69ea83279907 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -44,6 +44,7 @@ source "drivers/net/wireless/microchip/Kconfig" source "drivers/net/wireless/ralink/Kconfig" source "drivers/net/wireless/realtek/Kconfig" source "drivers/net/wireless/rsi/Kconfig" +source "drivers/net/wireless/silabs/Kconfig" source "drivers/net/wireless/st/Kconfig" source "drivers/net/wireless/ti/Kconfig" source "drivers/net/wireless/zydas/Kconfig" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 80b324499786..76885e5f0ea7 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_WLAN_VENDOR_MICROCHIP) += microchip/ obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/ obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/ +obj-$(CONFIG_WLAN_VENDOR_SILABS) += silabs/ obj-$(CONFIG_WLAN_VENDOR_ST) += st/ obj-$(CONFIG_WLAN_VENDOR_TI) += ti/ obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/ diff --git a/drivers/net/wireless/silabs/Kconfig b/drivers/net/wireless/silabs/Kconfig new file mode 100644 index 000000000000..a15768f36d06 --- /dev/null +++ b/drivers/net/wireless/silabs/Kconfig @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0 +config WLAN_VENDOR_SILABS + bool "Silicon Laboratories devices" + default y + help + If you have a wireless card belonging to this class, say Y. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all the + questions about these cards. If you say Y, you will be asked for + your specific card in the following questions. + +if WLAN_VENDOR_SILABS + +source "drivers/net/wireless/silabs/wfx/Kconfig" + +endif # WLAN_VENDOR_SILABS diff --git a/drivers/net/wireless/silabs/Makefile b/drivers/net/wireless/silabs/Makefile new file mode 100644 index 000000000000..2d32f4c1b8ef --- /dev/null +++ b/drivers/net/wireless/silabs/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_WFX) += wfx/ diff --git a/drivers/staging/wfx/Kconfig b/drivers/net/wireless/silabs/wfx/Kconfig similarity index 100% rename from drivers/staging/wfx/Kconfig rename to drivers/net/wireless/silabs/wfx/Kconfig diff --git a/drivers/staging/wfx/Makefile b/drivers/net/wireless/silabs/wfx/Makefile similarity index 100% rename from drivers/staging/wfx/Makefile rename to drivers/net/wireless/silabs/wfx/Makefile diff --git a/drivers/staging/wfx/bh.c b/drivers/net/wireless/silabs/wfx/bh.c similarity index 100% rename from drivers/staging/wfx/bh.c rename to drivers/net/wireless/silabs/wfx/bh.c diff --git a/drivers/staging/wfx/bh.h b/drivers/net/wireless/silabs/wfx/bh.h similarity index 100% rename from drivers/staging/wfx/bh.h rename to drivers/net/wireless/silabs/wfx/bh.h diff --git a/drivers/staging/wfx/bus.h b/drivers/net/wireless/silabs/wfx/bus.h similarity index 100% rename from drivers/staging/wfx/bus.h rename to drivers/net/wireless/silabs/wfx/bus.h diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/net/wireless/silabs/wfx/bus_sdio.c similarity index 100% rename from drivers/staging/wfx/bus_sdio.c rename to drivers/net/wireless/silabs/wfx/bus_sdio.c diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/net/wireless/silabs/wfx/bus_spi.c similarity index 100% rename from drivers/staging/wfx/bus_spi.c rename to drivers/net/wireless/silabs/wfx/bus_spi.c diff --git a/drivers/staging/wfx/data_rx.c b/drivers/net/wireless/silabs/wfx/data_rx.c similarity index 100% rename from drivers/staging/wfx/data_rx.c rename to drivers/net/wireless/silabs/wfx/data_rx.c diff --git a/drivers/staging/wfx/data_rx.h b/drivers/net/wireless/silabs/wfx/data_rx.h similarity index 100% rename from drivers/staging/wfx/data_rx.h rename to drivers/net/wireless/silabs/wfx/data_rx.h diff --git a/drivers/staging/wfx/data_tx.c b/drivers/net/wireless/silabs/wfx/data_tx.c similarity index 100% rename from drivers/staging/wfx/data_tx.c rename to drivers/net/wireless/silabs/wfx/data_tx.c diff --git a/drivers/staging/wfx/data_tx.h b/drivers/net/wireless/silabs/wfx/data_tx.h similarity index 100% rename from drivers/staging/wfx/data_tx.h rename to drivers/net/wireless/silabs/wfx/data_tx.h diff --git a/drivers/staging/wfx/debug.c b/drivers/net/wireless/silabs/wfx/debug.c similarity index 100% rename from drivers/staging/wfx/debug.c rename to drivers/net/wireless/silabs/wfx/debug.c diff --git a/drivers/staging/wfx/debug.h b/drivers/net/wireless/silabs/wfx/debug.h similarity index 100% rename from drivers/staging/wfx/debug.h rename to drivers/net/wireless/silabs/wfx/debug.h diff --git a/drivers/staging/wfx/fwio.c b/drivers/net/wireless/silabs/wfx/fwio.c similarity index 100% rename from drivers/staging/wfx/fwio.c rename to drivers/net/wireless/silabs/wfx/fwio.c diff --git a/drivers/staging/wfx/fwio.h b/drivers/net/wireless/silabs/wfx/fwio.h similarity index 100% rename from drivers/staging/wfx/fwio.h rename to drivers/net/wireless/silabs/wfx/fwio.h diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/net/wireless/silabs/wfx/hif_api_cmd.h similarity index 100% rename from drivers/staging/wfx/hif_api_cmd.h rename to drivers/net/wireless/silabs/wfx/hif_api_cmd.h diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/net/wireless/silabs/wfx/hif_api_general.h similarity index 100% rename from drivers/staging/wfx/hif_api_general.h rename to drivers/net/wireless/silabs/wfx/hif_api_general.h diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/net/wireless/silabs/wfx/hif_api_mib.h similarity index 100% rename from drivers/staging/wfx/hif_api_mib.h rename to drivers/net/wireless/silabs/wfx/hif_api_mib.h diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/net/wireless/silabs/wfx/hif_rx.c similarity index 100% rename from drivers/staging/wfx/hif_rx.c rename to drivers/net/wireless/silabs/wfx/hif_rx.c diff --git a/drivers/staging/wfx/hif_rx.h b/drivers/net/wireless/silabs/wfx/hif_rx.h similarity index 100% rename from drivers/staging/wfx/hif_rx.h rename to drivers/net/wireless/silabs/wfx/hif_rx.h diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/net/wireless/silabs/wfx/hif_tx.c similarity index 100% rename from drivers/staging/wfx/hif_tx.c rename to drivers/net/wireless/silabs/wfx/hif_tx.c diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/net/wireless/silabs/wfx/hif_tx.h similarity index 100% rename from drivers/staging/wfx/hif_tx.h rename to drivers/net/wireless/silabs/wfx/hif_tx.h diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/net/wireless/silabs/wfx/hif_tx_mib.c similarity index 100% rename from drivers/staging/wfx/hif_tx_mib.c rename to drivers/net/wireless/silabs/wfx/hif_tx_mib.c diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/net/wireless/silabs/wfx/hif_tx_mib.h similarity index 100% rename from drivers/staging/wfx/hif_tx_mib.h rename to drivers/net/wireless/silabs/wfx/hif_tx_mib.h diff --git a/drivers/staging/wfx/hwio.c b/drivers/net/wireless/silabs/wfx/hwio.c similarity index 100% rename from drivers/staging/wfx/hwio.c rename to drivers/net/wireless/silabs/wfx/hwio.c diff --git a/drivers/staging/wfx/hwio.h b/drivers/net/wireless/silabs/wfx/hwio.h similarity index 100% rename from drivers/staging/wfx/hwio.h rename to drivers/net/wireless/silabs/wfx/hwio.h diff --git a/drivers/staging/wfx/key.c b/drivers/net/wireless/silabs/wfx/key.c similarity index 100% rename from drivers/staging/wfx/key.c rename to drivers/net/wireless/silabs/wfx/key.c diff --git a/drivers/staging/wfx/key.h b/drivers/net/wireless/silabs/wfx/key.h similarity index 100% rename from drivers/staging/wfx/key.h rename to drivers/net/wireless/silabs/wfx/key.h diff --git a/drivers/staging/wfx/main.c b/drivers/net/wireless/silabs/wfx/main.c similarity index 100% rename from drivers/staging/wfx/main.c rename to drivers/net/wireless/silabs/wfx/main.c diff --git a/drivers/staging/wfx/main.h b/drivers/net/wireless/silabs/wfx/main.h similarity index 100% rename from drivers/staging/wfx/main.h rename to drivers/net/wireless/silabs/wfx/main.h diff --git a/drivers/staging/wfx/queue.c b/drivers/net/wireless/silabs/wfx/queue.c similarity index 100% rename from drivers/staging/wfx/queue.c rename to drivers/net/wireless/silabs/wfx/queue.c diff --git a/drivers/staging/wfx/queue.h b/drivers/net/wireless/silabs/wfx/queue.h similarity index 100% rename from drivers/staging/wfx/queue.h rename to drivers/net/wireless/silabs/wfx/queue.h diff --git a/drivers/staging/wfx/scan.c b/drivers/net/wireless/silabs/wfx/scan.c similarity index 100% rename from drivers/staging/wfx/scan.c rename to drivers/net/wireless/silabs/wfx/scan.c diff --git a/drivers/staging/wfx/scan.h b/drivers/net/wireless/silabs/wfx/scan.h similarity index 100% rename from drivers/staging/wfx/scan.h rename to drivers/net/wireless/silabs/wfx/scan.h diff --git a/drivers/staging/wfx/sta.c b/drivers/net/wireless/silabs/wfx/sta.c similarity index 100% rename from drivers/staging/wfx/sta.c rename to drivers/net/wireless/silabs/wfx/sta.c diff --git a/drivers/staging/wfx/sta.h b/drivers/net/wireless/silabs/wfx/sta.h similarity index 100% rename from drivers/staging/wfx/sta.h rename to drivers/net/wireless/silabs/wfx/sta.h diff --git a/drivers/staging/wfx/traces.h b/drivers/net/wireless/silabs/wfx/traces.h similarity index 100% rename from drivers/staging/wfx/traces.h rename to drivers/net/wireless/silabs/wfx/traces.h diff --git a/drivers/staging/wfx/wfx.h b/drivers/net/wireless/silabs/wfx/wfx.h similarity index 100% rename from drivers/staging/wfx/wfx.h rename to drivers/net/wireless/silabs/wfx/wfx.h diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 2d0310448eba..2d326b16272e 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -114,8 +114,6 @@ source "drivers/staging/kpc2000/Kconfig" source "drivers/staging/qlge/Kconfig" -source "drivers/staging/wfx/Kconfig" - source "drivers/staging/hikey9xx/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 757a892ab5b9..9de260802db5 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -47,5 +47,4 @@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_KPC2000) += kpc2000/ obj-$(CONFIG_QLGE) += qlge/ -obj-$(CONFIG_WFX) += wfx/ obj-y += hikey9xx/ diff --git a/drivers/staging/wfx/TODO b/drivers/staging/wfx/TODO deleted file mode 100644 index 1b4bc2af94b6..000000000000 --- a/drivers/staging/wfx/TODO +++ /dev/null @@ -1,6 +0,0 @@ -This is a list of things that need to be done to get this driver out of the -staging directory. - - - As suggested by Felix, rate control could be improved following this idea: - https://lore.kernel.org/lkml/3099559.gv3Q75KnN1@pc-42/ -