From patchwork Thu Sep 16 16:49:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499687 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 6BFF4C433F5 for ; Thu, 16 Sep 2021 16:51:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 591CB615A6 for ; Thu, 16 Sep 2021 16:51:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242569AbhIPQwn (ORCPT ); Thu, 16 Sep 2021 12:52:43 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:34431 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345738AbhIPQul (ORCPT ); Thu, 16 Sep 2021 12:50:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631810961; x=1663346961; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=E+fKYXhPpZ5rdm/yN7T/BYLkT8SFnvSX23T2wCPJcHY=; b=qcXtBr8Q6qXzC9VLysNL9Ne45eC7GDmZBKXf+2TC97zW8F0lBcb5BWcL asUv21cgJ/kZM6GJn2zDXw3vNMRcz1yF104g8nYM8U4TJ6wcgeL4oUkxg JYD/m6g859hiddX9KIoqarMGESTSMUK+0Q5Alb6rKsDhLx4z1rqPru0yU HLu96CXwaH1Pc/ZjrST4k9NSKuTj6y0IJRBda2IWu6WMhsc+7f1sbB/D5 gyHfttnwOyOsFEVhHJhXatQJZQ4UnWDOgRJUfNgwl8YqIX5RhMij2xzOd cwXe/EcQeFXB4wvkQ3LxUOh0g2I3XjjGYp365l9iuPSFm+jxC8rVAdU0D w==; IronPort-SDR: PzYVRgAbO+Jy/1r6gTv+ibf83eYXcsHe9q1wpUObyssnL7UpRxbroEvgHMn/I/hRQWWBmr/MUr O7Ch5jtQWk6XGu+FMsJVYbQvZ0+xPuOWDI/gvuN2lT6/pWeMqk5u7fw4cfMLdQP34GjVXsn99K byzPOlzlv09lGmQvg9HCJz6+zsLvTVnwZanuR/GOD2l9mwlDRilb8/Ff/6GwhBkZVPBiVD1ASs +p8DcnU+vw+qfPDJqqhkxChy8lJE6GI3dF63yezB2muLtem+777HAKf2xZkwgdV4PqKc9hOg9a /moGS0dxYFxk+odahlsP/8g+ X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="144413533" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:19 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:19 -0700 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFj5+8tmTjreIYu+WHBVXsEqUqfQ8aE6gAblFs3w+QjMKYqxwG77V3b7U1ZpdfJkgqoglwvpcnSs7yqNQi1TXOx7Ak6xIYGxQhoh6b5aw/x/o12Kp5e+N79YUL8oyUfX2yyiYnxRm5ftF960jucDcBF9nyHlCs1iGuQqZvJ7bifmQaCZHdTKHC8RQZ/dqvll3Xou+XC70UrxnPucoihdyPWN60BxvfiNsOF35NBUqOn0glXw0SgUxkc70Xb3Sm4WHCB3aFJfgjWrv2PJTkgw1RAy4rryEK46dPT1uVzkL5tXY9JpgKO/T7lDGtfUVJ1zJp30T6uiZleP5j2BPevWXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=TaYqxODhF/hf47W5KjpDrfQ+J9Jiu8vq2mtaA3L6T5Y=; b=bkgTCt3qrWIpZWq5tU2rynVF4nT5lxBdpzj0P8/7od3jDi2j5P5HzdNyq2sfuSqf2dlCuLEW0MDjoZpFKfL7ym71I8uYcyaYp+tatTW7zJAcdBnmfSgChw1+nlM0SLjBOSdWQU7lTpp69dJHUaM+pXjtM4BSrdqBnDnZVKY5avUjej5SfjNTdxQDFjDboj6lHx5Mpw0K8xucvnSEZ4KR20PZUs0YAMhDniltFP5yOCy0sjy0891KUoH36TpWwnfPZqwWPACpZIZAJCEKC5Rub7wTAxLb4bMJS/r3/MF4+PpG/d8GOx+sa4QRfNldnknn/ImkKjAoUc0epDdEzYeLkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TaYqxODhF/hf47W5KjpDrfQ+J9Jiu8vq2mtaA3L6T5Y=; b=KaIiaPGgbvzVEYSGAc13jJuZ5DVYIhm9wATXzbIGuD8f72bb8z8Togmh0HiNv38ANTGmwJPK5MT75l9hvC9e7cMSoIEiG1yYtlSiVW8U1//rxGX38Uj2f5m/TC7egX/7hSCdlLTJmwfQcNHBbvmXfETSccJ/5JqJVqoHoOCrNCY= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by SJ0PR11MB5197.namprd11.prod.outlook.com (2603:10b6:a03:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Thu, 16 Sep 2021 16:49:17 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:17 +0000 From: To: CC: , Subject: [PATCH v2 01/11] wilc1000: move 'deinit_lock' lock init/destroy inside module probe Thread-Topic: [PATCH v2 01/11] wilc1000: move 'deinit_lock' lock init/destroy inside module probe Thread-Index: AQHXqxrJxDjNG40dJk6FUWrJpJ0RwA== Date: Thu, 16 Sep 2021 16:49:17 +0000 Message-ID: <20210916164902.74629-2-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ee3b3eb1-2a8a-4dac-7f9a-08d97931ec6a x-ms-traffictypediagnostic: SJ0PR11MB5197: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:935; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LAooHnnjoSjYHNG4ALFFaI2LULr9FBtyMAN48RneJm9JqUnMS1qQNtP0Z6DqrfPA6mzp97h7NJEQLWP8wrsomFOqBtQHfufxBEPNbn9yCy5de9DZngzdVeABEAGCW5cH1YdMOt7uLC+c/RSXyyjDTQX7TQjJiJpy6hwY0YgmnzEwBkzR804iCa05xXbX3b1LuKrBcSRXr7ecqF6AvCdvpk34mtllaBkvQqsrNUlvb4g784tXB68ycqNl+pgQbmltVFnGzUsCgApz/Dulkb+7OoLvmvpSef2Q3xNx8duqEHOOjQV+aYYdQnMTRUFjFaFQIby9aye3LgI/31zzRXIisCN+ppx78v6mp0JZEDo8PryRZQG1LW6IA2vUY+LBL3e6sj4QbE6uodQTMTz8d8pGyby4OPT1XzjroGR+BJs06LmSunb0/+oOmQy0z4yWT1qU9waCj5+MDgGQ2xI+nRfSJoIqW+7cb5z09RocVSI2DEpPQR6PmeABWU9ggfcCmtpew0EGffSwKF+GVlhzbvDLSSbEGgu6RkXME0LUpme76sKjyqSftTTPbc6zSiEhLxUlyClH0NoThVLlXcO2JmKFznWL7zjMMxOGJb9J2iIMpgUDidQ1A4SeRmV1aqmkZ4Oxr7+xOL2YfCcBF/zDR519of0MRdnJ3TQ/Vv3xx0xtq0yFJ5LZmDt/HKV7g2hi+MlzLzwN/uGwMlLVn/ZP++hpug== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(26005)(107886003)(54906003)(76116006)(8676002)(6512007)(6916009)(66556008)(66476007)(86362001)(64756008)(66446008)(8936002)(66946007)(91956017)(122000001)(38100700002)(316002)(83380400001)(186003)(5660300002)(38070700005)(1076003)(2906002)(508600001)(4326008)(71200400001)(6486002)(2616005)(36756003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?hS7uZ7fpRt+n65lLplURc2J?= =?iso-8859-1?q?9i/TGQ+FwUAe5dzbA9TFQE+RLP9paJd+fTlacj/9liRsxyA82vTyGDD1Rlo+?= =?iso-8859-1?q?TIIhBaPmMTW12ZiauiWUqVN06j4e//NKRCjA2dURTsAjEU+Zt2drOnzzILPo?= =?iso-8859-1?q?YCdQ5uKvF3iLHVpHm6s8bQYJHZgsp9x7ID9eUNO+PCXaU9/bRvlqShea8mRr?= =?iso-8859-1?q?/JiRdsY/zgRbDcXFMA4WzeZo3sgGz6JpoaDSyVoOkl29hkShbAHcc4d8kzX2?= =?iso-8859-1?q?w9vLUIZZPRyh8Kf7HlnZcD5BeMFybqWPi729Sc/DkONyhxHAIMUZ+2kZMxF1?= =?iso-8859-1?q?D8+Lw5B2VCnOYxmTOoPbVQIZe0q6q5zoQ7CZ9aFzJ157MWHceMTqM5qGXbVS?= =?iso-8859-1?q?7g3minN/ISaEx9KrS82pJ5Abtfs0DB7x7XjeVCansP8SL4g8KLICC0tSs/sB?= =?iso-8859-1?q?z+7U/RoPJIsZt4rM/4I1kgLZ6QBrb48HAgcg6RpZqSDSCBpyQA/UMOtbJx8n?= =?iso-8859-1?q?tB6RpvSABrGYJvc+UaCfcXKejm2kIZG+2tEXQFLm6RjBFSKc4FEb8PtrjtiL?= =?iso-8859-1?q?oOVTpjbx8awoSCdA8Ksc+h5M7Q5Xgst5Cv9A8rA8QRSgLBV1gRGt7x//2Yb7?= =?iso-8859-1?q?1odMwpyBryoTlXTzDbtZLuaiPZ8qPfbWXz7VO+oChkt0nkVaPSvBolKADpsx?= =?iso-8859-1?q?cIg2LbkiLhXI1H8MdFCwWsWG4H3ilubHmVpK/lPmD2ZS9WwVWXnYxQZjzTPU?= =?iso-8859-1?q?+rkiaYfD++S1ydt8f7qjj8klL499+wfnpf5G/W0QpqwDRzAYo8obgMDxa22K?= =?iso-8859-1?q?w6NyaZZnjFddP75JFzI/JjMU5W1q9HLn9zy300vVW16Sl1X6DfeG2dHuaLeW?= =?iso-8859-1?q?PkxgsxDBNtqDKcsG2+TZCgIfsi6r6YZeneUUzChmdCaUpnlOp3f0rsqJS38C?= =?iso-8859-1?q?dotsbopY9ez6y/s8JP7RRHm/XDY3HlfQi5e1VxR5UV2OLjyNJwMSGnZwH+jT?= =?iso-8859-1?q?+v746Aelw9rDPQgLUVTWmbAXquYxrVVyMbMTduC3c5xiXeQm3PYzxIhNCJ9D?= =?iso-8859-1?q?f8AsXTB8VYDHKXrViSNBZvotJ1zVtK0ml5gUIHobj2YxAwkHAh1ETi4biPq2?= =?iso-8859-1?q?BpGlwnmkV0L0gAFFHLrxGNITywNWTV8fcJGVCjVgWtgZ6FE96Z+3xBXaHr7l?= =?iso-8859-1?q?l+a3mMWkXdWum4eGAXkQPYvIMvWvIOb+DWLEZlHhfgLe3YMCrzz55wQmerRz?= =?iso-8859-1?q?t3lTcndy6STSvpnKxrGogbhjaJszv6e7QriCB3be0mIHaOoLHUjgXOPpHgil?= =?iso-8859-1?q?hQsj4L9Qks66JAHy8O9t0At4cucB/EmBAhfJk0M3iz6z+YDlxKMom6RR4Sul?= =?iso-8859-1?q?c?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee3b3eb1-2a8a-4dac-7f9a-08d97931ec6a X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:17.4843 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: fubJcmE2vwpybmf0zsLNPEoPckWt7xa1A9ypcKn53rPN23VGWIom3j7Rgp5Sr3enW+Sq+YSWLU2HLUdouwgnYLYgidMF9otUCTMC4mSU0Lw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Move initialization & deinitialization of 'deinit_lock' mutex lock inside wlan_init_locks() & wlan_deinit_locks() API's respectively alongside other locks. After the movement, the client count variable(client_count) which is used for lock init/deinit is removed. Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/cfg80211.c | 2 ++ drivers/net/wireless/microchip/wilc1000/hif.c | 7 ------- drivers/net/wireless/microchip/wilc1000/netdev.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index 96973ec7bd9a..530a768547cc 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -1683,6 +1683,7 @@ static void wlan_init_locks(struct wilc *wl) mutex_init(&wl->rxq_cs); mutex_init(&wl->cfg_cmd_lock); mutex_init(&wl->vif_mutex); + mutex_init(&wl->deinit_lock); spin_lock_init(&wl->txq_spinlock); mutex_init(&wl->txq_add_to_head_cs); @@ -1701,6 +1702,7 @@ void wlan_deinit_locks(struct wilc *wilc) mutex_destroy(&wilc->cfg_cmd_lock); mutex_destroy(&wilc->txq_add_to_head_cs); mutex_destroy(&wilc->vif_mutex); + mutex_destroy(&wilc->deinit_lock); cleanup_srcu_struct(&wilc->srcu); } diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c index a133736a7821..497a49a182ef 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.c +++ b/drivers/net/wireless/microchip/wilc1000/hif.c @@ -1494,7 +1494,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) { struct host_if_drv *hif_drv; struct wilc_vif *vif = netdev_priv(dev); - struct wilc *wilc = vif->wilc; hif_drv = kzalloc(sizeof(*hif_drv), GFP_KERNEL); if (!hif_drv) @@ -1504,9 +1503,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) vif->hif_drv = hif_drv; - if (wilc->clients_count == 0) - mutex_init(&wilc->deinit_lock); - timer_setup(&vif->periodic_rssi, get_periodic_rssi, 0); mod_timer(&vif->periodic_rssi, jiffies + msecs_to_jiffies(5000)); @@ -1518,8 +1514,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) hif_drv->p2p_timeout = 0; - wilc->clients_count++; - return 0; } @@ -1550,7 +1544,6 @@ int wilc_deinit(struct wilc_vif *vif) kfree(hif_drv); vif->hif_drv = NULL; - vif->wilc->clients_count--; mutex_unlock(&vif->wilc->deinit_lock); return result; } diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.h b/drivers/net/wireless/microchip/wilc1000/netdev.h index 86209b391a3d..a39c62a20f04 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.h +++ b/drivers/net/wireless/microchip/wilc1000/netdev.h @@ -264,7 +264,6 @@ struct wilc { struct device *dev; bool suspend_event; - int clients_count; struct workqueue_struct *hif_workqueue; enum chip_ps_states chip_ps_state; struct wilc_cfg cfg; From patchwork Thu Sep 16 16:49:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499697 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 AC6E3C433FE for ; Thu, 16 Sep 2021 16:51:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95FFE61C13 for ; Thu, 16 Sep 2021 16:51:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241527AbhIPQxK (ORCPT ); Thu, 16 Sep 2021 12:53:10 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:34487 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238471AbhIPQvI (ORCPT ); Thu, 16 Sep 2021 12:51:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631810988; x=1663346988; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Kjsk2OwPZMYFn1V6odvO3Mlg5qBwpRrMFPmPPFCuJGc=; b=oWU+WdLEPNvSIk1daooXupp1zflqRvw6deznQx9F4xv9oJzOMfEEsfDw uPMFK1Hw3FyrvhpuC1I0MDwUtX9a1GprkosH66t9fe8XVnEh09kAXwV4h cPbcPYX8YvgMeXF7yvGFViCr8FltfzP0a0GPie/JjvuUqdXHof9qrIqnC F16zQ2Yr9vULz6KQSOA6JlLBPB8IxKEyT6UMDjDZrp1ZyBsSmO36dznOf 2VScDQSgizIFnvjT0piKoNawWPPlNt3/rir8a7ySJKUT5Dwl0sya89IvU ci2R6odccoXj4b/eDxJVWgKaXbPYPV13+9gclsRHaqG78YDtvz/zcUtjQ Q==; IronPort-SDR: 3qX+pAxSHYrG5xeF1AIu22+M6SfZycDQJhQtl/75c+Bqiz0odwWTIv6+kpfJU5WSan+7sOH4Tf 3UpuCHiRG41n+/uEXD4ODGRMSoq/HboNdN81nxUBNDtihSk6zJD7326pk/hOfPyNenbbG8S0z3 QDRYquI13LyBGgeb3akPHD5bDMwxk6ZKlOs4Wpko/QDA+HngHH2yH8PmAtOVIlyq4FfAlJzUPM CO07/EqCzeiXW4oQyWySG86vikb1X4cqDNflLkEYQSVSpx6eaI2nDt00eTsUD63OrIDnBWM9v1 sYIz/iQjMFR9LC/Uzl/ZPgdy X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="144413534" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:19 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:19 -0700 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l2Nyv9yVIv7gpFCYujJ6VyyhXoOwbPqpb6oM7SlrOgkYXuNUNkEx7wegQldquM4dXMF5qbjY0NcpBjS7epxb8BsBKnrn2FBI830XPtwc44eO9SQGYWrxxH6T9UfFMwXRg9HnzMdwVbbo+J4EB6pGrzN1vzAw0iQUHwL4PruKOkjYMpnJ/npwLEmLWj861ZLlUCQxfRR7Yi8Ooh/gIFdkY+hV9PDfs9Dsvfb0Yk/DAWfC7E+wr7+quUNqkkRrhbBqjVPNPaP1MWh8BfAIH+CvVAnuETwVg+9gD62N+hSD+ZBtIFXmA5vibCMR/zEbsajpDxizZh4mbTbRTPriAOe6IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=vuvh5FnkckTGhhKvh4g8I4TRALWeS6/11eOLasQxU8Y=; b=i0yA4tTnJhmINFj/BHo/GqivAqocj+dbd9c4CFjaA6bMUVQKqEFXa/IBZfyUTSccF1LoZQ8g27Iyx+kqxRpN0gvANHoXcJYbKPCNEQf2Ma5TWgc9p8A2+aE6o0nXYS8SUYaWVq+V7U9OECPn3Vxflale6c776Zazn0saHl2cPFXeAbcbECdDITSmbV6UGeSxZW3nJgKUc6P/cyjWqT6THc7a7zqGPl8EFT4gVgIyFlVxETyigELIN424MX2hbKQkt8zQzsBaABlGcGzCge1gnBk9rLKR2lN+QjaXDOhbONKtulbz0yInPO4CkLqde3drsba48En4XDqgIK9jMHM9sg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vuvh5FnkckTGhhKvh4g8I4TRALWeS6/11eOLasQxU8Y=; b=LrGkY/co070tt+YOJclz0UCxRAdN3jwds808wsTcogs/WMX8Qg+3n7PUGbNt/3ESyOplWHhLPSJ5NJXzLud4rzGpoKBWoLYkOIZoiimAUBDVe2IqR5lYVU0Iv2liDHoPOAIaqDTrxsKXs3a/xwXaJAIEADy0g5FjGAvtuqWJkBM= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by SJ0PR11MB5197.namprd11.prod.outlook.com (2603:10b6:a03:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Thu, 16 Sep 2021 16:49:18 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:18 +0000 From: To: CC: , Subject: [PATCH v2 02/11] wilc1000: fix possible memory leak in cfg_scan_result() Thread-Topic: [PATCH v2 02/11] wilc1000: fix possible memory leak in cfg_scan_result() Thread-Index: AQHXqxrKTYewoJ82v068rVAjMR9Fcw== Date: Thu, 16 Sep 2021 16:49:18 +0000 Message-ID: <20210916164902.74629-3-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0584b8ef-0864-4c62-6573-08d97931ecb5 x-ms-traffictypediagnostic: SJ0PR11MB5197: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2043; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: N35SZz1MnQw2lvSlckU9LkF8rYsgKtR6KDWkRZEAJxO53q1QRlExdGW42dulgkfmwoLjhRRIyHlnEagGRH7B6w47O6FKEdVRDbDnUgeEjrJGXXbubx0WQZ73GYiUmm/A89zt+qfN3jn2PtCBHmdxH1iQ0Piqx9BcaA5WqQ8ZIA88sf2jKxM+cyddWlBCeAlts5ACrvSsPbwzqAS1PiicrqT9kNvli8HsH1CikeWQepLNtMCAnxWMDLxSsDtjE+oyIkG9VdQzSU+f/cRmraQldsXYL697LxnxlrTizTA0JROz+SHJViGWVmu4xIuMoTkfChqB2uv7GHY/9GWcuBAgIYn93ZCv3pD60m+w+Qq0bjshh8W146J6vRaxxSfxplmgH8JS+yFoUlQtRcvnlCBn89kUq4W4AfVVhxcx2O7uWQonHSgfEkRERB1Qn09Ksql9T6KLR+PrTmBPD0y/Dquzu8CZpR9mabZSI/XDdT/dvaPyZ71aWsIeL7qpj+gcnjIptCLOGvJfEIvmMk/wxNjvPDNoCcXQmuhpi4nVvjaxzdp2nxuFJbU1sngn8/XfE50GdzfQSIKVwo3z7oj79Ut9Ni3vwcF0126U5HPlHOJqedoHBPnmtaoal/3LfYr/G16b0Ku57LpDObWmzK5e3pHcSG/dkXdZsqLVV8Jvtz3xjhehjlNjhN+m5khTvPM193pCjnutgHbi70yV/KgzwmVavg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(26005)(107886003)(54906003)(76116006)(8676002)(6512007)(6916009)(66556008)(66476007)(86362001)(64756008)(66446008)(8936002)(66946007)(91956017)(122000001)(38100700002)(316002)(83380400001)(186003)(5660300002)(38070700005)(1076003)(2906002)(508600001)(4326008)(71200400001)(6486002)(2616005)(36756003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?VM4j4mVwASZ3yBaLwV4Tnz8?= =?iso-8859-1?q?y6mSpLmMU2ZahhtA1vKFLI3GTZu0N2CdXSbYyZcKf/fY3s2LXqnw18ldAnUo?= =?iso-8859-1?q?seFCB81LTxLU5LKtI6mDGs8IDl3miWnzYHlAYJYKc3YvjTNL/m36cRWGRyBQ?= =?iso-8859-1?q?l/dit5xc5/DYWolHZ0owG9ha0lTDSsiM7cP65CD2S64XpISLr3x0Cv2D1Cn0?= =?iso-8859-1?q?Q7dNw2pWvyJAjhWW9uUL5oMfOZ0G+dIYr+Zxu2jMVSQag6A0O3q4RlFebE8G?= =?iso-8859-1?q?jcdF7g5yWahFuDJ86R3BKieR/nfS2p6lQTIZZi/UgUy2lHQAzWmlqpWd14sK?= =?iso-8859-1?q?kk3EcizXmH25UCkdsIU7t9fn7FwgJCan3yaxlIBWSCol9Ls4HW8689GZZivy?= =?iso-8859-1?q?E+g9ZxUDR6TSeEcjXDm1QczZ6Zxd7ys2vqC6cIz5+id8Qd6Bo30XlkC4bTiM?= =?iso-8859-1?q?2p9PxYY1cDMFq3SmfF4SbNnb3KMUjEzEmCSNMcBIB/V9leBNXRqIOh9+bfBa?= =?iso-8859-1?q?ACeiDg90B/8bStISPrO74fYjFbOaOnq+HB/UsEZ60E8DtcPoD7U8ROVbumG1?= =?iso-8859-1?q?rVIgHmBBhMpzdjpvp9ukwFI5jkXefHngP75nBiv9trb5/wVZSdkEpoCljlbi?= =?iso-8859-1?q?BvMCSpdktPAlEXAQvTXzAYb3OZS00Ynros6D/QeV5LHke51x8NMhMZWMTrrb?= =?iso-8859-1?q?eKO4P1XC9zhssYxnA2KzYSLlvE4M/y8rsA0Xq+ONLeo0aD2zgSJsdmMT+eyl?= =?iso-8859-1?q?sAdB63fgRWP5Mad6iQoOigo/hy8JMZ5AeuaVrIj7kOU+HQWZE0ie7I2/TGGM?= =?iso-8859-1?q?6ZA1/gtPoF2yv/lMaJy4kDagDzGH0Cx8XiWH+4eqdsQmuP/LLZEDrnCUiNNp?= =?iso-8859-1?q?c6NEP051lLdvobOR5rF8a+zfTu8UAlA6mzSkMmLJfS7ViLoL4Cqa2L2pqY2C?= =?iso-8859-1?q?r4hY0aP0i2NmxBHIwTPiSNnsd5wQead4uXUgOfckx2mLzMJgm5MDsjhua17m?= =?iso-8859-1?q?NednwJU62dqz23Cw6jH8Ryab3xgggtSkK8U/Alq+Ld50XHASrzf0HHzf0REL?= =?iso-8859-1?q?oN3Rw9JFZtQ6Hu5B/Z+480JRtOqcZw+B5rqTjwaWKone5BNcVB3IROnAMa3Q?= =?iso-8859-1?q?bh/c9O7BCtxipEqlN4Z94KWfBa9erOCxkJ95wA78d2yoMl6EX7MHaXv68tSg?= =?iso-8859-1?q?98ODin4BbxLHm2aFq3BGomJPgS2i1YhS8Nf5BQ0NCJ+sH72QWo4aL8HQa8je?= =?iso-8859-1?q?bFa3YI2FoCjCfnM7229Smdn/6of/ae+kogW8i2Ob/vt+P0kO94QNw+sSmJaC?= =?iso-8859-1?q?CMw8Q9OkeD4YmLrPJ4KfZ4MqduTKjeZkHCNSlK4wv5d8WOHEKOGtXDU3d5wW?= =?iso-8859-1?q?B?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0584b8ef-0864-4c62-6573-08d97931ecb5 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:18.0369 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: sOry3ElcpvcJgGxOJwXEh7k/HH+qIAwxj91t5fcW7/cobhmRJcwGgPvtsSbLQgKUK6qz6d+Gh1pN4bQ1qSmPh6FLf8zof++WszSre+aCxK4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh When the BSS reference holds a valid reference, it is not freed. The 'if' condition is wrong. Instead of the 'if (bss)' check, the 'if (!bss)' check is used. The issue is solved by removing the unnecessary 'if' check because cfg80211_put_bss() already performs the NULL validation. Fixes: 6cd4fa5ab691 ("staging: wilc1000: make use of cfg80211_inform_bss_frame()") Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/cfg80211.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index 530a768547cc..36b87ed38092 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -129,8 +129,7 @@ static void cfg_scan_result(enum scan_event scan_event, info->frame_len, (s32)info->rssi * 100, GFP_KERNEL); - if (!bss) - cfg80211_put_bss(wiphy, bss); + cfg80211_put_bss(wiphy, bss); } else if (scan_event == SCAN_EVENT_DONE) { mutex_lock(&priv->scan_req_lock); From patchwork Thu Sep 16 16:49:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499689 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 3C75DC433EF for ; Thu, 16 Sep 2021 16:51:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25463601FC for ; Thu, 16 Sep 2021 16:51:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344669AbhIPQwu (ORCPT ); Thu, 16 Sep 2021 12:52:50 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:18239 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345742AbhIPQuq (ORCPT ); Thu, 16 Sep 2021 12:50:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631810964; x=1663346964; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=kvDy8soBWOwpL5y1VU6qupu+1cJ9/aqvWesoaQLLsmo=; b=tIXA21gLQFVrOuFYJBDHoqbUjUt4z6ixzGXfvPl5hu2KlhtXLik8jENs 4F4AdCZOEZCAI6oqPWRgyiGyZrULuUjkGbccxc+j0aSSttZlC1AIVMrkS pkcsYN9Y/6Vf7zpMlOxGbZ2zKDWX/cqHRYm18IgvAp4W/2Ev4w/xhI5AQ aTDXq97iTB1iPckKhhjSgJqVYXwUDC1REZCSgtdPuSMhNuXhI89ybOFTW ZgCP6yjE+jE2dlUOsIXC1/x8QBmJkwirmMkLUTaxhnWnsgJyE+byv4SGs LCA6UrkiR0aCis2wqJrEtAZm6b0vkWv8XgQR25Ey+CK3R1ph844QqFoI2 g==; IronPort-SDR: SdcXioquZgR1iHLhJ1+4F87WvfT/Few30ZEftYOcw7xjdVbzNCb+3aMgFdz4PExXwWXoNd3LTk fLegoaOmysqKaGwQ/iA7RvrI/+Mp1DvJWYkI8pBDhR+c1JRQfMJvjNCql6ryCRq2qsheY9uyzB niDf1uLc2+6ow/pzc7TPjx5hdo3opAp/35PmlgpSG0YHiJyTlKurVJZeExitIL95mpCKdClOal uTJ2HsBpdm5mGpzaaAGV8eSzX/qR3xF6oV7kVXdsCY2T5m1qnBnJlMKVXlsPe9cjD0kQT6h9lN 8oKbtH2PU0qV/lktRy0D2qn/ X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="132089773" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:20 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:19 -0700 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WYtPNVXOZ1JO+SBblM9TWoDs/6/ebzrwtpZT/8Rdywjj87GCoYTVVV8/zkrKO8g2sdt7SXj0Rcw9WryeyXQdb9n1fek4QLO88nIduUi/Wx7JjEU5XTaLsD7Kk266plS/ew50BuTM+J4itheNgb/Z9ZisLPPva+gENY5aBIMNzE1ySL7z0G9/Ybf9jhKREaUme9J9lCjdqsJHsT2/HCaP812lZWrBhdncvMAEv85+k1GucwLl0OE5nSuo30PToIxWPVaQ1exuYzruL3HpU3c++JoenT2N3r5Pj5VPHJwhiHxQBx0ar9rhF91s4N9GDcUwbrM98vNYh8qz+MLpM1HVDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=htcOKT/+GRDTAXpAaud7iZvPBnhueTzvqmRsHJNa89g=; b=XkQR693gXdo+TkMRLF4OMQtEc+v9H0zh7i6pJA/5n6djWJHO5gq35GNBHpzOBjzbSygk/+C+LDGvDrGgjxl/5kUA3RMggUle5YYEcg0clIbMOME4juGhFvQ8j/fvFG0VFINCO7JS+oiIep3d900miyU7ivrzMt1bLpHujtWt4lFAGoL+Mku6SOt0ndehkFFUd+sNWPhA5du1vJM7udXSLBAyljr0Q3PxnknXdcjriCoR+4Iy+/ovhR9JT2fTFMG1BdfEMCqlXupQdeegNi9mMpff1kdyu5EBP4ooh95Sdwv2Mm8SOnV4T5oyywnkk4gyX+oTT/FbgV8RRY6+cHSHHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=htcOKT/+GRDTAXpAaud7iZvPBnhueTzvqmRsHJNa89g=; b=mOmrrRWoyUxQ6QFwk1OFiFbvKwa0Ci5xGxa+LevyAyeXp9FLVgKvbj55+Q3RJIWH3rgX5FbjdNEG1NwPUO730ylMTGWjed2kgdptdUh08y2I7SNg+FJ6QZhu8MKZlG/VBVsHxptZUbY4aOUZxm1loGtpfczNfoh8N3Ji6h+cIdk= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by SJ0PR11MB5197.namprd11.prod.outlook.com (2603:10b6:a03:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Thu, 16 Sep 2021 16:49:18 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:18 +0000 From: To: CC: , Subject: [PATCH v2 03/11] wilc1000: add new WID to pass wake_enable information to firmware Thread-Topic: [PATCH v2 03/11] wilc1000: add new WID to pass wake_enable information to firmware Thread-Index: AQHXqxrKTpgfpzTEBkuCTLL4X/klow== Date: Thu, 16 Sep 2021 16:49:18 +0000 Message-ID: <20210916164902.74629-4-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c481d662-bdd4-40db-a0ea-08d97931ed22 x-ms-traffictypediagnostic: SJ0PR11MB5197: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2887; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hPXKsseMRvYPbHlNpUuBIXZWSblE5vfpUwlMLpU7kZOPArQ7GvLVu0NfpEbOmNikgdN8OYkqiWUdX5d0U4mT7LtzemIopsq2hnu3ddu3TDQN37csptB9V6iuSRQA43Nde4V8FQrmFPcsRZnNam4qEJW0Xh5Ht2lYa4XbFjfxW8TIR2caVZdVp3Td5jAAoLYFV9Zc6TykKia6Bg+YzHtcb8ReL88Q0aJvEO4qPrFOAxkgeYE6SN2Fu6RgawdrSlOiUrmcfJMgIab93dPDYZ75JqlRk/qywGjo2rdoan5BxNXF2lqRo9/Iwz+9n1S9kT8xHJRzErPan+Gz2vrl8Hw0+OyWEuSXTIDO/rcCg0skSg7xtKmyg0ppO7emfPlYWJNWoFzUNUToujzVotbQt0pauDqkNbGzvVLoakpE/tJEIoAlTK/p7LGu8pvtnaokqkJ5sRmrEOIOM2zs1V2hzJuMLr0xrpV1delWbnU5w/q4kqwHRwwn2XXSlfT8s0H1HDDKRtWYkBtxDtTBD3+5Io6DoUjOW++9lmP0q/FVLUcHDE+bnsRy4Uenh6ahJLCftrlcZkZTLWYEx4Ekfq3SocYFpRhXllLuZxBWeJK3YDCiBdOBflwmWZqW+DJmVR6pQUvoW4J7kd7u23cRAxksmDmzAsMMN1quK6reOdokvhM2OC/PPTKPuu/0Z/63JU1mO1OnzYFr9eMDZCCVVq3Mf4lP5g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(26005)(107886003)(54906003)(76116006)(8676002)(6512007)(6916009)(66556008)(66476007)(86362001)(64756008)(66446008)(8936002)(66946007)(91956017)(122000001)(38100700002)(316002)(83380400001)(186003)(5660300002)(38070700005)(1076003)(2906002)(508600001)(4326008)(71200400001)(6486002)(2616005)(36756003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?IA5DIS8XXZzsXwx7BX7dx45?= =?iso-8859-1?q?z/Uumvh2bEf2P89+Xleo1w1VlpxoT3xIFvoW+5xAUCkqMfYh1Gk4ibdGgr45?= =?iso-8859-1?q?UGpDajaHmx3ITqhAeKwQjig16MqW3c8tYazWFphcVwBBjB48wxVRf16720+Y?= =?iso-8859-1?q?ANYmxr7uZUXdu3QGmEhXFmYe6fd08zcRmsLkUQKsd43SFtSMqRc7k+DRDKhw?= =?iso-8859-1?q?bUfhINQEue0VYMXbRSRzmGE6U3+phYBZl9WCtSGfyjB2bQMhipy/nX2JnqeO?= =?iso-8859-1?q?bmisiMlcFb19/fzTQ4mqcDWsCMX8nQO98NzUDqWRs2cblm+9vBC+UNVJ+DyI?= =?iso-8859-1?q?k9u0lzJ8ByTAARnDk/n0V3zdw7Lx9wdh4HhnzcRMO8wCqH2f5nYyVjDdZeTQ?= =?iso-8859-1?q?q1vNmex2gFZw+DZoRw/RFD8z8GRQ0nkYVpcvVi1D8OsSnmSHY602VoHheun/?= =?iso-8859-1?q?/IHBDzM6Zg8xPMu+2gx4YWr6HVABcwO989rP3NW+MdwDjSj6LJ/fnqyttHK2?= =?iso-8859-1?q?0G/HCSATwl1OTtF9bg0MyYQOHnI6fjR2b570RafIA650FpAzRRFXJrCFqGHv?= =?iso-8859-1?q?+i/0kOTDn+xO4JEoCuH/uUAzNKWxgRAZjrZZJapvoBfxdEPy7bEM/Rh6fusW?= =?iso-8859-1?q?BMfcEQk2VtoTjJdHNldFN01rFAdArrcBJ9NGEUg4xzTSRUfnmz3phsPDiuNJ?= =?iso-8859-1?q?Mkzs0F2flSIjXLbtqYZV3V7+pIU8S4w5fa8k3jN6RLzZ0TPp+URwTlcuaLBb?= =?iso-8859-1?q?sCgNS6KZkoGzxoyPl8HHeXj0E2OUDRrAIJlGB/bPKPhyim3R98Uwdw8brei4?= =?iso-8859-1?q?bZleZlpbTPM0c5iJEAJ8V6yphFTyrWpAZJcwXLttNLczS0EMKhgrECe8yqqO?= =?iso-8859-1?q?u3KA2gH8Gl9tsXP8VbovBYpMr2LcwFv6K+bCTklMC2e3PV09mQlZSxJkjEd7?= =?iso-8859-1?q?iTSLEDKzg6Z+BP9zR5CZ8PvhDrcJoO/tXfINoRpcn/o7YAG+hpcZmZ3Y5R1R?= =?iso-8859-1?q?6TPAoP1XvbLhheLhezL+R4juJuL5wS7a7oevV2Ui2FwvXFIoo2tEpP2dRHtA?= =?iso-8859-1?q?rE82Ma0O9Sr79KoPxHDCKyFcR93K1AZxQZz/rsHg85uYRqDtUGRvQzJ6Tii4?= =?iso-8859-1?q?+kYWX+brYev4UFCZgP1hNziJMQbhllCCCCi9QCBHZybMMfXuKlftlM3cmL67?= =?iso-8859-1?q?dSYkIWmm39QVDU+hjZIdnY+IpKl9LBERLTEPh3iSC6oe7sCcq13xG4FvM0LR?= =?iso-8859-1?q?8GSSLz8/fmksPYFb42JoDUsZWM9QmuLM8CozXfiXQcn6RQriJostJMOKwz0z?= =?iso-8859-1?q?EyI4fRr3rGFp0leJ81Wmi7rgO9q6422VwTqsXrQ40qX+mvA4qmswhjQkFXxR?= =?iso-8859-1?q?a?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c481d662-bdd4-40db-a0ea-08d97931ed22 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:18.6900 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: x5WrKyadBAlEhL4e/9x8Yv9lUd32drCpxS/rIQQKpPxs2oQ5C3lGG6aQqkni+RRNj5ONeG2R5Y8gP+0rdgfnIdWPhTaba4wpw/ukX8+iEJc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Add new WID(WID_WOWLAN_TRIGGER) to send wake_enable information to firmware. In 'set_wakeup' cfg80211_ops callback, the enable information was not passed to firmware which is required to handle WOWLan trigger notification from firmware. Signed-off-by: Ajay Singh --- .../wireless/microchip/wilc1000/cfg80211.c | 1 + drivers/net/wireless/microchip/wilc1000/hif.c | 24 +++++++++++++++++++ drivers/net/wireless/microchip/wilc1000/hif.h | 1 + .../wireless/microchip/wilc1000/wlan_cfg.c | 1 + .../net/wireless/microchip/wilc1000/wlan_if.h | 1 + 5 files changed, 28 insertions(+) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index 36b87ed38092..75160ab3914a 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -1580,6 +1580,7 @@ static void wilc_set_wakeup(struct wiphy *wiphy, bool enabled) } netdev_info(vif->ndev, "cfg set wake up = %d\n", enabled); + wilc_set_wowlan_trigger(vif, enabled); srcu_read_unlock(&wl->srcu, srcu_idx); } diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c index 497a49a182ef..e69b9c7f3d31 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.c +++ b/drivers/net/wireless/microchip/wilc1000/hif.c @@ -23,6 +23,10 @@ struct wilc_set_multicast { u8 *mc_list; }; +struct host_if_wowlan_trigger { + u8 wowlan_trigger; +}; + struct wilc_del_all_sta { u8 assoc_sta; u8 mac[WILC_MAX_NUM_STA][ETH_ALEN]; @@ -34,6 +38,7 @@ union wilc_message_body { struct wilc_set_multicast mc_info; struct wilc_remain_ch remain_on_ch; char *data; + struct host_if_wowlan_trigger wow_trigger; }; struct host_if_msg { @@ -962,6 +967,25 @@ static void handle_set_mcast_filter(struct work_struct *work) kfree(msg); } +void wilc_set_wowlan_trigger(struct wilc_vif *vif, bool enabled) +{ + int ret; + struct wid wid; + u8 wowlan_trigger = 0; + + if (enabled) + wowlan_trigger = 1; + + wid.id = WID_WOWLAN_TRIGGER; + wid.type = WID_CHAR; + wid.val = &wowlan_trigger; + wid.size = sizeof(char); + + ret = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1); + if (ret) + pr_err("Failed to send wowlan trigger config packet\n"); +} + static void handle_scan_timer(struct work_struct *work) { struct host_if_msg *msg = container_of(work, struct host_if_msg, work); diff --git a/drivers/net/wireless/microchip/wilc1000/hif.h b/drivers/net/wireless/microchip/wilc1000/hif.h index 58811911213b..cccd54ed0518 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.h +++ b/drivers/net/wireless/microchip/wilc1000/hif.h @@ -207,6 +207,7 @@ int wilc_get_statistics(struct wilc_vif *vif, struct rf_info *stats); int wilc_get_vif_idx(struct wilc_vif *vif); int wilc_set_tx_power(struct wilc_vif *vif, u8 tx_power); int wilc_get_tx_power(struct wilc_vif *vif, u8 *tx_power); +void wilc_set_wowlan_trigger(struct wilc_vif *vif, bool enabled); void wilc_scan_complete_received(struct wilc *wilc, u8 *buffer, u32 length); void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length); void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length); diff --git a/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c b/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c index fe2a7ed8e5cd..dba301378b7f 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c @@ -22,6 +22,7 @@ static const struct wilc_cfg_byte g_cfg_byte[] = { {WID_STATUS, 0}, {WID_RSSI, 0}, {WID_LINKSPEED, 0}, + {WID_WOWLAN_TRIGGER, 0}, {WID_NIL, 0} }; diff --git a/drivers/net/wireless/microchip/wilc1000/wlan_if.h b/drivers/net/wireless/microchip/wilc1000/wlan_if.h index f85fd575136d..31c68643731d 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan_if.h +++ b/drivers/net/wireless/microchip/wilc1000/wlan_if.h @@ -662,6 +662,7 @@ enum { WID_LOG_TERMINAL_SWITCH = 0x00CD, WID_TX_POWER = 0x00CE, + WID_WOWLAN_TRIGGER = 0X00CF, /* EMAC Short WID list */ /* RTS Threshold */ /* From patchwork Thu Sep 16 16:49:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499693 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 5C3AFC43217 for ; Thu, 16 Sep 2021 16:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44AE962F90 for ; Thu, 16 Sep 2021 16:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345493AbhIPQxA (ORCPT ); Thu, 16 Sep 2021 12:53:00 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:11873 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345752AbhIPQut (ORCPT ); Thu, 16 Sep 2021 12:50:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631810969; x=1663346969; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=snusMlwh7w0F89xQSSWO47PnEfQYhjgNsKCRezcNchc=; b=VQOxbGJkMwnvAM4y1kdaRKCjWsXM0usUnJcU/t7oDh/DEdCovW/dm0QR 9lzoWIhYB68XlzM9I5si2/63nHV298nfbCTXQlKeyGatOTr6WnDNmb+9h k/bOhkzKUVNWgLbQx/544dSoh3wVDs2JvH/00etbBoiILWp1xd/EfLFLD OYB6MxTxH5Zg3JKg3t8pQUZ+leGNB7GDCSVo6Whp3hYIeCBUJPq6c6akh NB8hT13ewXxYQCXtPbnCJ8YnDrwXWlIIOU5SR7+tg0siRzZcf378rok67 NIO9Cbd1UB+cludfqH8b7WFCsD6gKFXQNKacteIWcwMfGdTB86L0JbHcj w==; IronPort-SDR: wbfGaCxPwuwiANZg+a1bc45AMMCwqGfrDgLfAn9ilgkqzDtdZUHAkK4twce4wTgVZUiJipr33r jSy+CWsD6XoiynY+oZaA6hyQ//CXp26O87ZWDmH1rM58bauoeoyWQlnOIrsxMFoMGghsgkt1WI gfcS6ixxcMHAi8pVdno0VAr1zCSFl6rzeAjVib30SqXOYss/0eSNxi3LqqvhFGf0r60K1OW/vY lNpu3HBA1CmIfCA0KDjg1/UoLw/lcYFLsap5rOFj/ISd87MPBydilHGsvuBmJrr1C0HGlewseK v558HNTV1BkYKHsfDs8WNQ8k X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="132089778" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:21 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:21 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:21 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IqGZqnrZmaicvVkI2UcUvSjoCwHCDYg5UtVAgUX1trZH1FSCGd6glCLJ3CtKufV0FXKEUt3kk5QNi8CcbHPPi+nGY2embByiJCbAkTEZQactIsm1muGkZL1FVE11KJ9hxsQtk9Z6Im6nmIan9VSP7Fo4SsOa9N/zfq6oEgyF/5NG3M04wKU5T1kUOlTnni0pHUG9eknM35oICgRvFrvVZPvAwJOhoo4vIAMPe2Jl+lzrYsp8C7x083unS+c6MZg0neWXlsNKoUsVoMJsLR5M6cN2MXJ2DZcTpd5v0WZr0HypTncCJgHnALxShL4SYe8u/pfM8sYD9+jpBKvAhv8pjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=fZVSgySNqzZP8CQHePX2jefRh9byqXnOJDJw/kVNV4Q=; b=hURi2Nwrcr9qpPghGxcH4rsfyxzb+LGQI6bL1b+C1BOYmq3XRoui4i1aQpwkTscK0iloWaQXVR2IPBTM18Y4sOkivo9/d77ZYjvPXiD/Hbr00zlcK3t75pyVWov7Kwv4TwNcyzxzD08piqcOm15ud/HLyPE6SjnDVd3HcwJsxYUgZKyJtTux0/3fWisU398pufcJrOOllJNoboORws6BDuaRQ31le2WwAJRk7lvyODHikbZQmQGKOPWu3RwAOrESbVeF+peecboRiKOtvT4IEZycc2Gsu46B7+MfHqGCccCUEZAloxx8drTI19kzRTXm9FvaGiQg3ASvQkPIrjLL0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fZVSgySNqzZP8CQHePX2jefRh9byqXnOJDJw/kVNV4Q=; b=mNZkx4VZjUwtACeuDCJX0d6lmAS4SCLloc3nPmhe+W/An4nHy0VD4mqwndnObY8AY/KR0Fi2KtqJ4fEjaJ+kz3h9omUNMkuejX5VWDkm+AlgmO4wj4zmy2fbBCRCqidyPwzjxMVGtvWI+dQ7GDstSypui5eq6LxcAQfLbxcLQ3k= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by SJ0PR11MB5197.namprd11.prod.outlook.com (2603:10b6:a03:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Thu, 16 Sep 2021 16:49:19 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:19 +0000 From: To: CC: , Subject: [PATCH v2 04/11] wilc1000: configure registers to handle chip wakeup sequence Thread-Topic: [PATCH v2 04/11] wilc1000: configure registers to handle chip wakeup sequence Thread-Index: AQHXqxrKCB5luK3DD0ulSA8CbfvGcA== Date: Thu, 16 Sep 2021 16:49:19 +0000 Message-ID: <20210916164902.74629-5-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7c368b93-408d-44f2-45c9-08d97931ed69 x-ms-traffictypediagnostic: SJ0PR11MB5197: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2276; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: SM+Cluv4o7zGntFOGe3iI79yb28UaP5SIzrKUJPWGYulX5W0gDJTFzl2wS/YG/EWNobt9nBPsjAevPJMq9w733GFGpskzD5VuqrTWialbe+Z8AprkKzE/5HSs0d9wsyMEkh79iooqrLY2ESHgGPbXyosgiMOMuhsoJFBgqdO/RDE+3DKB1o8+NxiqLyrsJCj3W0M36TGoAAEeJzSwjf3uMgnISpk2oHndbE7EHuRoVX94LVGQPGCOskfVGwqwg5mLiY7M3h4RoYba+3X5/8oqeJodELS7cBevOOk2jnDa4RYJMBgbzmD7D416CHA1GwMYS7YNMpT/HVdXwmjd6+sxG0deDT2Re8RTw/ddyg/dt93TCRClceUAbwgIZDc445RK6FcqcBrRXt8URGs7JUKg1QiPPC0FFkM+oJ3hv4ySr+ZpCX2FBYENB5nQhOhzbpEn1c+wDFaGn0vIbaNR5oSMLI9dSu5qisjgmRGh7nH659VVHdxCqszUSelBa35oq3ZyjKT3KMdL5b3rkLMJ3ozoqEPCPsaM+woZpwmPEDewixwzE/QwK4DsUMSWmbXVoj6WK9YX7B2Bnpjf5RqUKKCsNKZIkIQO4XvP51nd8bstNF6MFWszZLJvbuJusmHa25jpOwwUa4nS6ETVJfogVWDPxn5lKhQQowv47xxZfQTrgLgMZLrM0sXRArku8VcR7Kp/VXGs0jnk8QmW8kAskyv4w== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(26005)(107886003)(54906003)(76116006)(8676002)(6512007)(6916009)(66556008)(66476007)(86362001)(64756008)(66446008)(8936002)(66946007)(91956017)(122000001)(38100700002)(316002)(83380400001)(186003)(5660300002)(38070700005)(1076003)(2906002)(508600001)(4326008)(71200400001)(6486002)(2616005)(36756003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?blSHp97CS7Iw6Sx975r5sLo?= =?iso-8859-1?q?ynbpRS9jpC4u92st5lJPNicyiBFAbZ7oZC11a6n5KEdyfEnjtNH+1uT1rLlD?= =?iso-8859-1?q?bsJKuK0mk5cJQR0i2Rda/FRHayq2xXiHF/YxNGx2RZItodIB3wLyV2XVgMun?= =?iso-8859-1?q?Gi3Rto0rihiV5Twhc/51ol6CtRoGfXJCR3LBaccwyBbrDPFmGJvUomRveYgP?= =?iso-8859-1?q?W1p1bOS7GlMx0bNb1HJHrhWpBKQCAZS3tBANs9dBjvbTZ8ydw5EHT3PRaVaC?= =?iso-8859-1?q?fPVsFAMqG988uzDV9tFrDWgnqA/x4U0wLeCvg4qxf2L9X9gCv+LnG51YCged?= =?iso-8859-1?q?iSUlQy2oHjykB9AgMLPmUAHtk+rCgjcUkX9nJZwZ2v5FKLXNG6xVQPN8BUmP?= =?iso-8859-1?q?G4K7MFmAZNyvF2TnwLpeSh57oet2H0Zh5UUdgk5PZIOODj3kAkZPS/0F7dev?= =?iso-8859-1?q?B7xoY2+FcuFwbNlHX4TqbKJglvIiG3kYLMeF9M2SNMNiLu41/J3tbpJCJr3p?= =?iso-8859-1?q?aUPu+ANfnXmsEdRGZA4mHPP6ZoN+cIlN0jnENBiJqfSwSNyG/5rf1wELpmkx?= =?iso-8859-1?q?X1s9HM51zBYMh1UhcnxjASJslrKkwo8Y/KIV1ZuQXHNFXWRodE1HSeVIjng/?= =?iso-8859-1?q?d2omjnB3fK0RL3wh45Tlepn3qG7VRRuI8V+hQyfcNp3d+n0L+wf6W/uguejC?= =?iso-8859-1?q?Sle5Q8pyuqfmiQFuYpEetBoKzGw0OxytKRlYt0DPaFlJ6jU3QWxrO5QYlr5P?= =?iso-8859-1?q?4aIs+NVed8oavPYYw1Ilh+xBLeIK1SOc1b2jMMbMAxOGllmuBAufiFhLsvcj?= =?iso-8859-1?q?Wy3afXSgtefnXRQzC5FXvbo6529RYrMY95Y1s2eSx0o/iK6d/+Ug4LmzzHb5?= =?iso-8859-1?q?ZSY2KHJe0oy7HhF9lLovyhTs57vIUqENk4kVm4Xh8JvJ6dS/vjghM4R9Lhlg?= =?iso-8859-1?q?UTMdHe2tns/b3j07k1u7IO/Z5S5Hrv/ZU4A6VltGm+KqhvbizxmxEDHoYJzm?= =?iso-8859-1?q?EXelFwoGDreSqEb2gXyzOd3iY86+Oi4dXBhNHZ2Ev2UlzlLOAZiw0DR8P8WF?= =?iso-8859-1?q?yJliXPOx7ufZG/WNWV1u8OX6pt3LnBtwH7VtH2FFptF80BwqLQJQqSTZeE9j?= =?iso-8859-1?q?ZNDvOi28T2GwPMXRtSkoLqNycxpeI5kazbgxz7WZoGJ7rrNX7M1DkFiv/yTi?= =?iso-8859-1?q?XnnnQwP2oFMZ0CC9mWTtc5NCd5is+68kqHDCDVt9JnAJ4O1XmjOy6m+jekPf?= =?iso-8859-1?q?zZIn7idiyrQXa615V7xVSNHutbt/uslYqXxkN3WKjYosoHwvJxlorfHRokdH?= =?iso-8859-1?q?SA2Y1ZSKikWBfvH04R794AxQ1dKM3D9m/JfhxhWwf4zmlqvXjeJ0qsgaImHa?= =?iso-8859-1?q?W?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c368b93-408d-44f2-45c9-08d97931ed69 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:19.2187 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: U/x+GoRZlStL8RlZR4rZYKXkBaVW4OjNvdZlY53E8LJIeyjEyogbyRQkGHfAPJU9Kgpr5ezXtIvBKPZ1xt4XY2TTxlj+ly5o2J/fHVNnIZI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Use the correct sequence to configure clockless registers for chip wake-up. The following sequence is expected from WILC chip for wakeup: - set wakeup bit in wakeup_reg register - after setting the wakeup bit, read back the clock status bit for wakeup complete. For SDIO/SPI modules, the wakeup sequence is the same except uses different register values so refactored the code to use common function for both SDIO/SPI bus. Signed-off-by: Ajay Singh --- .../wireless/microchip/wilc1000/cfg80211.c | 1 - .../net/wireless/microchip/wilc1000/netdev.h | 1 - .../net/wireless/microchip/wilc1000/wlan.c | 98 ++++++++++--------- .../net/wireless/microchip/wilc1000/wlan.h | 2 + .../net/wireless/microchip/wilc1000/wlan_if.h | 6 -- 5 files changed, 53 insertions(+), 55 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index 75160ab3914a..91a471f3b1c8 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -1726,7 +1726,6 @@ int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type, *wilc = wl; wl->io_type = io_type; wl->hif_func = ops; - wl->chip_ps_state = WILC_CHIP_WAKEDUP; for (i = 0; i < NQUEUES; i++) INIT_LIST_HEAD(&wl->txq[i].txq_head.list); diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.h b/drivers/net/wireless/microchip/wilc1000/netdev.h index a39c62a20f04..79f73a72da57 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.h +++ b/drivers/net/wireless/microchip/wilc1000/netdev.h @@ -265,7 +265,6 @@ struct wilc { bool suspend_event; struct workqueue_struct *hif_workqueue; - enum chip_ps_states chip_ps_state; struct wilc_cfg cfg; void *bus_data; struct net_device *monitor_dev; diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c index 200a103a0a85..1aad537c468f 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -10,6 +10,8 @@ #include "cfg80211.h" #include "wlan_cfg.h" +#define WAKE_UP_TRIAL_RETRY 10000 + static inline bool is_wilc1000(u32 id) { return (id & (~WILC_CHIP_REV_FIELD)) == WILC_1000_BASE_ID; @@ -611,60 +613,62 @@ EXPORT_SYMBOL_GPL(chip_allow_sleep); void chip_wakeup(struct wilc *wilc) { - u32 reg, clk_status_reg; - const struct wilc_hif_func *h = wilc->hif_func; - - if (wilc->io_type == WILC_HIF_SPI) { - do { - h->hif_read_reg(wilc, WILC_SPI_WAKEUP_REG, ®); - h->hif_write_reg(wilc, WILC_SPI_WAKEUP_REG, - reg | WILC_SPI_WAKEUP_BIT); - h->hif_write_reg(wilc, WILC_SPI_WAKEUP_REG, - reg & ~WILC_SPI_WAKEUP_BIT); - - do { - usleep_range(2000, 2500); - wilc_get_chipid(wilc, true); - } while (wilc_get_chipid(wilc, true) == 0); - } while (wilc_get_chipid(wilc, true) == 0); - } else if (wilc->io_type == WILC_HIF_SDIO) { - h->hif_write_reg(wilc, WILC_SDIO_HOST_TO_FW_REG, - WILC_SDIO_HOST_TO_FW_BIT); - usleep_range(200, 400); - h->hif_read_reg(wilc, WILC_SDIO_WAKEUP_REG, ®); - do { - h->hif_write_reg(wilc, WILC_SDIO_WAKEUP_REG, - reg | WILC_SDIO_WAKEUP_BIT); - h->hif_read_reg(wilc, WILC_SDIO_CLK_STATUS_REG, - &clk_status_reg); - - while (!(clk_status_reg & WILC_SDIO_CLK_STATUS_BIT)) { - usleep_range(2000, 2500); + u32 ret = 0; + u32 clk_status_val = 0, trials = 0; + u32 wakeup_reg, wakeup_bit; + u32 clk_status_reg, clk_status_bit; + u32 to_host_from_fw_reg, to_host_from_fw_bit; + u32 from_host_to_fw_reg, from_host_to_fw_bit; + const struct wilc_hif_func *hif_func = wilc->hif_func; - h->hif_read_reg(wilc, WILC_SDIO_CLK_STATUS_REG, - &clk_status_reg); - } - if (!(clk_status_reg & WILC_SDIO_CLK_STATUS_BIT)) { - h->hif_write_reg(wilc, WILC_SDIO_WAKEUP_REG, - reg & ~WILC_SDIO_WAKEUP_BIT); - } - } while (!(clk_status_reg & WILC_SDIO_CLK_STATUS_BIT)); + if (wilc->io_type == WILC_HIF_SDIO) { + wakeup_reg = WILC_SDIO_WAKEUP_REG; + wakeup_bit = WILC_SDIO_WAKEUP_BIT; + clk_status_reg = WILC_SDIO_CLK_STATUS_REG; + clk_status_bit = WILC_SDIO_CLK_STATUS_BIT; + from_host_to_fw_reg = WILC_SDIO_HOST_TO_FW_REG; + from_host_to_fw_bit = WILC_SDIO_HOST_TO_FW_BIT; + to_host_from_fw_reg = WILC_SDIO_FW_TO_HOST_REG; + to_host_from_fw_bit = WILC_SDIO_FW_TO_HOST_BIT; + } else { + wakeup_reg = WILC_SPI_WAKEUP_REG; + wakeup_bit = WILC_SPI_WAKEUP_BIT; + clk_status_reg = WILC_SPI_CLK_STATUS_REG; + clk_status_bit = WILC_SPI_CLK_STATUS_BIT; + from_host_to_fw_reg = WILC_SPI_HOST_TO_FW_REG; + from_host_to_fw_bit = WILC_SPI_HOST_TO_FW_BIT; + to_host_from_fw_reg = WILC_SPI_FW_TO_HOST_REG; + to_host_from_fw_bit = WILC_SPI_FW_TO_HOST_BIT; } - if (wilc->chip_ps_state == WILC_CHIP_SLEEPING_MANUAL) { - if (wilc_get_chipid(wilc, false) < WILC_1000_BASE_ID_2B) { - u32 val32; + /* indicate host wakeup */ + ret = hif_func->hif_write_reg(wilc, from_host_to_fw_reg, + from_host_to_fw_bit); + if (ret) + return; - h->hif_read_reg(wilc, WILC_REG_4_TO_1_RX, &val32); - val32 |= BIT(6); - h->hif_write_reg(wilc, WILC_REG_4_TO_1_RX, val32); + /* Set wake-up bit */ + ret = hif_func->hif_write_reg(wilc, wakeup_reg, + wakeup_bit); + if (ret) + return; - h->hif_read_reg(wilc, WILC_REG_4_TO_1_TX_BANK0, &val32); - val32 |= BIT(6); - h->hif_write_reg(wilc, WILC_REG_4_TO_1_TX_BANK0, val32); + while (trials < WAKE_UP_TRIAL_RETRY) { + ret = hif_func->hif_read_reg(wilc, clk_status_reg, + &clk_status_val); + if (ret) { + pr_err("Bus error %d %x\n", ret, clk_status_val); + return; } + if (clk_status_val & clk_status_bit) + break; + + trials++; + } + if (trials >= WAKE_UP_TRIAL_RETRY) { + pr_err("Failed to wake-up the chip\n"); + return; } - wilc->chip_ps_state = WILC_CHIP_WAKEDUP; } EXPORT_SYMBOL_GPL(chip_wakeup); diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/wireless/microchip/wilc1000/wlan.h index 771c25fa849b..285e5d9a2b48 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.h +++ b/drivers/net/wireless/microchip/wilc1000/wlan.h @@ -97,6 +97,8 @@ #define WILC_SPI_WAKEUP_REG 0x1 #define WILC_SPI_WAKEUP_BIT BIT(1) +#define WILC_SPI_CLK_STATUS_REG 0x0f +#define WILC_SPI_CLK_STATUS_BIT BIT(2) #define WILC_SPI_HOST_TO_FW_REG 0x0b #define WILC_SPI_HOST_TO_FW_BIT BIT(0) diff --git a/drivers/net/wireless/microchip/wilc1000/wlan_if.h b/drivers/net/wireless/microchip/wilc1000/wlan_if.h index 31c68643731d..6eb7eb4ac294 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan_if.h +++ b/drivers/net/wireless/microchip/wilc1000/wlan_if.h @@ -48,12 +48,6 @@ enum { WILC_FW_MAX_PSPOLL_PS = 4 }; -enum chip_ps_states { - WILC_CHIP_WAKEDUP = 0, - WILC_CHIP_SLEEPING_AUTO = 1, - WILC_CHIP_SLEEPING_MANUAL = 2 -}; - enum bus_acquire { WILC_BUS_ACQUIRE_ONLY = 0, WILC_BUS_ACQUIRE_AND_WAKEUP = 1, From patchwork Thu Sep 16 16:49:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499709 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 8063EC433EF for ; Thu, 16 Sep 2021 16:54:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 62F956327B for ; Thu, 16 Sep 2021 16:54:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245700AbhIPQzf (ORCPT ); Thu, 16 Sep 2021 12:55:35 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:30532 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345252AbhIPQw4 (ORCPT ); Thu, 16 Sep 2021 12:52:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631811096; x=1663347096; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=RwfX4dRsYlliON8BZlbPlqItZSNn7Se6NcgsR4tq08Y=; b=LDlpvdGwlR3t8hm9hVE+gkRPm7U5YDmouCPsGAgtDd/k3mSg1aVEgipJ ka+23jY8yZeqKYogg8BsNDXqsUnYHc82Fv0xnBPRi3rWYDL5tRdpMQtWm Q+o0g/RfGGZuIz8UnFQosxuZlY8AUUBP/C22OJR+Mh7Xq6uYUDWCeEqJ+ f7JMoWFNmeWiaxaDQdQrLy03wrRFqrZ4/g7A6r+NJ0gMC4wiQx/2JDtTR z7Vs9ffnKa6o5Ev0XW7NlVsxz9kvtdxmmqzGhD9VSmtT/qYBVLexmRTuP dWbn5qTX+RVH7AJsss3vFvlvuLmHf0fMvsmZ+HZV14vM5OKE8oJrvQ+bP A==; IronPort-SDR: HkmHoC8Cht31YlFkA41Z4VEnkZ+5ckRqPqlDPs8Q0WtHb8SHNKm/xfdmXBDhIsWyeL4AFlkjbL 8J38qFE1lSjdrBrPZB1V5Lbr36Ejh/DEVkAPG9wJY00hWPasjltA1KVQCKo6Yr7Ex1BdKdQvFK uNJPP1Me4zMLTp8WE/Q4cz7+wfkUMxWjLphBqaSI7Wo3h9mDsj9eKpavRPpNefsltqdrZdZPet Pbr00OJCItjHxZB+Ca215lm8cnHh471z1TQlBT97wE23Tz3jleQFOFIpNXrJrxGbJrtSpm53hh l33oZ7yjAbTpkPLeAY/5gJ9f X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="136238777" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:22 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:21 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:21 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EdeTyTsxOOvPgD6iiVoovSM1iG+RHg1jWZZpWQZadWK69TdJqxOZbLVr24pzcjuDjvfkevk+ZMtddNgM6FQ9hJOV0umG/nrjK0IxIe1KLRJQOQzCDlBlWJtXm7CMkCgeWBsX99dUMa5Rsch/W7tJMqXuBOUn38c+aIt78lPgqjmu4Hr2dvevUxcb1s4qJOo+yZOmw7I7xqRwDfPOzLQYPG43pPedPyBNodF+0Dw44fq0dbv/vMyukNdUZj7XBUAgJDvOkstH3Mlzr5/TocumBHIad8XbT8DZPHLK0b83Jm4E+TA94enzvZdgc2X5TfoQ7q2oigydEtmFpj7ONatLBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=eO0wHRyWekZ/7wOn8M5wxYPVEQdCSDxLfpJSVt7IzEE=; b=dhLOhcBQYBbUwd5FeVWpWq2tjHldjWrst1gvdNldaveyeonwvtHsueubJhjtL7BKhT+aEJaW+G8FDV20RAmoHRr8lwHsV25nnO0cDklJzSCuL6JSnKr/pWMowTF7dOpPEHF4Limm0bcvXTU3RvGkramQ51JIkXavObXhVuJjUvjCwm30lxJLPR+IJRirBwslVoIWEcsRLmb+bui/bujOcSlITCtqTLitqF0+4O3+I/iVJhU2Zoc7hpH1tZWe0/5cL6fwiFJy/XY+Jbfj/D/ASa0GrOb7COfIfe1Wpxk9iK/ORw8a2bQh7hGQ/p8hxT7Lbv9Ccy5nuq3NRcQ50kAFqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eO0wHRyWekZ/7wOn8M5wxYPVEQdCSDxLfpJSVt7IzEE=; b=WMj8b23WaDfsL2YGTQiTjUdJctbXspz0f71SmR8RB9ruZkURIE6VCdoKoP8W34E1M3qs0nq+4VHJGDl7g40DGxXl8BB1r98IbKvvQGJ5pus8OY3w+KW77T0r1jnWAk7wSjuH5ZqHih0QJSHbwG6LpQ3SHLvce49hBX/ym4QMbM4= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by SJ0PR11MB5197.namprd11.prod.outlook.com (2603:10b6:a03:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Thu, 16 Sep 2021 16:49:19 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:19 +0000 From: To: CC: , Subject: [PATCH v2 05/11] wilc1000: add reset/terminate/repeat command support for SPI bus Thread-Topic: [PATCH v2 05/11] wilc1000: add reset/terminate/repeat command support for SPI bus Thread-Index: AQHXqxrLAGDaTZ6FREiE487aWekw2A== Date: Thu, 16 Sep 2021 16:49:19 +0000 Message-ID: <20210916164902.74629-6-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 813e7174-af53-487e-5cd9-08d97931edc3 x-ms-traffictypediagnostic: SJ0PR11MB5197: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: OWhRy2wqNHKfiP0IHvUNuD5fwHAzLYhAafSBk625ecAo1KTl0RRmlG5Kgfyd+Inkiwkirei4voVdUFe8NxKlhMLDToZx0F3JYaRrb0Lc5rpMT4DaQNFHUTCZsRPEasIIwtAk4PwJK05lx1m9Szoj6pYOPzbPmeGCbLYvM52PHaPC2w4s4eVGEr3Ua9yF/DKn/Ey6ZXJEckwh2Z6qGEfzu497Lq6hLVf0bPbhovN/CV1Llx0j5I2bRXwp3t0kQ/qrG6A1LmUMkpEVucCu8nleDX/efKLEK6lCkSEXCwe7dv13TgjMesDs3rqPrJCVok9s8NmOZmEvFNxStvvW4UClrFFlwET0mOeRhzQ+48xbofG3LdughT2c5LoLYaTskBPTV6/zCewHY5P62/W/HFTQl7jnC9wl/gnEV9pD6G+LQUOteDU1h4eHFl0Mwx8LMjeBM9dvsFTkkuGhchuxE2Or7KV5uM6aUIHpa6kg+dt8n1yCKIhNC6cinZAfgllOrAeEndxF2g6rrRcivjj4saK0QAA5sD5oajyIbRvTpSjBb0P3pRUJTyGaEmt6VwZib4zJgwVBqQ3HxUrS/cKPELmlgGueyBHkTVia8ZjaJo8TgEKhH+av6P4L9eXzW00Uv+2bxrYiHOYE7QvYHwUotNGvuDlajX3mxu8V9StQHNJGCJ1hBAIWh716RTPOyNqB/Wex5vlAeEHvDxymOH374SCCAQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(26005)(107886003)(54906003)(76116006)(8676002)(6512007)(6916009)(66556008)(66476007)(86362001)(64756008)(66446008)(8936002)(66946007)(91956017)(122000001)(38100700002)(316002)(83380400001)(186003)(5660300002)(38070700005)(1076003)(2906002)(508600001)(4326008)(71200400001)(6486002)(2616005)(36756003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?PSMn3+dFNLEwDQvHUXUDBwz?= =?iso-8859-1?q?V53PckvMY30GDVKY4QkyYFcA2zNPxXcsa8Qv/zq+A7Kcn5vhgDEtK96Wmroy?= =?iso-8859-1?q?VL3qg0M5Sn0FLdeUnAecIHc5oZSUmIolHgN8N+0Wgm2JMA1XudbjTKeLYjw0?= =?iso-8859-1?q?2ZS9PXs/5SNi/5ZDYj6UuaMA1UwDRmfpLwxmdCqcirstyMeJAqLkQfLpqEq2?= =?iso-8859-1?q?JDHSDZpgCbREup/GReFLadX0IZpfBE7uEDTAhlkdlu4Rh1exO8AeAQ5lWSoh?= =?iso-8859-1?q?tQZRL2jiM7bPfd3FRQwj12RjmplRkmbCb5B20j0ELcnAabWVryV3S7ji7LK4?= =?iso-8859-1?q?+4gicGJK3KjnP7I3MF93gcEUDNXC05QNetRUbZEIMSsS9QirL/X+VCiBj2vQ?= =?iso-8859-1?q?K9tAUF/HftQ6DgM4TnQHX+LqivulLOmjVo6AA57emABi7+/hu5tsTM+8AyuF?= =?iso-8859-1?q?pES5C5J64yaekg8uurTS1kNv+0f56h63D49YQNyVQjjxJxvriuqAxnG3/B2S?= =?iso-8859-1?q?TcF1eA0RnkZpEakPSCOXub8BoGnb3SskU5KPi+eWFDTkkrXw7dJQ6lvkPm3c?= =?iso-8859-1?q?BbjEA52D6jm3UI5KPspoXjgW7nmuoEdL5L8DHofphF9pI3kOxVo20FYnESLO?= =?iso-8859-1?q?F2MsO76CAwYuf6G+cbSECaP1eS1GAR+OSEU4B7HPl8hzTQZRKqqkm3JlksF9?= =?iso-8859-1?q?toNjP6WTMp1R5uKs1OTl3c3kHNMJXDj2ie4oaXCrq0MedEEvpbO6aFD97y7n?= =?iso-8859-1?q?6YVUht31wV+J3VxE6eonUopp3sZHBy+wd7JSLRqlfzcIpDrOJUzDalV2VfoF?= =?iso-8859-1?q?7COqxDxnmGw7MjZL82kXZjpIVD9yGw6gwtMcaerRC9XEgD1B+TwyVm6DPgdb?= =?iso-8859-1?q?IZI5Ns24MBYfDt0qTj8vTm7w8rvSrNo4ASxx6HNtRqaAu59rBoyBmJTvJGd5?= =?iso-8859-1?q?3InQlQb0Szo5HScs3u0JSO5qZRZCjtTXq9oSk/cNWJsGbN6X6AxF7GwV65Rx?= =?iso-8859-1?q?WgRXVU7R090OZTVhhmhwye1xExF+fjVPYPTxxbk3uySAeLXgo1DCQYdZMbAg?= =?iso-8859-1?q?VapPE49wKiJeyBD6j3PN9Oy5abaT6Enp8A7+uVBeuaBLSPPnTwtL3UYMKsQa?= =?iso-8859-1?q?f5LejlWVo18l/bskSS6DDlYuMN3YS4ns7mibvUk7jsFE6FOEEAu7cufSZlAe?= =?iso-8859-1?q?9rkK96cHos8tvT/YwREBHXDka7u4dXEMHsoKxX/nJlW3K8CluzbBhtgKz99D?= =?iso-8859-1?q?awnGkOfA5yvlFKMv6bC58j6VZOktu5WVx6IPLBRxJ3rLdFW1SEDpMPFJgmVx?= =?iso-8859-1?q?JUfCwBc9jq+qdhpjpTlaUbuVR2aRjhaIl2n6v+XHCBy1nRizICT3QuLYfTac?= =?iso-8859-1?q?l?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 813e7174-af53-487e-5cd9-08d97931edc3 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:19.7862 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: KORdG8le6evgs/UdAWxH1peqJnn+Jzcy+jljClca0rVWsu9klIGvSRxempeLucWVU8lpwCd1N86lPeJ8CDUoNifvxhSvmdkMO2KGRfZFj3A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Add reset/terminate/repeat command for SPI module. In case of SPI commands failure, the host should issue a RESET command to WILC chip to recover from any temporary bus error. For now, the new command support is added and later the SPI read/write API's would be modified to make use of these commands for retry mechanism Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/spi.c | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c index dd481dc0b5ce..602316f4367c 100644 --- a/drivers/net/wireless/microchip/wilc1000/spi.c +++ b/drivers/net/wireless/microchip/wilc1000/spi.c @@ -144,6 +144,12 @@ struct wilc_spi_rsp_data { u8 data[]; } __packed; +struct wilc_spi_special_cmd_rsp { + u8 skip_byte; + u8 rsp_cmd_type; + u8 status; +} __packed; + static int wilc_bus_probe(struct spi_device *spi) { int ret; @@ -709,6 +715,61 @@ static int wilc_spi_dma_rw(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz) return 0; } +static int wilc_spi_special_cmd(struct wilc *wilc, u8 cmd) +{ + struct spi_device *spi = to_spi_device(wilc->dev); + struct wilc_spi *spi_priv = wilc->bus_data; + u8 wb[32], rb[32]; + int cmd_len, resp_len = 0; + struct wilc_spi_cmd *c; + struct wilc_spi_special_cmd_rsp *r; + + if (cmd != CMD_TERMINATE && cmd != CMD_REPEAT && cmd != CMD_RESET) + return -EINVAL; + + memset(wb, 0x0, sizeof(wb)); + memset(rb, 0x0, sizeof(rb)); + c = (struct wilc_spi_cmd *)wb; + c->cmd_type = cmd; + + if (cmd == CMD_RESET) + memset(c->u.simple_cmd.addr, 0xFF, 3); + + cmd_len = offsetof(struct wilc_spi_cmd, u.simple_cmd.crc); + resp_len = sizeof(*r); + + if (spi_priv->crc7_enabled) { + c->u.simple_cmd.crc[0] = wilc_get_crc7(wb, cmd_len); + cmd_len += 1; + } + if (cmd_len + resp_len > ARRAY_SIZE(wb)) { + dev_err(&spi->dev, "spi buffer size too small (%d) (%d) (%zu)\n", + cmd_len, resp_len, ARRAY_SIZE(wb)); + return -EINVAL; + } + + if (wilc_spi_tx_rx(wilc, wb, rb, cmd_len + resp_len)) { + dev_err(&spi->dev, "Failed cmd write, bus error...\n"); + return -EINVAL; + } + + r = (struct wilc_spi_special_cmd_rsp *)&rb[cmd_len]; + if (r->rsp_cmd_type != cmd) { + if (!spi_priv->probing_crc) + dev_err(&spi->dev, + "Failed cmd response, cmd (%02x), resp (%02x)\n", + cmd, r->rsp_cmd_type); + return -EINVAL; + } + + if (r->status != WILC_SPI_COMMAND_STAT_SUCCESS) { + dev_err(&spi->dev, "Failed cmd state response state (%02x)\n", + r->status); + return -EINVAL; + } + return 0; +} + static int wilc_spi_read_reg(struct wilc *wilc, u32 addr, u32 *data) { struct spi_device *spi = to_spi_device(wilc->dev); From patchwork Thu Sep 16 16:49:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499713 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 64483C433EF for ; Thu, 16 Sep 2021 16:55:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5067461354 for ; Thu, 16 Sep 2021 16:55:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344383AbhIPQ4w (ORCPT ); Thu, 16 Sep 2021 12:56:52 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:30349 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346431AbhIPQyy (ORCPT ); Thu, 16 Sep 2021 12:54:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631811213; x=1663347213; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=npvWdfgmR5vZ2mRxQ/8rud+z4aQccSrXIlCi2HVIHMg=; b=W0Y+G6ES7b4f8qhIDGKsijQotgQTMINU6VK2D+tRqD3UdmQgJAyRo33Q FOYrrBu88wxcs0m4oq/T4GBUFey7Awyr0whcR0qFBpIyDFLfCxbmmLbEx Jg4yyFeoLtsUqTakyJdlMxW/ATcVHWLi95k4qCHY7zzeQ6JGfnJC7y/LW li6ctqnRswn5mrXzAOqCsLa2Wkbm7+wMWsFu9drmTiFoxnESkFkCSQ/Ii bnKem2PC9AmPTpeTXE/FhA7RG0m39DNJB6THmkSP+XAZyzWDa8Op2zDl/ A4hN3yPtZFKAKd/RiaxkzKzcYOlD9y86DtKgb0yOplRtvtgQtMEPhuVOW g==; IronPort-SDR: hdKVVla6rJJ+i6DwE/0k2FDiIwgJ17IA5X9zPnT4icXvxO/HoLVaqQSFaQvDXmGv3vSmpTg4gT wps5KDG2orqe2nCRvwtGluLeLyBZd01RQgsc3Zy+O760R5XbkQhEvTWOJqx2hzjJ97p49EcdZo 2asXN3YOaG4FOGwePP3cl/sZa1msyVgZx/POLQnahSkC+VFa/sN7V8Q7F/rGgJNBxFgMpRNYzE iFBp7loQoHrb7fPhQGM370IiQle6wc8IKs6RMJqXRnptJaPJHJRoStUGvN6oO/Shh3KrqAkhZp 34fHfq/ds19RBdImjvlu6G0Y X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="136238778" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:22 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:22 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lkgEPMeCu8XLBYvFxPHhXnNc4hGqNGQna7AMqpsJkT2317rzuZr4OpKagcD7svcKsnYNdkIHaYRNdhSoJJ2LtHTN6BGqPuHMhpL9BRSlK1mhmrExwPancJvwdwPj/HrxlRkQ8Nn/Fr0xefAh6/FleqvLXBqsko7KfpJRwi8ae8Ox7QXlv4twTw7QSoC89ynN8tk1WIGecJElUcdU50tqs3YIUaSKr5mGC2AdsWBLgSG3yro/lXAg0Z0J/dBmm+o1EcCt6PEtFytxtuxmjhahLehMVcRq3yZBuoUjmmpx6pLlgmKfDf7xu00gaX3uCtOHwTJFAarwHQFvN2+6NGKGfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=WfaOey3xwOxR6UVcI822Dz9AOuglnm3tW3NCznzopVo=; b=WWoqNPeIVD3KGS/a4AU1DHttagoTt7gjIBE2blI9eTmZLoLgLuaMff7HXUD9/Vvjk5s9IXTJGkLHHMQbwJouwh4YJ+w3E39Jh+5YaRPXfgOinJDKNZV5/Q22+8tAP10jdQ58l4i3zhXZF4jQtDcdRtk6mbZp31k9eFWT7JPvvgndml2RnYtOrdY3uJK7uVuwxdqOH0xg/YEu0L5lIWr7H66A98QXy6Rn1zCh9umfNujSqA0AaNyF8tHNEzMDKzFOwMXXbWVO8JUoY+urwGeHiNPVy65VqSmiN/aDLwQRU5nRmNGft0zPNKdvzRG8K1hyjt7txJgmDQdNFU4J/5C2Iw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WfaOey3xwOxR6UVcI822Dz9AOuglnm3tW3NCznzopVo=; b=i6M0gKNWmcz9RzhDX4n9kvaznHjrPXHrMy87Q+NFkASJJymS7Gu988+/7vt8uFtreaYR05rbd4KrwcrWW2ku2jx9TsLfKWSE078BG4ROq+V2T8ILbsjf10idqfeW5XTfyJJzG0NbaGSzMUg9PvBuO6AMZibHCiO5aNzWi1X/2ew= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by SJ0PR11MB5197.namprd11.prod.outlook.com (2603:10b6:a03:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Thu, 16 Sep 2021 16:49:20 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:20 +0000 From: To: CC: , Subject: [PATCH v2 06/11] wilc1000: handle read failure issue for clockless registers Thread-Topic: [PATCH v2 06/11] wilc1000: handle read failure issue for clockless registers Thread-Index: AQHXqxrL9ivDMYK1EUmCexlRqdXQpA== Date: Thu, 16 Sep 2021 16:49:20 +0000 Message-ID: <20210916164902.74629-7-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fc5ce5ad-fab2-4291-5b40-08d97931ee3d x-ms-traffictypediagnostic: SJ0PR11MB5197: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1169; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: EvajlVP7lyGF71ZNBk3NmgzygQKrz8AzvnbSC2dDQdMpYkjK5wFfPC21EHgveLVjC8ijLr+LOrWl3gL98aRQy7CxmVFF4zcM7riwcXz9RyQy08DpoxiBRzvfMkDkceXKqSi+YgQIcZACtkRdBLHdAmGYWD8MtOGjyNruaJjyI0DhpLyNYgguX4e78zcNdYTQAoHwcQEFmiC/Si91Nb46JKNuQjsrUzIE/QTzkwEqan6oQAVz4UJ00gDZmMvkK4lKRHgLCRR/ZPPLEwjTVyKGTtZXlnxQqJj4R/HLYplO1ZII2uVZ+wYlloFq+EJrd44073Wfzn7ieeUSQGQNpI1+V8eCiZhTH7NVjnhi0fJjPlq2IjtOjCe4MDiFTUioTDiCZl4Xsz1S5JOYHBa6CzyGtGPzV1EWY2ouccJsr/VHW/+78DWXZzl+QFPfsdVk3tPGCGfVlvTX9jG2rJZgW23Ho/31Ad7hLTKHKKW+6PWRSimD2u+AxVKJEgYjRcQbzvlVYXDLQ/04SquWENTft5YE4BD0Ra6X9taEXGC1Zi+hTKSr9hXW/qh2RmxpxFq56pL0XdtZGoEcMqJIIM0hM6xJBNkKkBMluDiLEBN0F0kypXqiTYo1EU3FqqO2iVDMUh0+0SFILzNkAyMz+fyr1smGMk2jnhPjCG5Gr7X43Jr6lTIBMqmPvxSRnxUdff/Jv+7B0/6+pK9P2NwREGeu5iAKbg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(26005)(107886003)(54906003)(76116006)(8676002)(6512007)(6916009)(66556008)(66476007)(86362001)(64756008)(66446008)(8936002)(66946007)(91956017)(122000001)(38100700002)(316002)(83380400001)(186003)(5660300002)(38070700005)(1076003)(2906002)(508600001)(4326008)(71200400001)(6486002)(2616005)(36756003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?9i0LGiUUnzHYoO72jf1NC8M?= =?iso-8859-1?q?gOaJme9yU+d2R3rEw5+jdOTKU1+zFdmP0kB4b9wcMNoEeK9kvDYzS3Iuw8Sg?= =?iso-8859-1?q?hH3UkvsDMN0j+D26xfj5etlPXCjVEK7E1kWz/eVJLMfpjlkDu1vxGp+o51av?= =?iso-8859-1?q?9ymsvmUuorHba5lLS8+FCgKZ7IrfUpmPp2gMj7uY2ZkAoUtF62PEU7t3fQPR?= =?iso-8859-1?q?anZIH4lLvgJO3M+7DMVVryWle5UB6AZlD3uGNOLr0P2/cnp4MrFdDXNHHgIR?= =?iso-8859-1?q?GumTuSwp5/4aP68oztxCzjEvzHH4SM9KvmwEeVLAANFuOzXLybkFoqeabyUe?= =?iso-8859-1?q?fApIl4ZOnbUUSUYKve4W422WS835tnWo1/5Jy3Yr4kB4F0sEYrQ68QEGUF1s?= =?iso-8859-1?q?cIEeeDuIRPmahfR+N9M0FITnPiGjIU+pKKxcs9zAYC7wo1VvwpA+ehqr6je8?= =?iso-8859-1?q?rx1IJ2FlJInTaZPu5kCyJe4ngDgaPiJQd9EAgyb03iJvukM3GsOUJbPkr31P?= =?iso-8859-1?q?HkTIIlIORZvL2O6hmY/Noio/ZWEoq/e8vnWtTJ9MTTWH4Ei5OeL8nS1E1ktd?= =?iso-8859-1?q?NJTTdpnUpKWx/XhqYhMGic4hgYyktqEeMCPfCwxN4vhfQrEnumkw+wE5cCYB?= =?iso-8859-1?q?DA5UYCqPSAz8us42eYpcSQEzCC4A3UllCf6Ceaow7Ion8ACio6QsdMTPO5v2?= =?iso-8859-1?q?PbF8TleL+KijKP+KGitA5lMArSKUTqInA3P30qMiAHXyi1YDqDtpWsUlM68I?= =?iso-8859-1?q?kfe+XZlyaoIPXXRwhjg9gMKaT3BgFWXMqW09RkZyULFRC6dM9fGBSXkK81IW?= =?iso-8859-1?q?ye5Ff8wEepPMmlwREhST5CQQUf0vDyWddYVY3FYlvYojavR10JNaDfWDoghO?= =?iso-8859-1?q?yT+peC3sTIRzvpudSuh03VLvA9wf/ZjQ03qxxJwGhqAABTExlp4S5ZBH5CFo?= =?iso-8859-1?q?iaQmFitADYF5LwtcibVDNLW7OPin+vqPi6vKRpxOGKHH1QQDEMGNmbomX6hP?= =?iso-8859-1?q?C8jRPimjrC9EhS6Q4//4wjfKJi53IkSbBkbqBTNv+9ScOpNynALt3CJPqnNT?= =?iso-8859-1?q?AN+L1Mh/jRfCGYZE/9bByT/zHFDdDpk8fgoXnopx3bPWOeEE3/nlI7OAa8zW?= =?iso-8859-1?q?6/Iac7FrqVYdwCzMet+lAT5DVR2O9K7Fgrkbqz0MEnj2ZddZTam3Op9GaZJ1?= =?iso-8859-1?q?G4X+Nih38F7KO6kbhvWBXnaQrYrIxpX+vRTYMC5tko6YIleGfVJ7+LHEZWve?= =?iso-8859-1?q?ne+6aVfaeP61KYNpa7cVQWvxz5Uo+YN9Up8qS5IusQq0E7uDrjNeyBXsR60J?= =?iso-8859-1?q?z+VYSR9NnD65ekgNDyCDsJnTQMT3zKkCWuhK74AV2ob0MuwMAQaPQwZKM/+s?= =?iso-8859-1?q?o?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc5ce5ad-fab2-4291-5b40-08d97931ee3d X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:20.3308 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: zGCr070fUMfSNabIQiDYoprJlMOAjlAatVYDUvv8sI4olo8ydbC/Ja9ippeT/+XOO8IRRb0yeRT/kt7qt4ZN0oyW0R0A0SXtRS77EAVJ9RI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh For SPI bus, the register read fails after read/write to the clockless register during chip wakeup sequence. Add workaround to send CMD_RESET command during chip wake-up sequence to overcome the issue. Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/sdio.c | 1 + drivers/net/wireless/microchip/wilc1000/spi.c | 16 ++++++++++++++++ drivers/net/wireless/microchip/wilc1000/wlan.c | 5 +++++ drivers/net/wireless/microchip/wilc1000/wlan.h | 1 + 4 files changed, 23 insertions(+) diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c index 42e03a701ae1..26ebf6664342 100644 --- a/drivers/net/wireless/microchip/wilc1000/sdio.c +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c @@ -978,6 +978,7 @@ static const struct wilc_hif_func wilc_hif_sdio = { .hif_sync_ext = wilc_sdio_sync_ext, .enable_interrupt = wilc_sdio_enable_interrupt, .disable_interrupt = wilc_sdio_disable_interrupt, + .hif_reset = wilc_sdio_reset, }; static int wilc_sdio_resume(struct device *dev) diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c index 602316f4367c..511b9264185f 100644 --- a/drivers/net/wireless/microchip/wilc1000/spi.c +++ b/drivers/net/wireless/microchip/wilc1000/spi.c @@ -47,6 +47,8 @@ struct wilc_spi { static const struct wilc_hif_func wilc_hif_spi; +static int wilc_spi_reset(struct wilc *wilc); + /******************************************** * * Spi protocol Function @@ -956,6 +958,19 @@ static int wilc_spi_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) * ********************************************/ +static int wilc_spi_reset(struct wilc *wilc) +{ + struct spi_device *spi = to_spi_device(wilc->dev); + struct wilc_spi *spi_priv = wilc->bus_data; + int result; + + result = wilc_spi_special_cmd(wilc, CMD_RESET); + if (result && !spi_priv->probing_crc) + dev_err(&spi->dev, "Failed cmd reset\n"); + + return result; +} + static int wilc_spi_deinit(struct wilc *wilc) { /* @@ -1173,4 +1188,5 @@ static const struct wilc_hif_func wilc_hif_spi = { .hif_block_tx_ext = wilc_spi_write, .hif_block_rx_ext = wilc_spi_read, .hif_sync_ext = wilc_spi_sync_ext, + .hif_reset = wilc_spi_reset, }; diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c index 1aad537c468f..f9256c1bad45 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -669,6 +669,11 @@ void chip_wakeup(struct wilc *wilc) pr_err("Failed to wake-up the chip\n"); return; } + /* Sometimes spi fail to read clock regs after reading + * writing clockless registers + */ + if (wilc->io_type == WILC_HIF_SPI) + wilc->hif_func->hif_reset(wilc); } EXPORT_SYMBOL_GPL(chip_wakeup); diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/wireless/microchip/wilc1000/wlan.h index 285e5d9a2b48..150648b2c872 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.h +++ b/drivers/net/wireless/microchip/wilc1000/wlan.h @@ -373,6 +373,7 @@ struct wilc_hif_func { int (*hif_sync_ext)(struct wilc *wilc, int nint); int (*enable_interrupt)(struct wilc *nic); void (*disable_interrupt)(struct wilc *nic); + int (*hif_reset)(struct wilc *wilc); }; #define WILC_MAX_CFG_FRAME_SIZE 1468 From patchwork Thu Sep 16 16:49:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499711 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 7DAE6C433EF for ; Thu, 16 Sep 2021 16:55:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 676D96135D for ; Thu, 16 Sep 2021 16:55:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346931AbhIPQ4Z (ORCPT ); Thu, 16 Sep 2021 12:56:25 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:30349 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343901AbhIPQw4 (ORCPT ); Thu, 16 Sep 2021 12:52:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631811096; x=1663347096; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=t6Ho8fsnJRT4pFlHTfBkDs5XdQV1QaQMzrMxvpD3BF4=; b=yEGQ7ZN4/KW6eiJQzd4SA0dq7m4XWa0FmFNpt2tnOGXPuM66XL8xlS0+ T8TbrEOxmiYiDYO6tcA5D5AbYgJn7E/MpSHouBqe064beL8v8FzBlf0ep Wf4WIak3aaFDAI6b5sIPH/No7iCCdnKkeUWBt41d329VZd4u2mmkm4OX6 fjgp6za5L2I8Pz9rj3vSPYDcYyd9dHxSPJKs2LFgj4aDj6kKOTT3ppeKL hwcAVNABmgSzwbu5OzZAz7CccQRN9NchD5mutZRoVOuqGfRdmoDU565Dp O1yFl9nNj85wGAHIzI/X6dY4csncTSxOWf0vecuBtHm6oA0LuB5TI0R6e A==; IronPort-SDR: bsshP2BcF7v5bMcD+57lGHeZdqUME8o2Q0s0Zj3TXAkRg4c3r1aR4cEeHoa5lkzIHsjy0NL837 hG0Ftyy1BtxdZfLxEFBlmCgm51H2hdlw7skv0LHfMzB7gPno2kfMcFhBYqrON0/VG+kzLY66ZX 3jk08scrBQnvpYmWFg72xUXUOa3VVQal6hO8ASqpq3OF7WK9+VLs7DdcoN1DFu9t+hd6uGTPXG nBAhYzSw20nSDbD8rP32mwE97FwvlERFJ04AJIBHRnJNcCRTeIzAerO9jeqc/XUGfGhhBH4O45 WSyDE9GF/3i1s1KhZfxAZ/Yg X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="136238779" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:22 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:22 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MEszD8CoIC/hsI5fmbCM264m9NepoT48IQ7NZlOQO7FrLhTKxa/1zpZTVGL9LQiYyN1WFeHQHaT25PsKza3phEM5PKP/ZzEZPhTb9pa6gao+hJUMRTN6RqjWIr8mwTknJGkLDcK+xtnIv0PdDjucC1PotciCKomhSHY2WOfowOsOBGmYTV/sIvIN/hUEOEaYureYxBl7rQSSbLt7GI4P2CvCw3B5Mvt0Ls0j+Wvx3HFxndVRWy/EdJwwG8KnDAHr0/kFWwgjAjzardEszHqOMSE1CalyVhW/BIEBHHu/eogOUMfCgG+47AMVNMEaobNqJqAHTJkpw22bU+CjybIjdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=7aPegxO/+CG115n3TIRRCS9a98He08E9uoNUMIfBpZA=; b=PTOL25pr2DQfcpyHdspTByjDvrE1EkMR8Tn9/52RHqCHRmAkbnN9NWUd2+7fu8fbwCS8vqJgbJ0DcGXlbVtcsFBwZ06oO0TsbqZqfxCYh65e1nJkNtpQtdthhKa9eUlKS/ZhfzYdLFUGIkHQNMmknRqwiM4vTkTb9BG/9RkRg8rHu+Ah9FSHsRnS6pPNbzjTWdb4es37ywDcspPYJmWVzMe5sU7H7SAClzO3EQ+N/oquF/2/fvDZO/77LGHjM7RY1kyEXOGBNkhv9/lML/7i6zPo4GPLX4vq2bZFqth4vF/CUVfwfHgpdVj1I+JmE7osmWHieMbfPLyEswBSfX72ew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7aPegxO/+CG115n3TIRRCS9a98He08E9uoNUMIfBpZA=; b=G3emZI/IlA6WJLNI780uYofC7PJeYEDwlh27D6gzRgrazIgyJ/AGgLtNWjQU1uhYRPxA4odKUZ8ZIL8CyX0HRNu34TH8zEgkN9nJfXwQ3ZMhuzS8X9CQHMqHWs5O3KwQKk6ftLPjvMBHbYl0o9PSEKUzNM1Z0mcY8FyXTG4tun4= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by BYAPR11MB2565.namprd11.prod.outlook.com (2603:10b6:a02:c9::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Thu, 16 Sep 2021 16:49:21 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:21 +0000 From: To: CC: , Subject: [PATCH v2 07/11] wilc1000: ignore clockless registers status response for SPI Thread-Topic: [PATCH v2 07/11] wilc1000: ignore clockless registers status response for SPI Thread-Index: AQHXqxrLGIjBTiaNfUSpoDTifV22Fw== Date: Thu, 16 Sep 2021 16:49:20 +0000 Message-ID: <20210916164902.74629-8-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: de28360d-71f9-4d36-505d-08d97931ee71 x-ms-traffictypediagnostic: BYAPR11MB2565: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3631; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3GVurQPY3rdtcf0Uzxj8OxPBa8wK2EkFBJVCt9dlr6hVUHkDwFGMAoamEasfS0T9eYO5rAC1/R9wgq43uBp5sTuRM/3UrSQvOn7T+JMHvwpKuIm6yRmE0MUUYU4S+LLqyndKpAGn3hhyRarrlKWkLwYbT4/TDMbIQzIrYQVw33wPhiz85WHlNjK1/PPQB1H2wlo/unwbooop6LVYbBUczD/gUlOf9O09BVpNd2XjxUoVDA/DXDQGZTqyjX+KJ8W7NHU/218+0HDijZU721Jm5EIV+zUFKGdyCT61SKLU9p7qI8KDDLPLtceTE2DPBFnq+5f2Z9J+mlhhFppot4T74g6pz4faoajD0u4/ROucIw1LVR341rlv+poav2h7mrjDcaH7yeDS3CJ17rRexGidpg/WlC086pZsFi/9NEY3QpJaThc34vPHP8sZtPFWWqRnQbIEalCNktQG4hI7ZqPwAIQMucMuEueXiU1t046FEfjhpLZkfpzZr74bbj+qs0GC78r033OVkHBMc5UYXBsXn8o5ysmxZp9k/2WlUp6JV+yZDjoEyySZlB+veQ3UMwUlHRCmACtetyQ9ecuf2/JOOi8w5FVqLNGBw4RtnVulQXrPIhySYfAGu4iI9p5Tkqggo4+bMTSdk+w/RMaYcjckIV/x6IZwCL+bCgIJViuIIzZiSJYiIeUM7+SZUzmXCBcWFXbaWTEN7bGZ9syKZ1/1gw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(346002)(376002)(396003)(366004)(26005)(107886003)(71200400001)(5660300002)(8936002)(2616005)(122000001)(6512007)(186003)(76116006)(38070700005)(2906002)(66946007)(38100700002)(66446008)(91956017)(6506007)(6916009)(8676002)(64756008)(66556008)(1076003)(54906003)(66476007)(4326008)(478600001)(6486002)(86362001)(83380400001)(36756003)(316002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?bAHxoTT5WFXpFy2EJFjpKNn?= =?iso-8859-1?q?yrBjq5Dx1KcR/R245aB0LsfBTDXx+nXqgos+zdpVo3u+YDzg9rke7oMWwdZ9?= =?iso-8859-1?q?C0cplxxUczDdq5v5BhABvWmPJzSn/MeSpAn2nwjU1NaUJjCyFIDMTBrR4IJ3?= =?iso-8859-1?q?SC82ELR7uIcUFSHSQ8a+tuNGZDvVKGln5LC5Ybx/uKXpe89EbbQoOZQL1oGG?= =?iso-8859-1?q?cytIF5pa6jC/UGWG8XUHX+oLCshkOCw+cqXmUenDVYn4sb+rhsBBGcPvWfoe?= =?iso-8859-1?q?kQVKRLVFJEfT85wT1EfyxpAZidzJN/E8Yx8hX9WDhzpRexp6CCQXwWk2Q3rs?= =?iso-8859-1?q?3ruL4RaZDEM+ktg8Kz4ZkEPjQPEDGalFAtDOm2dN55Vko1d4rqEnk7qaz/dh?= =?iso-8859-1?q?dnm00Gu0Z4xzIbhsJAAR3QCzhh40IN1d5TZfQm8e5xcRq3b3D+D5KhIGYJqb?= =?iso-8859-1?q?WZJAcko7y2mvTAUcE5+4YWmXHgIQQrvYHQokr7+Xfy1dlY529GbbKmuhrBl6?= =?iso-8859-1?q?oUYaSqCx2CFnjX0dAwafGZUpUDsduErNN6dz9Gzjo/j4Vt2Skfjl21hHfAiw?= =?iso-8859-1?q?y0XTqGUJrPpnMG0yJAwp/nOiDoAloovjU5msPpKBFt3WhkjIUS1QmKSRTc4O?= =?iso-8859-1?q?0A3d2SvQTXTnltuJZnsI5yjEAw+nT+LjBCm7Ygu+Vq5C+8x0RGB0vxy+DgfU?= =?iso-8859-1?q?oZp6SlIi9Na18A+9KTMO1eLyHkV1QP5AVKCU1354h92LLggPPjMvy6ysgE3O?= =?iso-8859-1?q?hNkHHX8GMwYQDLZcO3SM8f11F3faeXXfwK5Jc23VVWpkSF3e6tcTgosCMwsD?= =?iso-8859-1?q?oOcFyX2NXMcu81ev/E9jW3jSbDh+US4GxxS8A4AgRvkQXwFRaxRGrOYUuu6d?= =?iso-8859-1?q?I+u6kABXX3yk+h3ATM43Yf0CjTPsDul1QjXsSlkV6ESomDi4uZFgVSWYPKp/?= =?iso-8859-1?q?i4yL1SA+mOzJUOTXV5rjo7cC0Y/yJQwVWgKD0yvC1oakvelNZVLPDPnZpUBD?= =?iso-8859-1?q?9folG4pQ5TgB+/NxTzoyUsz6sSsPCVBwrXmP9jNP0W6CiGPV8b+SVEOLKf01?= =?iso-8859-1?q?TEvAHWW3rEwcsOkoRPjju7bN1QmYvj+5S03axS4f/qs12YyHLG1LbeLHWUDJ?= =?iso-8859-1?q?uNRFxpoxSe9ATVMSmQyUjNCdbrSghj95+LS9w3E3APcq91hU/8yP9UZ+QBEh?= =?iso-8859-1?q?vtU5rg9lk6ocTsZAV3hwo8+rAJ9Uce2VdH7FK0gFnZQ8lw86/5my9GhResrp?= =?iso-8859-1?q?55kN8J3IIuFOa+yZXRworeSUhb1dbUc3LBy2Gv29Bba+sdnNXlDvgGDXO1r5?= =?iso-8859-1?q?5YSd+kHXNOJVjHGZosdMXGmine5RcN+zmNH6DIGJ7ZHJy7BwpaxCzjNWNE/k?= =?iso-8859-1?q?M?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de28360d-71f9-4d36-505d-08d97931ee71 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:20.9242 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: J8HD0iij8F7zZLrWPn6LHuQpYtX8f4v4FShIwWW3h/bRGht7IYWyn/jJ9OEb6fGv7PRBEOz9LfydEyiyFBAAbwPm90QE4Bmrk+pm7XHlabw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2565 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh During WILC chip wake-up sequence, the clockless status register sometimes reports failure even when the actual status is successful. So, for the clockless register, remove the incorrect error status reporting during the read and write command API's. Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/spi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c index 511b9264185f..4f0bc24d2a78 100644 --- a/drivers/net/wireless/microchip/wilc1000/spi.c +++ b/drivers/net/wireless/microchip/wilc1000/spi.c @@ -474,7 +474,7 @@ static int wilc_spi_single_read(struct wilc *wilc, u8 cmd, u32 adr, void *b, } r = (struct wilc_spi_rsp_data *)&rb[cmd_len]; - if (r->rsp_cmd_type != cmd) { + if (r->rsp_cmd_type != cmd && !clockless) { if (!spi_priv->probing_crc) dev_err(&spi->dev, "Failed cmd, cmd (%02x), resp (%02x)\n", @@ -482,7 +482,7 @@ static int wilc_spi_single_read(struct wilc *wilc, u8 cmd, u32 adr, void *b, return -EINVAL; } - if (r->status != WILC_SPI_COMMAND_STAT_SUCCESS) { + if (r->status != WILC_SPI_COMMAND_STAT_SUCCESS && !clockless) { dev_err(&spi->dev, "Failed cmd state response state (%02x)\n", r->status); return -EINVAL; @@ -571,14 +571,18 @@ static int wilc_spi_write_cmd(struct wilc *wilc, u8 cmd, u32 adr, u32 data, } r = (struct wilc_spi_rsp_data *)&rb[cmd_len]; - if (r->rsp_cmd_type != cmd) { + /* + * Clockless registers operations might return unexptected responses, + * even if successful. + */ + if (r->rsp_cmd_type != cmd && !clockless) { dev_err(&spi->dev, "Failed cmd response, cmd (%02x), resp (%02x)\n", cmd, r->rsp_cmd_type); return -EINVAL; } - if (r->status != WILC_SPI_COMMAND_STAT_SUCCESS) { + if (r->status != WILC_SPI_COMMAND_STAT_SUCCESS && !clockless) { dev_err(&spi->dev, "Failed cmd state response state (%02x)\n", r->status); return -EINVAL; From patchwork Thu Sep 16 16:49:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499691 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 539B7C4332F for ; Thu, 16 Sep 2021 16:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37764615A7 for ; Thu, 16 Sep 2021 16:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345415AbhIPQw4 (ORCPT ); Thu, 16 Sep 2021 12:52:56 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:37580 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345767AbhIPQut (ORCPT ); Thu, 16 Sep 2021 12:50:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631810969; x=1663346969; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=miBKW1A5kOwkQr7QlttDiag02LSAl+Fz8dEu7GmQ9uU=; b=KefbXw0qdXU1/ZDJLIhOpcxZ2tqrV90eWcL8w0GotP1jlJJvw33JbHjb VwuYc0zBV+OoAqJ/hcdqYcJ5HzpuY2gsTS1CO4jo0utVspInOz4zvhttJ bk6iokRWD8vnemxXMu16JQT7NnMu1EGj3dX0NnrjyDzyr5D8T4hanPdgK hR3GHGynd2L3SLogCsfstEROCYdYlDTKDAGtT3wstXai1nbPCxScEMzws JM8iT3pChAyeARnM2C9GGxfRfOvtob5j0eNTj6K7k+amqhT/yI4mz7Ijr BMsZcSF/KSKZWMU8N1MhRLtmr8zu8nvZtOkQmn+Fe5oOepf4GpP808AuQ g==; IronPort-SDR: Zp6qmoYmYNPtP9PvgBnp+UQD9H2z0eNM0mEtoD8qah0T2lnniM/mqCRCq54V0Jn3cH/o6eLlru eApoB5m85hxuOMmO5+TXoog60RpfWUAkK4CsdY/uwJWPJgfuxa7Q2p5uf48HSdx0qFMJsmeu52 mmWOYL/4WgGGOaRgH+YLUHsh5yHEoxXeGU8w04intCL+yhRz/qiz/iCqrlHFLemZqH5+iexIu5 t8usPnRRyEMlL/pfAXga6jzCNUtwZuVZ2xLSGrnUwmRvey6+YE/RTW9ZBo2JvvUlU5hRKQM8Sy x5/H+6qccLpLFk22hQZRFztp X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="69561226" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:23 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:23 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HK60g2oISJkIjj+XTp4uXuCSm7X/+ioUsLtrq8kj5bKX3mm1ri+oL+LzzR3kK+BT5IpUunEuaGTYiHftZu44JXEJlgOC8I17MgCXwJVQhkf/dnv1MR/AXWRaRnWBO5YSsd7dnLmJacrth6kSUR5NhYxe8f/v2n2oiEX/j1UVy7JwoEON+DuNnjaRZpGduXa67SG/CfvC43/5mZFShV/cvqMMG0k9JoktYD4El46jR1WcWckEdArNzGnMU3KAZDircEmqjFOdlNacpqC60eM6kERw5bXhspmYzU92gXVGcvqPBOvfIwL1fx2MXDpNSS4vQeM5kMQTu6IKG2pbXF8usw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=J3+YB5R7EWngunUqS4whTk1DeznLp+z39fq6UZ/pxTA=; b=JFwa8XggQ/pmPsD3bSZSQz7AFnjLWODQDX290irDSWhrclgRbL9N2eRUTy44z1zXTNcsJ/G+I8uHeFlRxsRPk+RxMW7cZWHo2hLQDUf/UYaS+zZmpceV8TImUnp+OW0GXtSgfgN3ofJhl5cP+OX0cxXgt3y+Zs1FXJVxIcQj9eVVMiI1Q3/mKJiCE2IRgW2tVRsbLA+Qd60orp+ZEOONVDfgsEHIisV1QSBSPTj+zGcC9OwbYq+vBF6XEsufoTVGWR52Zuhg7tfQDBN3TIBYc2bmDjqXLf7VhjbM8Cm3NVD3cgnQfPckdzIBvMCRgT8mLF3I4e+S7VZVzZyrA15naw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=J3+YB5R7EWngunUqS4whTk1DeznLp+z39fq6UZ/pxTA=; b=p+xWUdFPe1e6nMOczHKLIdwVJ5Ucij2piiEFNEMbII9aK6jicS/jCJx3JexholJJePn+LjAbpX3+L37gCH3SK4BBuS8uBlsZdbKVhKfeB2enjsHi8TAL8w+fR9C09rIvR1JQ2RwMOY4f0kkBJExS8s+hV9kb3Kd0wtgmCfdDdy8= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by SJ0PR11MB5197.namprd11.prod.outlook.com (2603:10b6:a03:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Thu, 16 Sep 2021 16:49:21 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:21 +0000 From: To: CC: , Subject: [PATCH v2 08/11] wilc1000: invoke chip reset register before firmware download Thread-Topic: [PATCH v2 08/11] wilc1000: invoke chip reset register before firmware download Thread-Index: AQHXqxrM6R4v6RJsvkKwKgX3Znnhxg== Date: Thu, 16 Sep 2021 16:49:21 +0000 Message-ID: <20210916164902.74629-9-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5fb51ea4-c96c-4518-7aa1-08d97931eec5 x-ms-traffictypediagnostic: SJ0PR11MB5197: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:612; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZZWj1aKk8aKXtlSWX+52T08kHi9xSkSOS37C8j+mz15kM0bp8sVMXTqbcDAoMsIIqIKQcFXGssyYwXMV1euiqSL2v2xYzbhTdJEVixqriu34+QMxmDtjxy3UZvEQ2DbNaYBrvgucYjZZCiyBb6lr7IBW+ofYb40cObakgyoOqeFHuNgiARh5TRVV6tAOvLIfnVE1XjflY9JheZkj+H/zp3wL7YCn4+v6Od3NNG/zpyokOyC8ylMOkKpN9BQHQ4WHxV328D5ruDztz5KERSr5CHL8sENSkYfIWCa74WVS0BAzu/gOdo8J330ljJnNKQ6B4BJ2uXInn5XcnCbJ9MdXy2ctogIMTkfM3nwKDHB05JcjqBHSTLZ7bBvvXYC/7HtbW7Zrfu6uUQonJLM1tXd9MahuB5hYV0PvHVdWFNGf2hZTI/ztZZhSmTeStG1gBnCkyhINCKYjtxJL4qA2VKBzj7VYd2fcBcMkpp23IaaUY98BMY/1TwggNajrfKY3mJu3As5kXJkqUpx/7iv0aAZo32mL/y2/v7trcrQ7s0LNRdfrZpym2Q9/ZcVdlSgcIJKN8OBGCdfRpWgCQZ/roLJvj6VGSieLIeEah/8ACHmY6ZGhkr2HsqyKYTUS8g4gvzDjSBqJ6JHx2G0VnPkzjLNzllcZI8HJYyPoUGD6a0J/Bwcv9ryDo30Asj61s6NCQmbuEvjDc359oO65Sju44zk3bA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(26005)(107886003)(54906003)(76116006)(8676002)(6512007)(6916009)(66556008)(66476007)(86362001)(64756008)(66446008)(8936002)(66946007)(91956017)(122000001)(38100700002)(316002)(83380400001)(186003)(5660300002)(38070700005)(1076003)(2906002)(508600001)(4326008)(71200400001)(6486002)(2616005)(36756003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?PfPAiLygq9hxFAo4fgTRTIR?= =?iso-8859-1?q?PUEBd3L2dr+ycuTM8lnNFxmyH6+SrG81yRM/15ouinVNVxJPAVItl0bTHJme?= =?iso-8859-1?q?L+zV8BgYEU/n5D0xInr4bXv2CqcDcRbTHb1JmuQwpEyCTFDoHNb2uiPKCpKc?= =?iso-8859-1?q?AHZjtvgBBKjU2gL2iars55ZmCfyXre5JSXWU8azUU/v4zeRiOA8n8eLcOVh1?= =?iso-8859-1?q?JTTHKx7v7O+Hto18E1/nj5CIgUT6YV9ItvFPPeXP4gFbmIHydNT5+qI72N5v?= =?iso-8859-1?q?iqoDbDO7nPfqVw0lnaFQUX4JwGdmnppSqJ82kmsBkv/8TVjts421EIxBBbEE?= =?iso-8859-1?q?2nbbk7rfaOaDTni4pknu1FScH6D2Oe0vsEQTAzK4xfTrkdNe4Ple7RDOZOYR?= =?iso-8859-1?q?th965B4XZZWL0yB9covAvJsphpExe+Bp2TLIcIWWUgKkI2wksBiYtXg1xkZZ?= =?iso-8859-1?q?YsYjKVYXWqOm8OzhyHOeOZy5ZO6bb5F6pZDxu/OgkCe/S9tZk52iR+02v+CE?= =?iso-8859-1?q?QO2zvemp4Ku4/OlrqF+mFGcG5gSrkBztCT6pSO8/cq1V1ZgmKNtK/OevpHW+?= =?iso-8859-1?q?gLiWR0a2REHM0NmoTYbooCRJ3Lq6pOtB3SXphX+7vOyf7e07SF7Yc1unGD39?= =?iso-8859-1?q?dvtJw7V31ckOP5Wif16+2S+Xb8LiBB20VS2F5GAwVvlxyx4MvTR8imzINdT0?= =?iso-8859-1?q?9NAtFTB8tiIQYLf47PL5eI8SyFlPact9RYw8ppyHUkxT6Ud5MC/Bvg99P/cz?= =?iso-8859-1?q?zZadWcZFkP7N+FhyNuTuTX8KiIzNG/oVPydtai55vSVPojn1NWRu2GXpG2VG?= =?iso-8859-1?q?zlCZWo6G15MSX+VRba63mOvvUHQ4M6VJ4AL6vqCBN5FVW23dMkH3FNrzBJ4m?= =?iso-8859-1?q?/iN/86yv6vEnms1hfo4OFrZX9yKYOjgWTmUyNbvvYJw/j1YNSnSBtaZcLOLQ?= =?iso-8859-1?q?fOdxIQDoqN8IZmd9I5s6aiW/XCYBYk3gAlUmTw2cFEXcA5hXAzCK0q4f0b/o?= =?iso-8859-1?q?wS/xGA+iOmvM+c+3Ks4MPqSYP0l8hm0SzRSKzO4kPUzJnJNP+0Dxu0vHmuUu?= =?iso-8859-1?q?r7p+uopMftDFmv2ZQ4rqYJcDA//+6oWiWDH2P0QpoQCuo2CPG/MXHbitRwhj?= =?iso-8859-1?q?iDr61fZ9FZzLuhy3+PF2NJcTgiJcIQhi4HPa6eAKmHhlEC1Q51u6bzD17OfF?= =?iso-8859-1?q?GGbQjiRfjtUMc0/qoT1VC+EERF6xkymTFjSEuI+3xvv+skFkf43Es7Qg4q5+?= =?iso-8859-1?q?mXfDj3A+nIIQ1oxw2dyZ+1PqfCEZkVX/PSf7WlegbXV3cZXK4I6OaWg5yNSE?= =?iso-8859-1?q?FXJuwtolRPDujI2x/cdguODOrNU9mPoV1M6cBmEynN7WkgWUIiXmqDbASW/t?= =?iso-8859-1?q?H?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fb51ea4-c96c-4518-7aa1-08d97931eec5 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:21.4768 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 24GHZcIhPQUoKVeQJrEFZaV5iBGdPSfPctHqWqp6Br6T+0ilZZehJFouc0YMingj2g5bBpLerQibkhVYJzfso6mjbRJSpDGl3H/fRiX6GXk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Add the chip reset command to initialize the WILC chip before downloading the firmware. Also, put the chip in wake-up mode so it is ready to receive the firmware binary from the host. Signed-off-by: Ajay Singh --- .../net/wireless/microchip/wilc1000/wlan.c | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c index f9256c1bad45..de5287cd8652 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -1080,6 +1080,7 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer, u32 addr, size, size2, blksz; u8 *dma_buffer; int ret = 0; + u32 reg = 0; blksz = BIT(12); @@ -1088,10 +1089,22 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer, return -EIO; offset = 0; + pr_debug("%s: Downloading firmware size = %d\n", __func__, buffer_size); + + acquire_bus(wilc, WILC_BUS_ACQUIRE_AND_WAKEUP); + + wilc->hif_func->hif_read_reg(wilc, WILC_GLB_RESET_0, ®); + reg &= ~BIT(10); + ret = wilc->hif_func->hif_write_reg(wilc, WILC_GLB_RESET_0, reg); + wilc->hif_func->hif_read_reg(wilc, WILC_GLB_RESET_0, ®); + if (reg & BIT(10)) + pr_err("%s: Failed to reset\n", __func__); + + release_bus(wilc, WILC_BUS_RELEASE_ONLY); do { addr = get_unaligned_le32(&buffer[offset]); size = get_unaligned_le32(&buffer[offset + 4]); - acquire_bus(wilc, WILC_BUS_ACQUIRE_ONLY); + acquire_bus(wilc, WILC_BUS_ACQUIRE_AND_WAKEUP); offset += 8; while (((int)size) && (offset < buffer_size)) { if (size <= blksz) @@ -1109,10 +1122,13 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer, offset += size2; size -= size2; } - release_bus(wilc, WILC_BUS_RELEASE_ONLY); + release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); - if (ret) + if (ret) { + pr_err("%s Bus error\n", __func__); goto fail; + } + pr_debug("%s Offset = %d\n", __func__, offset); } while (offset < buffer_size); fail: From patchwork Thu Sep 16 16:49:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499707 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 AABFEC433EF for ; Thu, 16 Sep 2021 16:54:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 905CA63275 for ; Thu, 16 Sep 2021 16:54:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244653AbhIPQzd (ORCPT ); Thu, 16 Sep 2021 12:55:33 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:34431 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343846AbhIPQwm (ORCPT ); Thu, 16 Sep 2021 12:52:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631811081; x=1663347081; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=E7/VJTemAKmx4QX7PmjUd6Ns5GQOhLDgrcY9E2FK77Q=; b=Ls9Vy9ehJ3wBx83f3yGz+ZtmKJC7cRWjxT5zb9eV4g8jwxapH5zi7keb OUgADaW1+8RWshXR0mh3Nd/8ffYQmjRI/pf2P8KNi/C+U8O2S3ME//4H2 x76ejlT2bA+CcBFfFlw9tAvOz4svHDBqPNJLhvq7KXRxpyObayAwo7nAX W4kVwMYX3M03EtZYacSaC4rv6R7jXOF3oMMmbP0rJGe0eO4uYVC9DzveA eXukrwW+lwTpGcOwR94aJcocQUICFr9k9rC5cy5zJzHpmEBcT5Z3m5sfV HlXec+OxiD/g/FbmbufhliwthpWbNUi037SZzouIA9Wy4MzD9V/FXM/mQ w==; IronPort-SDR: i+9UVPTFwUfV6rohwad8OZ9wlNfkG0v59OKc80FGq7yVWst9goGzsZ3Ow3YirifxoJCEruPbvA bH9aEEy1FHasKwZsHuNPVxhHS78Mv2yhAfp03FpfZb9fTAU6qErC49i3EzlId81BwMTZSt+r1q /ZBSyxVsvcyhv+jfsiA+0QMFju7VWV6jhQQwizs1I0g0nDg8cWi9ahLlvpAZ3Kqbhf8yQlbg6U g6WqnMplxOFRBSFRXUvY5jkewYw1aXrrAa6hMc/CdTtCXdx1JBdmCNIk3ZfQ5+YJmAprGsq7aw KrG1qmWc9DBvHJB++vX6w6Lm X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="144413620" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:47 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:47 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WCVXXJHglpuIP7cCiF31ZVkQF+U3+5JbcVFdxIvZeNNM5ZfUg8k2+ZQcDjVyXnzWm7wjh6qKFQ+dpbhgUaixTVdo23ZCtA5n/feM+dXXMF1sP+fK67Mjj0GMBqqHf67iOx7Xi2VMQzw3oQHiUEMvxiXCAdQ6qZUwZWGwiLSPe+JVn32sPfSEeoDPG/K8Rmc27DEniG9/PkgqSxIRreb9MZe5fMWBnR00kCgW/GHMvCPRqmE/dVxe9NnmoGU/1n4lTtEXVYXH+obNFo3ikFr5rn4FjO+x9zQxHkAYIMtm2MkDiX66w3Rp6ADjDJ/NGymLOCTNzv9LRKY68px0xYtG1Q== 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=13y8K55xgPs44YuU/qwIYCcifdyk7ZBRpoQNW6vmzRc=; b=XYj8Zikt/Pay3ECtzVSzGAREpiykt2r/2ANwUVHZyZ5/OmCt9UBtFe1/QKkS+Hyb1nILDiFGQonGJix/PTtxGMYqUbw5i/oZKsOG1++rEPB4ZnT7CLO2k7WauKZCGViQhbYP7w2LjEy1IasYudEOIf8zxwXU+GJlXCki/R9wgcqbQdyDLwEdGqlu+9DYxOduoAfgSwaxlJVuWs80iZstQBY04yAe3f/EUMX3Z51GOrBSA45mhPUq7YRDIcY3yrClHvZzZfe0nOlkpqs13pI48hhBd6GeTRW85qa30tlENDN2+Nup0swVJ5Ho5h0yIPnJUBkN5J8TuJtFm/K0VJGVaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=13y8K55xgPs44YuU/qwIYCcifdyk7ZBRpoQNW6vmzRc=; b=Tj7rgLDHR1JUE0WZ1YXveskVqjP3kda3mDpDsFMn5toJeiYza/djaETUD3THgJpmV5ywdMe/YLNMBeiiw5olUrKf3xXe0T0BAX2+BShOwGh5imX6I+PAybhWn7bSDQZ+VD29SUnKZj7Gu3ZXOB9+uZWz3Y9teE1g9X/S0/LcxjM= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by BY5PR11MB3990.namprd11.prod.outlook.com (2603:10b6:a03:18d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Thu, 16 Sep 2021 16:49:22 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:22 +0000 From: To: CC: , Subject: [PATCH v2 09/11] wilc1000: add 'initialized' flag check before adding an element to TX queue Thread-Topic: [PATCH v2 09/11] wilc1000: add 'initialized' flag check before adding an element to TX queue Thread-Index: AQHXqxrM213mtmxsUU2Uht1acpP20Q== Date: Thu, 16 Sep 2021 16:49:21 +0000 Message-ID: <20210916164902.74629-10-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3f1dddd1-a4ed-42a9-265b-08d97931ef16 x-ms-traffictypediagnostic: BY5PR11MB3990: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4714; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mkhIepxSgMQzhCjOeEDCLEbgn/nwkVicWeAxCvndg5PT0VrQ7/3i5ynpYtXzI9ylPh/j3aIZfGvPgqAZfyq5EhKYsXDBlqj39UpNQRABWQ00coTBlrtpN70wOZyaGstqgdCDPKK4h/nLrSfNSouuNcBKxs2XrwhJwUrk2tq2pn17cJbUplppYSfSIR31gyyv2dQsxCu9IdcmYn2yJRyuVnPSZwmo+uRgfMQ4Fd81I31M7DdAfblrHCuMn+KQYMI+2L7BZ2VPMnnUu7+7ctjCfemdgI/LQ6r7jYG4V4N1XWtOLRjDSTcDTrFXPkNJSpIATg6ufsMkr8goA6uKnDNmJYlB28HfYPalqZfmwHuxbWZi61X7ezfbrHjpuHlEXDphWWa2Rx9QoYfVZIch1qHzmqXQWam9E9rYmwOftOsDJ8osPI9JY+VMkZFrttxrw0KY5c/hgEWzXcDJKri4EIX6Hj9xC7J++1yZeSITZgRarQnNCcNJ7Dk7INu20f9avrNSgsaimYfKci36t8y1lzL0KR6o2avZccuTzEXzmfkzQ01nkXmMaFa2vLd5+tLGAtp6QmoBkU/oRiIVW5ecmSkD50uuEYV0eiIxEwvZUWeudT+95m3rpSi5gnjge/MAsnSfydYYl+QfUYRoUhCoIC4O1ljsyH89fKsYGGgv+LNvjlkHy0LIqcJChxGus90RbZMbvoDFq16dvoFHjQdQJYOKIw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(91956017)(64756008)(38070700005)(38100700002)(66476007)(6916009)(8936002)(76116006)(6506007)(71200400001)(66446008)(2906002)(4326008)(107886003)(8676002)(66556008)(5660300002)(186003)(66946007)(1076003)(122000001)(54906003)(316002)(508600001)(6486002)(6512007)(2616005)(86362001)(26005)(36756003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?zwm0Ry8tM3P2Ewd2aCiUk4P?= =?iso-8859-1?q?KNc9AInFPc/Cf757VVnHWIELZimk5fKhT8h+XieOLZhsfGMNtAh0REHcgeM9?= =?iso-8859-1?q?AcipOcG9OD6HIT6P0BEjCeso4VeeiikAIGjsNOOZr3tzCaZt+QRkqeok9v9S?= =?iso-8859-1?q?BxykxyfA7wteKrlNsH0KlZtwrjhiF+mAePBUYZ93rV0dWkH8HGlwsIvV6qE8?= =?iso-8859-1?q?mk0BT4WG2Y9hR/snKx4ztKYoG2x1gTOZDMjwZBoCHElRyC/SR/zswTazwxoF?= =?iso-8859-1?q?iaetpCTKb/jfNsDiEGaT2YlZ1Zqa7+GI9CakH97ITqzlszmLWrkE8X0UA3GB?= =?iso-8859-1?q?/b9Ge5sfLmv1GwJLFuKFzx/GC2pWLP7zpIe88hWQMOH0/YQ7+YPETXhNodr8?= =?iso-8859-1?q?grNw19okXI3na6CzeZD6/HnMQSB+IO3b6m6lOM4xGJ0CvQbIji44eeEYQHv1?= =?iso-8859-1?q?LypiAFBhAyo1AjFlCtnF72mdNPaZD/ZxRKJPn36rRtwelK7SNIQeY9TzGGZQ?= =?iso-8859-1?q?GteWIzL/v5TUgyR8pmKLlGsorWdQjRY2/DZB4dBplEbhooqaMsQotSQgOtuU?= =?iso-8859-1?q?FE0HBPCvI35m8XzBhov6UVTK8xjKbC6wXxk3vX133ZX/6ekg1ISFo4ZaVCZu?= =?iso-8859-1?q?14Ks1n1VSBioiqVxdEtW5x6+rSA7H8jLT/bB+Subwz8v4SpMYA8jRWjDdOUd?= =?iso-8859-1?q?DLlE6re6obNbb7OVbpdmnZtbEYJMhZkH6+QKbYYt5q/SdBIrqkqzjEr10j70?= =?iso-8859-1?q?YttGWpjo8csGojIUcrijNege5ZfOaHk2b5CfBmPTT3Acx1F911Ckwv5G0k/z?= =?iso-8859-1?q?sAr06EJ0Og1TRxbLGfOzGBIXp8xCkW906VTD2KVT7roXz0BzuURFM8aFlrEk?= =?iso-8859-1?q?3XfTD1fW8YCMRfsz+lh3RVqsyUr8s4yK027rgE9h8eCLv/mvZU7CYFeXPoSt?= =?iso-8859-1?q?944TqvPY+9JHv7k0IJJfPJZXsBUqzdyQDW6HyF4an0nWOBs8KFXIoWe4K1Dj?= =?iso-8859-1?q?6ctZSSG49+8IurGeHeV3eJkrCfv99UUufwZBD+l7tTrTZHmL/pjI+ogc7jlo?= =?iso-8859-1?q?Ujk6JIqTJldozaBsGUNlRpGod6cIMmnub9UDomd9KXhUft8aQuaMRnlixVBt?= =?iso-8859-1?q?7usnUZTSlHuh14p5abH0e0ahbrhqUKX8jI3xNZH+GemQ5L9bmXSJgqk/c/or?= =?iso-8859-1?q?X1xe2nifBxjZ++vuUMprxIetMU2KbFLopztMvumMzsOwWz9DH4UqxvaEGZ59?= =?iso-8859-1?q?8K/FfFHxHQhI70JUOYvOprAEzC/6gKKbUi5zrKVrhaPSKogAjFjingQcINPI?= =?iso-8859-1?q?HRl8eRPsGiw7D7OCrMrQ2aqV446vmv7uADgu3IEhW8WTgZl+ydWBdESyVq4c?= =?iso-8859-1?q?p?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f1dddd1-a4ed-42a9-265b-08d97931ef16 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:21.9557 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 54blTtq1upL9KWuK/OAsaUNAvuW/e3QGPOqd9VvEXBkqKpmG7J9dEvR/03heeYjTWy4n8Qe3EvkvTJR0M+YjqLJj8scQZviSHyda5VxNdXc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB3990 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Add 'initialized' variable check before adding net/mgmt packet to TX queue as safety check before passing the commands to the firmware. Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/cfg80211.c | 4 ++++ drivers/net/wireless/microchip/wilc1000/wlan.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index 91a471f3b1c8..dc4bfe7be378 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -728,6 +728,7 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev, { struct wilc_vif *vif = netdev_priv(dev); struct wilc_priv *priv = &vif->priv; + struct wilc *wilc = vif->wilc; u32 i = 0; u32 associatedsta = ~0; u32 inactive_time = 0; @@ -754,6 +755,9 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev, } else if (vif->iftype == WILC_STATION_MODE) { struct rf_info stats; + if (!wilc->initialized) + return -EBUSY; + wilc_get_statistics(vif, &stats); sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL) | diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c index de5287cd8652..ea81ef120fd1 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -427,6 +427,11 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, return 0; } + if (!wilc->initialized) { + tx_complete_fn(tx_data, 0); + return 0; + } + tqe = kmalloc(sizeof(*tqe), GFP_ATOMIC); if (!tqe) { @@ -476,6 +481,10 @@ int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer, return 0; } + if (!wilc->initialized) { + tx_complete_fn(priv, 0); + return 0; + } tqe = kmalloc(sizeof(*tqe), GFP_ATOMIC); if (!tqe) { From patchwork Thu Sep 16 16:49:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499705 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 C6DFCC433F5 for ; Thu, 16 Sep 2021 16:54:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B086263276 for ; Thu, 16 Sep 2021 16:54:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244546AbhIPQzb (ORCPT ); Thu, 16 Sep 2021 12:55:31 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:34642 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343976AbhIPQwm (ORCPT ); Thu, 16 Sep 2021 12:52:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631811081; x=1663347081; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=5UtSD3QAqd7fTYDBU4dSnzbVn1i7++hLYtCPF5jehNk=; b=xyD1HfDp9JHci3AdakfpUONlWxS11LB2R1kPxmP6YmUJR+ZNSU264PwL W+RwDtYMl7clbmUPdYQEwBD7dNtbcJJVAYDOZP3HqvnUi65b6drCC2siO Gd+L2IHaNPMX8e378CWE5AojZp5A/JtnjbmRMUjHZ/7t5jJbAuxpJCIV2 7EBexiWajnoR2PxQ9gGta0kZKhzksUKBvWmjScz1JdyNLOBx9UfTOAobU D058PuIu4CEIwNZsxcbFJKSfXVnzTZ29EXNJfefmoynL4OCzq8U1fDhCu uvqjN/BsQJ/YcDdz2AU99Y2a84te92HdgRjaQcKEiIWl2GqeOBsfDJYK5 g==; IronPort-SDR: QzLtriVhQP0ELAdEbSe85xAVbiApWJx1M/07qCcxMiydRvnka9ZIq0EIrjpHFhQpRV6ismss0U /8BHglTyzvhFmOhUbQJhcQqnELUu+1T5y6/BHcoii58sduMopgDK2dTwS+IWkC+p6Ox3sSJw4h 7TsDZqABWRjpfFBiLHOY7ecJC8rgUnPa5wS6wRnjkgt//CGsCULXdp3XSr0zgkulWBNgaWX5dm iILedT59isHpjsFtkc7ahw69TV6L1v+xODkoPclEz8ojgyO9imHZU1/jDrIPkhtUuqDZHBYuHE msgAum7uixchZy/Zsigs0/7E X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="144413621" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:48 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:47 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G86Gb24WLCUc8u+iyD+WjmR812oDsx5D5vMXne8NOHTglbA8Eh4uginTGJAmrdb71Xla1jpT5fZHJXO2ZwS8F/tOcBnk3XKlG2CCQVhBGrf7GJszMMZxdrpIoyk+z0mnj6Cy05EvlPPR71sOkTuNRsd+csJpab8e6GYXN3UBcO7FL29XrqfX8fkumv3YrBuOZ70y+loQGUI7C9iao9C3fDB2afEQYGSEX/74eg55aIvfyZ3HN5Wfedm/ImZpCuE1F5tUDUUEo51BELbSGPNhia8nqi19BA4zsuhnP3ZgYJ6ahdELKx1WaY76XHqmIhpBLZ5MDmU73DTCxz8ZYYl2yw== 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=JUYqBirkuZcPPN56mRtuHFxvMu+b+pybLYpkBJShjjM=; b=j18/vQSTKU7QWfid8GlfNZGHNhIIIaX1cDR6Q4LCTlg049FyBtEmDLuKXysuUiHuRx+SpcniBPBxBYnliHBGfgBHDpxhHU5dMZ/h9bcRXN9lsMZS89o2lAesyTgIWszKdSg3vJF/0rroDWWIyx919N3/3c6OfvjbiQkcscGmFpbqpLuX8eMvkVtuKCDeqrvPz3L1jcQwO/H5oaQLXlorJcgPD//sjUl/Yh4PR3AWfnXeQ35kIrpBrm8IBVBhi8xtdxFF2I2WypxpGkdDShg82GPbbKA/6KVe5T9oZ+MrFlJyn+aSTmn50S4h64Pk1yzPbSle2D3H78Jsc2JqMI6jkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JUYqBirkuZcPPN56mRtuHFxvMu+b+pybLYpkBJShjjM=; b=k5CO7XDEljcP5DyVxyRMVWuZDcWtvjp4OCJzHmGlWlGL1RxHTSiHDBF23n20SQoWJSOfpGU7xfH7SVIIfgG+Q6w36MoKonikzQscK6D4/4YalBJDdXDTsDFV8T0UX9RlPpnl/zO6tvLtJnBZufS0wFzBDs19qs91r6yTj3eP+d8= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by BY5PR11MB3990.namprd11.prod.outlook.com (2603:10b6:a03:18d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Thu, 16 Sep 2021 16:49:31 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:31 +0000 From: To: CC: , Subject: [PATCH v2 10/11] wilc1000: use correct write command sequence in wilc_spi_sync_ext() Thread-Topic: [PATCH v2 10/11] wilc1000: use correct write command sequence in wilc_spi_sync_ext() Thread-Index: AQHXqxrMFSlUj9OZo0avjyjHukVIrg== Date: Thu, 16 Sep 2021 16:49:22 +0000 Message-ID: <20210916164902.74629-11-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 48e4f2e8-bc41-418b-3655-08d97931f4bd x-ms-traffictypediagnostic: BY5PR11MB3990: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4303; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: iNYt+iqitNVE7pBX1u/ctcgpudyq1ystbKTsmZ3jK3t3BKz5JCv6Xz8rpeRN1hjw4aHhl3b+g9EqGwAAC+RfsCz1QNuwRtkoQZVPNCCaruiS1FkoPrErQZUFXMvqylFd42zXiGGmnIRfLsKRqZO9cl8UGwWNEX/VzKkmpqdjK4lHccdPyrtPJrJgjq/jqrE0KJjDOc1/uWenRF9z6CyYzrouG7tROjs+SkdNHVxXjqxMkAlEuPRiiU0/2okXQEsm44z99dVFPpkp5XmVBU+S4fDwK8t+Nbn9icCUUQesuPtgqdrV0imUUy6mvueucBIh8WWEnxhvMPdgOcRWZTw1KXRjTWkqus7HNry+QMk83PMbT5007N3S44zm3o4740gagW/XhH9F4WC2IlrQKsPUg/q8Lsb29YG1AOGzu31pZvLgv7q2wx0UGYXdIrY6QFiASSPUGQcXR6gwzTmEyTPceGXLcc0nycRT3pn3aAJouCe1XxDNbMJZvJg5jfItiR5to6MIGli6R0ov4002IzvmXmPRBjTyd7kSQp0wN2F7Ct6aB3vsbOnFUFslY+w2tdwrGnNqItyu+MTErVRuNUAYJEx5f990+jnLsjHu77Ewv6DM92iVHWZ0DpzdJifeKt16b5sJadAD46NVJu1pL4253au+O/+DsQu5Xq1srEtmVJ6cDVPC69rnoGqzx67/YYy5G9fLDBhyagyTyPrG+Uk8DA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(91956017)(64756008)(38070700005)(38100700002)(66476007)(6916009)(8936002)(76116006)(6506007)(71200400001)(66446008)(2906002)(4326008)(83380400001)(107886003)(6666004)(8676002)(66556008)(5660300002)(186003)(4744005)(66946007)(1076003)(122000001)(54906003)(316002)(508600001)(6486002)(6512007)(2616005)(86362001)(26005)(36756003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?aMpBubWmYroO9c1uhIdHnd2?= =?iso-8859-1?q?f2fTP+G7V/kv6a23o8kvc/aiKhv2E1ZB3Tp2GTNWQr+JUy8/sWPiBZVHvt7B?= =?iso-8859-1?q?caAAk+IHA7rdfWL4AcbuouFauJ9vy4dF72TEh0VU/xP2Phg6NsqRecSPi+du?= =?iso-8859-1?q?3Bv3IhVQc0AmCd5saiIXUq0CMaqLsr9Ci7O/+5IT+lQ2IK34iqqdSMgFWU6R?= =?iso-8859-1?q?ZQCqZb3UFagb1AEg9bX3eoHmc8U3sbay4mW0HWbvj/osjmOmTfmUlbMKTeVA?= =?iso-8859-1?q?U6OvmNvvt/UqwQnso/Yk0bkyTZ7B+VauiTTmqKJQ4lbjCO1kx4W9A/dVEuZ/?= =?iso-8859-1?q?ynH7PXbFFf+IQqJCZBfJyVoHeUSudD8+FJ5X+N8hMdVBIIBmwsXPnI/20av0?= =?iso-8859-1?q?oDpzRkaao3b0dgRUyLGug4l53dJtqdaVCFt9nZBLliTKBVNEe8DChVD+iLrW?= =?iso-8859-1?q?M/IH/dVyI/AFd9zVoJcG3uhX0/5KkrDzv3c6NwaEMAXNEpsdD+HldQUxfL4t?= =?iso-8859-1?q?o39cRcC+b7JycdnrLEv9eYgXi5e46edZKzdLzeR2dveCisx60SR5oQM2GDmH?= =?iso-8859-1?q?7JQFuboUTf9KbOXDjCVCfzQwvRew4NvKmS/21j13opYIyH1RkLrF/LyWIXrp?= =?iso-8859-1?q?xn90UOi8H8Etx5dU4tSv2JWjwtBKZGFsxGlhmY3j0Ef0gXHYSXMS3XDpMbCi?= =?iso-8859-1?q?ZGh5p8hEKQsK9MF27WCpuzUQi/rhzjZfW8DbB61v7cMPzIVgir7vh291zFbw?= =?iso-8859-1?q?C7oNozoJvOLcvXftwXtrNXgXYGiD5U7VDCPiqbEkFAQXgvus0La+3oU/fDev?= =?iso-8859-1?q?7Nx5HmidoWkd/j4neTbqTg4vcDOcDO3d2FpenEwXVGbQZcdrZ0BF9OatJa+g?= =?iso-8859-1?q?G1j1m6yIPh937vKApga1eU7kimDuDP+dNcGViyn4xLJtDDeKtO5BW5zZUYxP?= =?iso-8859-1?q?yCRssDzFl9yyI/rDarzhrAkppWwfL15TAZl4w0udIEwzeoZ1DnNQ8SYnlaOO?= =?iso-8859-1?q?YQEwksK75IlrMPPJx2NbOCBBEpG8mCx8Z8HDPxdi3ge62sWQ4s3A2v3yR+ff?= =?iso-8859-1?q?JJ5SpuC7QJmo9xbU12om4kS80OnpLtVKxyr+eS9wIeL0MfvaibAV8y7cP7nG?= =?iso-8859-1?q?ifWdU8raR9vGhwTBnCPoUNm0ym13ZXaDRCUPSJ4293zzjaMTSZoeIlQFyD5f?= =?iso-8859-1?q?7zHsyJzvgwETyDyiBcFpMmCVE7GWOXbtFwssDlhMt8FpVgoDTCzhkdC33AjM?= =?iso-8859-1?q?RpHrTixTAAguMtqvD9zpBnqeohirufx4aFPhpBy7pJ8HmlbjxwSj4xXWqsqC?= =?iso-8859-1?q?hdOKSeBWYnlgPrd1v5iM8lKLCKV+jPcovMwkcDhiL5wUtXe+HOr0VEEO0HLB?= =?iso-8859-1?q?h?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48e4f2e8-bc41-418b-3655-08d97931f4bd X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:22.5173 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nL+sGdJcfuoW1DDbC2V3T2fdej1Osr+2Xczbkrl0AU5VrEi1cBbyo9Imwr2MrIF3+KLHrRXRtBsdK+fcZR437JIgPkEbLQIy/04y+Da4Zyo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB3990 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Instead of using double read for the same register, use the write register command after the read command. The correct sequence is to use the read value in write command instead of reading the same register again. Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c index 4f0bc24d2a78..640850f989dd 100644 --- a/drivers/net/wireless/microchip/wilc1000/spi.c +++ b/drivers/net/wireless/microchip/wilc1000/spi.c @@ -1167,7 +1167,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint) for (i = 0; (i < 3) && (nint > 0); i++, nint--) reg |= BIT(i); - ret = wilc_spi_read_reg(wilc, WILC_INTR2_ENABLE, ®); + ret = wilc_spi_write_reg(wilc, WILC_INTR2_ENABLE, reg); if (ret) { dev_err(&spi->dev, "Failed write reg (%08x)...\n", WILC_INTR2_ENABLE); From patchwork Thu Sep 16 16:49:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 12499699 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 9464BC433EF for ; Thu, 16 Sep 2021 16:51:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 762E062F90 for ; Thu, 16 Sep 2021 16:51:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343512AbhIPQxM (ORCPT ); Thu, 16 Sep 2021 12:53:12 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:59215 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238910AbhIPQvN (ORCPT ); Thu, 16 Sep 2021 12:51:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1631810993; x=1663346993; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=bUJG6HfYErLAPTvisUhd26+hGAGT5I1kXFnDpjGJS/Y=; b=1gpzUhNUO9zqfsN9UumvPmg3Qb/UIxoC5RvygcDfxw7UTWU4zGErFgtr elDr5X+sHtjTsKaT6Yp7tPG6FHy56V0ZIu5k79uG4X2EsZsdVO2riPHmU rAtWr9xSt8Pq0d9/kRlrlrzn6AbCVqJSRor2tZkcf5Y8FkWTwHePpKU3x 9ZOqL4joY/WoNJnVnbKje0UaIIM3A5/0vJz+m35WKSeDpqxommIRtaMFv KN/fJKNKrsIsqB0GtmcnsogSB9iN6sGAPQvE7Ucz10EPah3kqC8+KRDjE w8ecaeP87u4GuL8PXHn9qj/7LWyzxfeT/3lIFpj9ZfH9wognROmQlLe5D w==; IronPort-SDR: KjAmJcEDN6gMTQYw/yka+gTkafp9iIjabZkbyN8eJRGQ8uC4F+s84QIz8FnwL6mMa431sU5fdF +sGHcFfIrFB1OCZ6DYyeQj26MjAKCv3cTinuJ6cGRoDxhjBUXgesjS/PnHYzgbJgSEHDQMzUdL sYlctqfwfaJw03IFGyruHwsEPoezGevcqH2u/OCO0lIrgYWrvAx7bimUXFruq6gjkkFPgUr1cp CNy4ebslMh3ssrQQEypjwwutKh9EdEaQeeiZQkiQ9xvroy2b7Y/W8jlpol+PLP7qJBzZUg/nTW wzDsX+zxe8NTTVqjHZEiUQbM X-IronPort-AV: E=Sophos;i="5.85,299,1624345200"; d="scan'208";a="69561314" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 16 Sep 2021 09:49:52 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 16 Sep 2021 09:49:52 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14 via Frontend Transport; Thu, 16 Sep 2021 09:49:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h1ZNu0g/slWVgr6n1CXB65P9CCywzCq4gYTP6Z8nvzZXCILAE1cDzDbnxwWj57af3PIvkgesZLuuIU78DJ3F26wjDk4JKNbDIORY9jdH528vwiwsZBE0d0ZlJLxQ70ho47g3Rn/gJ6tb5SlEy/dVJFPTiUu+yFKgrzYH/KN6uKWvvJHvextT5wdCZ9Y9SX8/Iv7IBvqzaZyPRfB5lL9/tzEerdkQk4b/sG74LC3SFMYjD717sy9sQ+SubNxseVA5wF/NPPIHMyEyQZWE9M/mYt7WpmD3RKeMuumNlcFeLWaWKf38dq57uZ0ZezCLuud7tmGu8kLkN2tKdOh/IK7ueA== 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=OdaPuRJXaXa0/cbXr9Arvsn0WeqMoIfba2l8M3uP9y4=; b=merD9p6fx3pZ81IL8G3pzeSGeYXj+OFwF1uDM0OB/GDicjnw+ebDHxg0W58frxmxkO6noEyY9Pq+m2Ren0EZz0KcNlahOpJ8OpLcKFBZvjzcIGRK+pT8gxbRp/X2Xy9RKUVC+ouOa89SymRjabuWq1nApF+VHjFRn6ODv1DH3ui7HpF932mALdg5Uy+oPsPFpmjvz3P2cDKdN5SR6DzpOOARP3ZpzNlyTbbgxQIL/3KyeTVXUq4QJHU3+bZRWtjgEOPQ+YAvIPieNtGIWYVWfSeJbf9N67DFBtFCGhuCnBXCfQKnxdwz/3cfHgcuAlUb/9v3DJ0E9km3OXvsaTkjTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OdaPuRJXaXa0/cbXr9Arvsn0WeqMoIfba2l8M3uP9y4=; b=eHTWnMRVAKftfWbNgwOMCorjToDeGdfWiZLt5qdBOznywHaFaCOHR0gMjoqpUyEkh35O6DfFtUGup9YTFGDB+7TqImdTOGB67mYylS0PCO+4qKMZuuqTYHO4hIHnJIbiJyRSAjSzpLe2c6afj7VIZmaLivJAJ/IP3FEB57QyPR4= Received: from SJ0PR11MB4943.namprd11.prod.outlook.com (2603:10b6:a03:2ad::17) by BY5PR11MB3990.namprd11.prod.outlook.com (2603:10b6:a03:18d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Thu, 16 Sep 2021 16:49:34 +0000 Received: from SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc]) by SJ0PR11MB4943.namprd11.prod.outlook.com ([fe80::b095:c8cf:1d0c:a3bc%5]) with mapi id 15.20.4500.019; Thu, 16 Sep 2021 16:49:34 +0000 From: To: CC: , Subject: [PATCH v2 11/11] wilc1000: increase config packets response wait timeout limit Thread-Topic: [PATCH v2 11/11] wilc1000: increase config packets response wait timeout limit Thread-Index: AQHXqxrNoiSicpseb0aRBOjPP5TBlA== Date: Thu, 16 Sep 2021 16:49:23 +0000 Message-ID: <20210916164902.74629-12-ajay.kathat@microchip.com> References: <20210916164902.74629-1-ajay.kathat@microchip.com> In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.25.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3910a575-d0ca-4327-b858-08d97931f6ab x-ms-traffictypediagnostic: BY5PR11MB3990: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3968; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xAexwYJqItgIh3cvmi3aqOJm15xd/gXHYWCego1TD0EY4P4qEPcKMIY9ntBvR4EsI3X9AJwXJ2deCkUXYVRHuwP9p3aRBtzizWKbSPM7v6DUQa32QA55rqk4rXUtBdaHHI6hsTbdCVf2gi3TSuwRpr+khAYC/xoZmWkRyk4+i6rFwG0sARJpIrAGbUKQvH9mI+zYWBpEH2WhUSEApN77qb/9eDFiMRqXXf5QSBjvO5rwHV+wmENapfjs7jUTfNz06p9A8rl8K6cVg2yYp67kyve0FG4b0Z0PuWZ/AONPU2YMKwHKUwX3dI3ajxuIfE8y46Mki+NNVrQYyjFgHlL8hqCzj5FFvAPvy2Q6dPicGK/X8YdaZN6NHcLr/vqNWBKM+i+Rs5qb6YRDB7r2ZRRZxij/lWed5T2NvYdW9NSfSwCUTgjvAHKlqRw8c6DlpORyYkMlPe8Or3XneadRlsv2HZa5jhNCRKstCCjK+fbP8ooFB9FnAtTpF4fDBHHwhxFXqHMewzfhn7VBJc1SoFqgk0dV37HOrxsKi4AZhhytTUjHgrXONpF4JXRL3835ILeWbHPcEUQxD9nQjH5k15urO8BwtX177Zz5q3ORiH3TEXqd15QlgStoyvwjjCs11Yb2anJdlCc6SWVXdxaLJeRrdU0L72zQOVQiozcKb13Rcu9Tc3l8HaE/PzZj85lsJXQ6 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4943.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(91956017)(64756008)(38070700005)(38100700002)(66476007)(6916009)(8936002)(76116006)(6506007)(71200400001)(66446008)(2906002)(4326008)(83380400001)(107886003)(6666004)(8676002)(66556008)(5660300002)(186003)(4744005)(66946007)(1076003)(122000001)(54906003)(316002)(508600001)(6486002)(6512007)(2616005)(86362001)(26005)(36756003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?2XqZkd7V1/QC0WIPjm0J2bo?= =?iso-8859-1?q?4lrZb1DxQLZ9D5j3kZDmOf/gVKZCfC1TpUsgP6a2l9Z0jvsdPJ+R0AYts0D8?= =?iso-8859-1?q?7CvTqUqrI2U9WrSNfUpdWmoSEuVsNjnwSqWM1qodk1HQbHWXnTbeTY6hTZG5?= =?iso-8859-1?q?MzpLtCkxAPEYgu46E8u4WD5ord92J8XgO+msFHBE5sbEtSu0KUJssvpZFLvo?= =?iso-8859-1?q?+v8wxMwNM6Er9U3y//EYsF5ZXOr91Tj1gmuR/6xNCphg/EPneWirKTZY8o+g?= =?iso-8859-1?q?1beW7VAmyT8qrI/mdwNN9Nc0VWgpZUuezVc9cJn7aFCzU1BU91FHEzfy3KGK?= =?iso-8859-1?q?dUqFmt7oaIIf1M4HSzMb3S5Q0q5//BB94T4d094zdOBalRWcN+3ltkdeNe92?= =?iso-8859-1?q?mUc5XSDIpv5gMzRVhnUiMjhmU4wTRwuor7x0X620bV+X8VrxTHJ/+mrXCITm?= =?iso-8859-1?q?jYklNwcKwZd1hRzpMG1K9JnLQ32vAD+0feIELZaJ6GHmHl9hjI2UO20YLDbx?= =?iso-8859-1?q?7G2dSzDPcu0zpoThVJTv02rp11omvyUzsotyWRTWp1CD+cZUGociyLrFs6PG?= =?iso-8859-1?q?ZTOz3U8ssAnWRcwGC4lDPAWzAh89PWO1Ec8Z1XQ+v6XZtRk263W/ht+ypc25?= =?iso-8859-1?q?ibm30menONTI0sPi8WJfzgHXU6H7kauMJvkymc5SnrMqpx3fet50EHhd89MN?= =?iso-8859-1?q?NytnDOct/zWDi7x/QgeEkGtwB7zYmJgGGxsge1DZYpDm0Ocfr45T4zUCvBaS?= =?iso-8859-1?q?um3MkoJPosnJHFxzWdV7bBbCQ6d2vDenAQNAZDrS+7ZqAUuQ41Q2FkCo9lja?= =?iso-8859-1?q?DbYAltqiDPPqqe5rnD0ugjQqcpm7A6rXhfhwnEO2STYDZqDBuvNQxdSFaJq0?= =?iso-8859-1?q?/0W/9Gs3ki85eCtSp5jqpp8IhAiofXC00q92RguzJgc+dV9f0FAKHx8kjlNr?= =?iso-8859-1?q?vjyCT8qlmcW9akWAeOipTjLPkhkPs4TsVZBb7J/Je4ILGU/uDsTqlBVGW50t?= =?iso-8859-1?q?INbIbWY+LwrESB1pXNvxVrKB8a+Blz4p76lvMwAdvj6L50pPee5LCdnBVahQ?= =?iso-8859-1?q?RkjzxBrknbFN79KWYF7ulFEdR8AfMbJeEPM9NqYw2P4apUtJgHXVWOowz3O+?= =?iso-8859-1?q?zFsyFfhDAJdBTVH1zK61M684jrmgtRRPe5mvhhUCIy83eNcZfzUkp2c7s2+4?= =?iso-8859-1?q?p3fETgbW4a5/mphlouXFKjAAq4ul9os2scrpcL6txMGHM+t+2Ykj0gZM/ugP?= =?iso-8859-1?q?3UQ08OyCpDPGvBu8QY8qrpFS4DlVIRl5tccBDDX6DIt59HQTWeuwkIRat1jD?= =?iso-8859-1?q?XffBa31iAMEIG4Uhi8rvtIQnK1xZecyc7fN1fFeCYnp0FO37aCfqMHXzTB/L?= =?iso-8859-1?q?n?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3910a575-d0ca-4327-b858-08d97931f6ab X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:23.0380 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: aJhWhoaprWUZ7ACJ8kVDCGS6f7Ul4Py/CyDbAtl2gcLFr0tDArYe6FnDf2W5/O+pEGpVe8yNJFAZf4XKCpWTTa+qgLhWx3jc9/Cww28GH4I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB3990 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Increase the WID config packet response timeout to have extra wait time for host to receive the response message from firmware. Sometimes the WID config response was timed out because of host interrupt latency. Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/wlan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/wireless/microchip/wilc1000/wlan.h index 150648b2c872..13fde636aa0e 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.h +++ b/drivers/net/wireless/microchip/wilc1000/wlan.h @@ -302,7 +302,7 @@ #define ENABLE_RX_VMM (SEL_VMM_TBL1 | EN_VMM) #define ENABLE_TX_VMM (SEL_VMM_TBL0 | EN_VMM) /* time for expiring the completion of cfg packets */ -#define WILC_CFG_PKTS_TIMEOUT msecs_to_jiffies(2000) +#define WILC_CFG_PKTS_TIMEOUT msecs_to_jiffies(3000) #define IS_MANAGMEMENT 0x100 #define IS_MANAGMEMENT_CALLBACK 0x080