From patchwork Mon May 23 14:09:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 575726 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EB4CC4332F for ; Mon, 23 May 2022 14:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236912AbiEWOJO (ORCPT ); Mon, 23 May 2022 10:09:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236893AbiEWOJM (ORCPT ); Mon, 23 May 2022 10:09:12 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EB7B43385 for ; Mon, 23 May 2022 07:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1653314950; x=1684850950; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=DGYy6pWqRpWJayPSAm4jMGEeasBD1ITm4BDm9LKSWG8=; b=WZ9i/bEyU+mYzv2ezQvIPc4t6qCXxXZdF2hO5aIqNYPpRdZPbqgEP+Do 9eQhQu/C04rzm6rBdyVSVKo52SfcaN9MiC9E3+s5SunSGIeXzWy/ZITrB jr56ZiXDLFB60Xj2R3UvMELarHfp+8C7FV9OmQ4BcyWqnBkA6X4vGTxT9 2fWbkJ6EdanlaGhzww1wKoJm2mAbsf/QtIPtCjAyNlO4rQF+B+SxBQE2q I+qbiTZd7cHPKz1GcnqkFKJ+U1gR0NVjT7wQ3nzoGc+rvLMKHwxwDD1bk D5MVO6Og/ZbzrSc5Ng15Lew74w2miUefZDixAcAUJx0uxtypkXM86T+Tf A==; X-IronPort-AV: E=Sophos;i="5.91,246,1647327600"; d="scan'208";a="160214877" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 23 May 2022 07:09:09 -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.2375.17; Mon, 23 May 2022 07:09:09 -0700 Received: from NAM04-MW2-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.2375.17 via Frontend Transport; Mon, 23 May 2022 07:09:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YlefCuPaAhxbpZSbrsK7nfXmIB+TyjcDCVjJGHfloIsARGdDpLQ+Qx/iLV1s2cUBAATHSCZv8ZdA8gtU/Hr/uY5oHxIoAMdjE4f8mqCEWyJc5Da5N8mLz4xaF8IFsSGXjDVz3iM1lbsDJfu5QodBpo7W4sv1seTfRi4BYyVLiA/prnizDEnNvZ8xA3l0W02E5U4xXNv/2cTnevXM0aLhwJSWgjeFfwyTc9X9lQJ2e36V56RQhXHaFzJVhzo2bmCtkTq5lvOifXJwhrXr1pW9wfLxb+nh7unh7b4d10tlyD3rOPquVUxlh3/fQxqrgkThkAivoCw1IuB1C4Jfm2oxuQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=osrhlwpEFFhhR0wpe1YAkbvHKhLHXzcBTB1i7NRwLIA=; b=lHj9QdUoBBY9U9Y4e2EsycgONSFtiTFoj3BEtKGiNlEZucVRTWMTdlYs7x/Nry8DaQkTNp6Nc1C5CyhPczMEZnMzN/LUMHIMKFVPlrhSv+bEgJSCP+/kc7TJoVEpy3taA94KoXc2cFTJmU1eByZ8CjMfjRJP5JoIQIKkuhyNm7U4Eyy63/0NjVYi9UP3YrIHj1lOh+C4qyWRq3sSJXEAATPaoCyRFtKNUxMFagcTIUO6oE1eGaUPPKCdLbRft0inmeYk8//2hM54q+uwl1Yx1HWPl5KLpPf3xapwF/6VYWaQ3hTEAU+PHAB+nVdHc+u1nJQNqtvCZG/K8ksS+bi2fA== 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=osrhlwpEFFhhR0wpe1YAkbvHKhLHXzcBTB1i7NRwLIA=; b=mrqzhiuisR4w8nCfZS604pB3LB/1U9LHSskmOGpqtoEk2Pw8Z0pUXZOUui/VG+Wq9+z4Zu8ECG0JAFOVCnRMQhvORaELRbov2hgGFEjKoXMJEBQ3Js02wmjhbFGi0NEtQpCnt2yq21zndEZEYGteytwly6fnV3Az8SQTwZU0pno= Received: from PH0PR11MB5176.namprd11.prod.outlook.com (2603:10b6:510:3f::5) by SJ0PR11MB5600.namprd11.prod.outlook.com (2603:10b6:a03:3ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Mon, 23 May 2022 14:09:06 +0000 Received: from PH0PR11MB5176.namprd11.prod.outlook.com ([fe80::d0fc:845b:ce0b:11fa]) by PH0PR11MB5176.namprd11.prod.outlook.com ([fe80::d0fc:845b:ce0b:11fa%8]) with mapi id 15.20.5273.023; Mon, 23 May 2022 14:09:06 +0000 From: To: CC: , , Subject: [PATCH v2 1/4] wilc1000: use correct sequence of RESET for chip Power-UP/Down Thread-Topic: [PATCH v2 1/4] wilc1000: use correct sequence of RESET for chip Power-UP/Down Thread-Index: AQHYbq6p2rJ8Qd5opkWdRD9tXlXgEA== Date: Mon, 23 May 2022 14:09:06 +0000 Message-ID: <20220523140812.164028-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: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 34c7ce09-53c3-4b29-616c-08da3cc5cc6b x-ms-traffictypediagnostic: SJ0PR11MB5600:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UtrdsW7aUE3yDHczgidvNLgnslADqnmAwnXKZ/J8LEW+Af87YOIQGIXxHsjfiOkpyxklfKapgLebwx0NzftmZpQQhrnGSJE3EXbsv+G/Dxi4koqrtiguOpe3c8nynPYf1PilYnfoxbfjL5VslqPdbizHWVFeISQHGiY9NyGegjVYnnebPoL1+sE51s/fucONniwjOIZUVGeo8t1dnEJTT3OPSES7pSpLDnmzUj3OZdB5qiqHZuN8Y+8gdb6R/FfA7P1x4XM0gzjlCPI/xjy2Pk7SWbS1xAkYhoxbMQbPfaz+CiEx0ztQOFfjQuZxPPdQJcqGS323RlmJvgchftpcDVhZ6m4UDUXvHXix3CtbFgOeKV9cnHCZsi1OL+AN+gs7Ck6SsvpKJJJqOL0Wuj9OKePOo1BBwswZsxBhgCp36x6kc8im1Uea+iw+xsjy0hBEi+A2DsmX6MtCNjvUB5dGt1qlgsBdc/ZShoI6vCT2bfalvttZHZhXASgd2Wlsh+zy1bmadsBYD0mINW/G6DGoAnpt+XuMTAgKSe7Twc9cZaV3hwDEDen9yHuJv/UECBlrdmvLA4ff/ggSrIiU3uNWTkenFm10cg6+pAGrz46M7WgULiUw8U6AH3hJg+WVtNcyXBWKOpV0LtcLvBqEvjs3BYy+VJnJFk7QEpZKCiEzi6SHnXKAClHVd4IbDu+9NMiQdTYKfaD9zDDppT1/fi0RbQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5176.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(4326008)(83380400001)(76116006)(86362001)(91956017)(5660300002)(6486002)(36756003)(8936002)(508600001)(64756008)(66446008)(66946007)(316002)(8676002)(66476007)(66556008)(186003)(6512007)(6916009)(122000001)(6506007)(54906003)(1076003)(107886003)(2616005)(2906002)(71200400001)(38070700005)(38100700002)(26005); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?fEDqh0K1yVF68OpH2iFX2j4?= =?iso-8859-1?q?FMN54Mz0AGqtXfsHvmvNUeOjalIm9+rzu1iEvlGq7LEWMzPMWK4sPIfe+hVX?= =?iso-8859-1?q?JPFPCodJcZ9ZBCNVqSB7Pua+R9DbS/N5O2QfCYwI4hZ4ST7BDaWeBJec1f8h?= =?iso-8859-1?q?M855PXUreM/OnT4xiDs5kP1jqtQGpDhceT0YP3syZTQiXRnYMpGRQ5XmB7CB?= =?iso-8859-1?q?fSKgg0GeXFDLA2gnS0V1iOi9XxRNsfJWo5+gRu2+7Xp6ZLCC6+8VQ3q9LnhK?= =?iso-8859-1?q?TnSRhHxoELrvo1a7J0vDbbVahRDcA3hM/QAUm+ROuLmhPXHHEnLQaHI1uddI?= =?iso-8859-1?q?k5ffO/aC1tm4ZkZ0kq4qbLlFVve7UQeXwRMzlwrR55ZOs0+mXn0JskYC2FFN?= =?iso-8859-1?q?nMVBJBtZeKaKDN88LHPRzuLKH8zpkdWuEfX0i3ukrxSeqdXzOhWmH1/0rZXM?= =?iso-8859-1?q?X2Z4U/BS9epndtgfB6IFbuqgM8J/IT+HvZ1u2VCuHjCe+mLtJ1/THETrfyA6?= =?iso-8859-1?q?1krbd+qSLcUaGXRjMRAnVdvonDL+SGXwKwpD58hwc6RfS05BhQV5EFfSu9o1?= =?iso-8859-1?q?njDqZSMezzsicvGaybfqogag7ZqfVmI3idSeSv6fhfTHsr8VyS703gEZ2ssv?= =?iso-8859-1?q?54x23WMf9SFjWMW4ATSJ7P7xrsRbR44CPOeaLgCvqfJAGV+uQVw/4Zb3gofE?= =?iso-8859-1?q?YHe2KuvdnIkPlMV7+kVqB/nOKhNFsYAIeFGtSr4xkOePXqGq9hOBRF9z4kIJ?= =?iso-8859-1?q?v2sTSiNGpPSNblNHDltcw5tV9m9DRkKjgwLEViTyJzLOy6AbB1NDNkwBDDkO?= =?iso-8859-1?q?6JgSOrnli5b7ZksUdE7xbUjaIkG9cj4QhVv9aOiIiWnvVWkBKFAceSPLLpuJ?= =?iso-8859-1?q?TRyLRVoxkjlc4E1c+Gd1rwRcjsA2iVAEiT3zZwRDigmEJmTGUUmdFZm7RqCe?= =?iso-8859-1?q?iZtrv46JaYTGKzBnYNYz4Y7qA8yF3EO5fTfSaJ5QYTm4yJds0EHvyBeyDeMJ?= =?iso-8859-1?q?QzacfNTNgxiaYFDjCK6MCycrI/+/ZhpBHgovqz5QY7gyWSl8XRYi/+JL2ehK?= =?iso-8859-1?q?jE2wdN5lgHHWHuNCKVDAedn9nGyOKJjlly/vnmsbEPA5DDO4hKNYeJD2r+BS?= =?iso-8859-1?q?ZE9/KWLbxlvUh8MnEL+41RZxMN2cMnIAydjCnWM3MEq1oFQDIv8RAIW3HYlu?= =?iso-8859-1?q?YjPFxCVmtLFzlC8okYoAh08EjBKIRXdPIpgpkbt719NatO7H9bM89E+qS4qN?= =?iso-8859-1?q?LAn4TqgbOpPTZsFvc60B8IFwxzzzRuzleVFUwQRCu4oYape41OxTtJ/eQWNv?= =?iso-8859-1?q?GH1DvDUaMt9ttKDTxXAx+Hny4vcRNMU4YnrZ6BZvt7+HqJAPe8RAXjRWbzVV?= =?iso-8859-1?q?V1gqKeyGTkfc7veZpDppLAxeR5wQInzPS19i/yvEdhSQi+6a474+3dz1C53z?= =?iso-8859-1?q?72qH1zV3zHxQI3/TVBnTJWuwcxj5jCmKw7O26qzkL34PzDK5JcqOk0O0ccO7?= =?iso-8859-1?q?BpnC3dLIgxVu3cRL3pETa63bAeAsx/iAZLaD9GZJa5XwQCO60wMQNsRQJ7Ku?= =?iso-8859-1?q?81tGmsu75MP64XXj2vb5om9kBiFwSjWPPrH2Qroby75bTYwWHDQsUiNTQnlo?= =?iso-8859-1?q?GBLM9POVGNrc+TxddrjDLh0UVLPiVtp2dwJT5SsPbVFT8JkY/7ONKfdiQyte?= =?iso-8859-1?q?9oBngsDqRvL1KCkt+LlNjEsrytfRmYCpPeu+pkZel7UPjJWqO1f3WsFdogXD?= =?iso-8859-1?q?5eTgcYl60fGCixH3qegN+e06t1nLQuIvWcfUFJ0Zop3pvWpGc2hnP+YAVg+h?= =?iso-8859-1?q?JLX+hqFACe8cASjTG22YE7CZuic8P?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5176.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34c7ce09-53c3-4b29-616c-08da3cc5cc6b X-MS-Exchange-CrossTenant-originalarrivaltime: 23 May 2022 14:09:06.2003 (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: qOxJAcP0HDF2jOwo59HjFgmf4SArU9LLtsmTTY+/IHoGG5fhIgoaYAeP1/34jTlp6rT79R/kxsKHQ2P0dOYt/8/6AS7WZt1brV08Nx9wa0Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5600 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh For power-up sequence, WILC expects RESET set to high 5ms after making chip_en(enable) so corrected chip power-up sequence by making RESET high. For Power-Down sequence, the correct sequence make RESET and CHIP_EN low without any extra delay. Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c index 18420e954402..2ae8dd3411ac 100644 --- a/drivers/net/wireless/microchip/wilc1000/spi.c +++ b/drivers/net/wireless/microchip/wilc1000/spi.c @@ -191,11 +191,11 @@ static void wilc_wlan_power(struct wilc *wilc, bool on) /* assert ENABLE: */ gpiod_set_value(gpios->enable, 1); mdelay(5); - /* deassert RESET: */ - gpiod_set_value(gpios->reset, 0); - } else { /* assert RESET: */ gpiod_set_value(gpios->reset, 1); + } else { + /* deassert RESET: */ + gpiod_set_value(gpios->reset, 0); /* deassert ENABLE: */ gpiod_set_value(gpios->enable, 0); } From patchwork Mon May 23 14:09:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 576877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C85E6C433F5 for ; Mon, 23 May 2022 14:09:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236926AbiEWOJQ (ORCPT ); Mon, 23 May 2022 10:09:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236906AbiEWOJM (ORCPT ); Mon, 23 May 2022 10:09:12 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 436C5590AD for ; Mon, 23 May 2022 07:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1653314951; x=1684850951; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=QvPShWavlqycyc7emBoGM/bci8w1HSNyYRjB+2WLsK8=; b=olCOG9SyU1OUMCQ1ZC7jrlV0dxdrdB6jvJN56MTEQmeavagvMXrt5muK +JKx5LI5JN5GiSIeMvy488UzPJqqkv/QHo5GZ3Gvu2AHRuOQAzZB/Ik/x zSixx5xAxldXcCciC2YLrRhZLrCcKYRULd8dFTL674o9TqFO3vtMz1hKJ QXhw50UXsCJetXGnoL5x/+xaZJytEEaCOG6FsU1sPX87Hj3UfdkDHn4hC sHevLRj4hAiaKFPiibG2I7X5tIlbLzGtsFyzyOA6qlCZAbttJCKGusmcz 1myvc+lpS6qeDEPA/QldlvANcJGHbF6q/SE/fZiYl0raEuaD4c7Csw5wk A==; X-IronPort-AV: E=Sophos;i="5.91,246,1647327600"; d="scan'208";a="164922030" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 23 May 2022 07:09:11 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.87.72) by chn-vm-ex02.mchp-main.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Mon, 23 May 2022 07:09:10 -0700 Received: from NAM04-MW2-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.2375.17 via Frontend Transport; Mon, 23 May 2022 07:09:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QHmyXrPs11YTdt5XiEAcnEijuYxnnp7KJqoYKKuQGMJZQwAEcueNn++mayyuJyuq0zw4QoDUiHIH0mbCljU/99pS4SOwfiNUxuAdu1HltTPO5aQGGKfShhzoTjDIaLA2+h837OnJ6UvDnonS266hl95ha6Vm2WJaWkJ8JSZAdDc+RAGLenZ6IIeBWHX+pfcrjMkrWSjRIyXfA5RcrVKiGwVAz7iFrof4TutddyQuiX7Uliplw17S6oKOX2pt+VxcRwe5cxdfqTdfpZPWR7/n1Lg4uGEfH+LXYPlpnhvCIxtGj9KrOXabjYvXlBATMmofN0TQ7y0nK0+C31d6TmKZ3w== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=O6OPWaXFTzPjXUf2LRzjG60TuPUkZcQmmsfiZeowXhQ=; b=OmFyKAKql909nFNnv7yftbk815fK8Jpx4z92khgyyLBFcLjdoTmr6TI6tip+pd39LYG1uoYbMMhekNAiGLm2j8wEY7XXcyU7RxGAo9Q/qmLjV1BNb4RZzxNXLKm4S3c0umFSccXxEycBRkcx5dWieq29PNfpgo2OgfPyxEY4wAxzwxBCcaM5OQUNh1ZqBXRMPuOtWJP+A9+rNU5uwVf7/sv0Oa6Fs1dQPZtHHHOp1KlzQpaw9WBYr2ZNlwP3YvxxT4julIHZU6nJARCV4sHmiRPsddTHyZkOyVGMxgp0tebG9tjEQU/e+dyt2iCwlcuNYCe+5dgYgAl5rTn4GyX0Ww== 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=O6OPWaXFTzPjXUf2LRzjG60TuPUkZcQmmsfiZeowXhQ=; b=NfXHE6NqHIYTDlg/uYNT9ewxCmQMaWN1AgBO6V66ySKI0tfzbbAk5yoe1bTlojy+3jv0rM7GmcVpGuXMogFM8HtakJsF5WP2bBn5SJScg3IwOS/G/tMVXiPdFk7MhcgNK1p/KzYATrbS9154VmCsq/6GreVMzlSzNK3+V9PUZ04= Received: from PH0PR11MB5176.namprd11.prod.outlook.com (2603:10b6:510:3f::5) by SJ0PR11MB5600.namprd11.prod.outlook.com (2603:10b6:a03:3ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Mon, 23 May 2022 14:09:07 +0000 Received: from PH0PR11MB5176.namprd11.prod.outlook.com ([fe80::d0fc:845b:ce0b:11fa]) by PH0PR11MB5176.namprd11.prod.outlook.com ([fe80::d0fc:845b:ce0b:11fa%8]) with mapi id 15.20.5273.023; Mon, 23 May 2022 14:09:06 +0000 From: To: CC: , , Subject: [PATCH v2 2/4] wilc1000: remove WEP security support Thread-Topic: [PATCH v2 2/4] wilc1000: remove WEP security support Thread-Index: AQHYbq6qgc7qBh09cUe66LVmqiN6zA== Date: Mon, 23 May 2022 14:09:06 +0000 Message-ID: <20220523140812.164028-2-ajay.kathat@microchip.com> References: <20220523140812.164028-1-ajay.kathat@microchip.com> In-Reply-To: <20220523140812.164028-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: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a68fa46c-0c22-4206-d400-08da3cc5ccd6 x-ms-traffictypediagnostic: SJ0PR11MB5600:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lc1U4ztkv2R+xDmdRDLKhRtOY6ngNl80dLIiqE56TzRk8RiJYjSOSVw01w3dcRfGVjg/ikXy3C3Lt3ZBvL5/BYLEGBT+216gm+aiyCSNIvQ6YLd7vL5L1jI8kxWMM6l4afr4+X4V/4guDSL73542JkDv7WUSu3ZvJ+jozAg91ab3FBVTp+sF43E0ksKUPVQUpm+kKmuJybpyuSq/jdB3GZbZrkcET0sibaIqZGJ4pWO+ogfFKF4DugNlztitedktND1BgFUmRW9nzEaSPA6n61IN8Taa4kubBSjz+VM44YqMv/agbHXCujZ+TS21n7rXNSCxvBMPHX5XqyH9kbnu6gGUvBBBOGheXL8wKLhooOhWaRxilkvjCXCjarGIzOZurEPsMgvdZsu/ZWmFJw0pub1RM4dXv/10trZV69dmCZGlgWZWxwet6Xs/tHW3GJ7DXfGKy7iL8ZLAOBQJxWM8nk9eoMO2c5449IJ6w1z8EiwnskBlsZOsFxAPzsTXmPIwrmTd7JKd0rFr5CfzNhQztV7wtP6MGqYxdNFKp6d+VOzkQ8aVjaK3ucYY/h8kZDT2EuxKV9cNet2togK7C7fNKSfgB1Ffu29Bqvdntji/pDRvvOIJo0y0zWsxqQhFWhcUQm+YSuzePTD+4MsL5tKirTAc2/apBgneXGFWHdW1WFq+d+xwWdwiKL1HZNRUgl7RA60itow4LOZgKsaAOvTYbA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5176.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(4326008)(83380400001)(76116006)(86362001)(91956017)(5660300002)(6486002)(36756003)(8936002)(508600001)(64756008)(66446008)(66946007)(316002)(8676002)(66476007)(66556008)(186003)(6512007)(6916009)(122000001)(6506007)(54906003)(1076003)(107886003)(2616005)(15650500001)(2906002)(71200400001)(38070700005)(38100700002)(26005); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?8zIc+Jh9DR6/zvztf8/WK2P?= =?iso-8859-1?q?JevYwhre480UWCVVisuBoC3+HWZIX+rOx5/5zfRUy6vZAcc+hI3bLE2xvoA3?= =?iso-8859-1?q?riKbaKbgm6mPm07imjLrSWoSdZWPjZ92CT/JPB1oMDCpEbVKbER3MAkwEgy5?= =?iso-8859-1?q?YuZJqrGhNYBp3Ykd52N2reul97RgS2JaADDHOUYHjiFu+qblwzqqy8UWTbXO?= =?iso-8859-1?q?XoacNdcA+3zcsB/5mK33PQqQd27go8ehHqH9f+4cA+1AnaMvgeOqXJUHU2q1?= =?iso-8859-1?q?Xv3BFEZSOAxjH6YeCXDPR37aYvimoStT51e6qMQPFmG9UqDxxU69jdKKh9VJ?= =?iso-8859-1?q?k+jSltw4OtSsq0fB1LUCYj/LW3mOrNEtLobdtnUWw+0s2YYShnAneMY+m1e2?= =?iso-8859-1?q?yOdGdCceGYD9SHt+7G6ktNa77WVx5z8zKK397xP+weUMD1gVNVaskoLl+ggh?= =?iso-8859-1?q?2m+WNLAtMT9soJ+QPKLD+QmsnCMj7LCJuZss6gK7y1CvpowKsu9FvBGCCxaS?= =?iso-8859-1?q?xUIPZnxpmcZAK4mONlsLfib9gbv+05Sh0sQ+ioVbaBPBLREU5XMdJqhQNW/K?= =?iso-8859-1?q?sW6RzoBhvjsBs73zR6ZI8bLRR9N5vejJqtotvkPkMoplNkFkOPt3rz2BmQ1e?= =?iso-8859-1?q?gyd1b7h3Z7AIKz/JRCwgBm+a0f2XbfP2ziFeiGWDebVIrdK/sgUDSTBuoaO7?= =?iso-8859-1?q?vBNhBti6oNs7Mv5OFfbVQ+oiqXLdQJAUf3jAOSODNYaN5ELKQSdsdTJacQbN?= =?iso-8859-1?q?lxp0jhPqRi6+UrqpyxtX2Imkk3yW1EbFGMBoBio7Q99PayWOz4zw5fkIfS0B?= =?iso-8859-1?q?oZAqhIbpDjHFUOFmGysdxutNMSVI5PmN/AsA6Wbu48uKsSOGvBM9WX9bFJLZ?= =?iso-8859-1?q?8/OR0ew9bCWxOHAENUPyhxIOZzwNzLFLCCX2Hq6GN3LA2QlCdHC+EpYgsLfp?= =?iso-8859-1?q?o670TWHtxCgdeJ2l6Au6Qj/ITrtuoR4piZMSMYYuw4fQJkK7MTnZMKOuY9Ks?= =?iso-8859-1?q?NGrACPifL4EsuZsWht8fFJlnccBgm8pjDvvdctmcxB92FEPqVloDQr26BlPr?= =?iso-8859-1?q?c+FYP0n3otTjro/25ET02FqC4CxwzkW/0CfVVXIhmm5n7JSr+ngitIoVnbeQ?= =?iso-8859-1?q?WCJzYEQeF1PVFS41Sl0i++14Enthz4xzAX5R+DMZWDzuFD17jIKKBmTsWbB3?= =?iso-8859-1?q?BzXO+Rv2/Rcx1DezRGq+pCuNRxREGnvXNAwQwh+Eson4veXnGRnyoi4jSpit?= =?iso-8859-1?q?xtv4OWBDVsUBXKuhOrdxBVXsoK2EiJEMMuPYUvFE9fU7+NjpgoHv3RhMAHuw?= =?iso-8859-1?q?okiqwem61WQW35srxeffYAfBjxlHIDAhHdtbnjrEYRt0Thyw03dWyD+Kj0dT?= =?iso-8859-1?q?Q0HK2gqIMDOT3q7PNHOQNoOUcrlZ0hgRhMTuZYJ0XsV49clpXwLX5T0NKMx+?= =?iso-8859-1?q?CpU1fpsb74ZG2hMR2bgMGDBT//828yk1qvE4kuHLuGlV3v4GmkadV6qTCEbO?= =?iso-8859-1?q?BWuvGNyQ36/lsusqpHh+HXC4/s9FrGV/3MhK/RHUaYBnC3EoAtGtsBTEASCR?= =?iso-8859-1?q?cLubAlCr9HCkrYDwCCyICkxMRFc0NkRgIroY/NMMQEpWNVfPHcHKltToFUyI?= =?iso-8859-1?q?f+5sMa1LmK8Ak1Q6esNwZHV3QzSPip95ZegTqny1bIOFZ+lNv8fZPxEnWCjv?= =?iso-8859-1?q?Wd5N83LKLuCjpfDV+ABrIaFL7Qxt9Cg+Gb/rIVIL7beF+37042JBIOTkDgCk?= =?iso-8859-1?q?lL2Em+M/EzBdiCDjao7ui88+xW5qFl50MXbkwgtJLpMO/bgjOHpSJunzpP9C?= =?iso-8859-1?q?hGZiAlI/WsyWDeVT0tAhlqrzOJcxs?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5176.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a68fa46c-0c22-4206-d400-08da3cc5ccd6 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 May 2022 14:09:06.9033 (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: KGLgrhtm7GgCmPTW4UilZtZjrSOnuVixaOG3snjL2EnxuosoP6+LyKpglvbV1ZifKLrdb5q+NneXxqEUw9AjwRPpjeGGzTgFBYDXIgylDZo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5600 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Deprecated WEP security for WILC driver as well as in firmware from 15.6 FW release onwards. After WEP security removal, freeup some codespace which helped to add new features like WPA3 etc. Signed-off-by: Ajay Singh --- .../wireless/microchip/wilc1000/cfg80211.c | 76 +------------ drivers/net/wireless/microchip/wilc1000/fw.h | 6 -- drivers/net/wireless/microchip/wilc1000/hif.c | 102 ------------------ drivers/net/wireless/microchip/wilc1000/hif.h | 6 -- .../net/wireless/microchip/wilc1000/netdev.h | 10 -- 5 files changed, 2 insertions(+), 198 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index 8d8378bafd9b..256026d57a70 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -313,32 +313,9 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, vif->connecting = true; - memset(priv->wep_key, 0, sizeof(priv->wep_key)); - memset(priv->wep_key_len, 0, sizeof(priv->wep_key_len)); - cipher_group = sme->crypto.cipher_group; if (cipher_group != 0) { - if (cipher_group == WLAN_CIPHER_SUITE_WEP40) { - security = WILC_FW_SEC_WEP; - - priv->wep_key_len[sme->key_idx] = sme->key_len; - memcpy(priv->wep_key[sme->key_idx], sme->key, - sme->key_len); - - wilc_set_wep_default_keyid(vif, sme->key_idx); - wilc_add_wep_key_bss_sta(vif, sme->key, sme->key_len, - sme->key_idx); - } else if (cipher_group == WLAN_CIPHER_SUITE_WEP104) { - security = WILC_FW_SEC_WEP_EXTENDED; - - priv->wep_key_len[sme->key_idx] = sme->key_len; - memcpy(priv->wep_key[sme->key_idx], sme->key, - sme->key_len); - - wilc_set_wep_default_keyid(vif, sme->key_idx); - wilc_add_wep_key_bss_sta(vif, sme->key, sme->key_len, - sme->key_idx); - } else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2) { + if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2) { if (cipher_group == WLAN_CIPHER_SUITE_TKIP) security = WILC_FW_SEC_WPA2_TKIP; else @@ -373,10 +350,6 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, auth_type = WILC_FW_AUTH_OPEN_SYSTEM; break; - case NL80211_AUTHTYPE_SHARED_KEY: - auth_type = WILC_FW_AUTH_SHARED_KEY; - break; - default: break; } @@ -487,14 +460,6 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, return ret; } -static inline void wilc_wfi_cfg_copy_wep_info(struct wilc_priv *priv, - u8 key_index, - struct key_params *params) -{ - priv->wep_key_len[key_index] = params->key_len; - memcpy(priv->wep_key[key_index], params->key, params->key_len); -} - static int wilc_wfi_cfg_allocate_wpa_entry(struct wilc_priv *priv, u8 idx) { if (!priv->wilc_gtk[idx]) { @@ -552,33 +517,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, struct wilc_priv *priv = &vif->priv; switch (params->cipher) { - case WLAN_CIPHER_SUITE_WEP40: - case WLAN_CIPHER_SUITE_WEP104: - if (priv->wdev.iftype == NL80211_IFTYPE_AP) { - wilc_wfi_cfg_copy_wep_info(priv, key_index, params); - - if (params->cipher == WLAN_CIPHER_SUITE_WEP40) - mode = WILC_FW_SEC_WEP; - else - mode = WILC_FW_SEC_WEP_EXTENDED; - - ret = wilc_add_wep_key_bss_ap(vif, params->key, - params->key_len, - key_index, mode, - WILC_FW_AUTH_OPEN_SYSTEM); - break; - } - if (memcmp(params->key, priv->wep_key[key_index], - params->key_len)) { - wilc_wfi_cfg_copy_wep_info(priv, key_index, params); - - ret = wilc_add_wep_key_bss_sta(vif, params->key, - params->key_len, - key_index); - } - - break; - case WLAN_CIPHER_SUITE_TKIP: case WLAN_CIPHER_SUITE_CCMP: if (priv->wdev.iftype == NL80211_IFTYPE_AP || @@ -676,13 +614,6 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, priv->wilc_ptk[key_index] = NULL; } - if (key_index <= 3 && priv->wep_key_len[key_index]) { - memset(priv->wep_key[key_index], 0, - priv->wep_key_len[key_index]); - priv->wep_key_len[key_index] = 0; - wilc_remove_wep_key(vif, key_index); - } - return 0; } @@ -713,13 +644,10 @@ static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, return 0; } +/* wiphy_new_nm() will WARNON if not present */ static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, bool unicast, bool multicast) { - struct wilc_vif *vif = netdev_priv(netdev); - - wilc_set_wep_default_keyid(vif, key_index); - return 0; } diff --git a/drivers/net/wireless/microchip/wilc1000/fw.h b/drivers/net/wireless/microchip/wilc1000/fw.h index 1114530d03e4..237ca348d1f8 100644 --- a/drivers/net/wireless/microchip/wilc1000/fw.h +++ b/drivers/net/wireless/microchip/wilc1000/fw.h @@ -41,12 +41,6 @@ struct wilc_drv_handler { u8 mode; } __packed; -struct wilc_wep_key { - u8 index; - u8 key_len; - u8 key[]; -} __packed; - struct wilc_sta_wpa_ptk { u8 mac_addr[ETH_ALEN]; u8 key_len; diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c index 71b44cfe0dfc..573750356007 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.c +++ b/drivers/net/wireless/microchip/wilc1000/hif.c @@ -1038,108 +1038,6 @@ static void timer_connect_cb(struct timer_list *t) kfree(msg); } -int wilc_remove_wep_key(struct wilc_vif *vif, u8 index) -{ - struct wid wid; - int result; - - wid.id = WID_REMOVE_WEP_KEY; - wid.type = WID_STR; - wid.size = sizeof(char); - wid.val = &index; - - result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1); - if (result) - netdev_err(vif->ndev, - "Failed to send remove wep key config packet\n"); - return result; -} - -int wilc_set_wep_default_keyid(struct wilc_vif *vif, u8 index) -{ - struct wid wid; - int result; - - wid.id = WID_KEY_ID; - wid.type = WID_CHAR; - wid.size = sizeof(char); - wid.val = &index; - result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1); - if (result) - netdev_err(vif->ndev, - "Failed to send wep default key config packet\n"); - - return result; -} - -int wilc_add_wep_key_bss_sta(struct wilc_vif *vif, const u8 *key, u8 len, - u8 index) -{ - struct wid wid; - int result; - struct wilc_wep_key *wep_key; - - wid.id = WID_ADD_WEP_KEY; - wid.type = WID_STR; - wid.size = sizeof(*wep_key) + len; - wep_key = kzalloc(wid.size, GFP_KERNEL); - if (!wep_key) - return -ENOMEM; - - wid.val = (u8 *)wep_key; - - wep_key->index = index; - wep_key->key_len = len; - memcpy(wep_key->key, key, len); - - result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1); - if (result) - netdev_err(vif->ndev, - "Failed to add wep key config packet\n"); - - kfree(wep_key); - return result; -} - -int wilc_add_wep_key_bss_ap(struct wilc_vif *vif, const u8 *key, u8 len, - u8 index, u8 mode, enum authtype auth_type) -{ - struct wid wid_list[3]; - int result; - struct wilc_wep_key *wep_key; - - wid_list[0].id = WID_11I_MODE; - wid_list[0].type = WID_CHAR; - wid_list[0].size = sizeof(char); - wid_list[0].val = &mode; - - wid_list[1].id = WID_AUTH_TYPE; - wid_list[1].type = WID_CHAR; - wid_list[1].size = sizeof(char); - wid_list[1].val = (s8 *)&auth_type; - - wid_list[2].id = WID_WEP_KEY_VALUE; - wid_list[2].type = WID_STR; - wid_list[2].size = sizeof(*wep_key) + len; - wep_key = kzalloc(wid_list[2].size, GFP_KERNEL); - if (!wep_key) - return -ENOMEM; - - wid_list[2].val = (u8 *)wep_key; - - wep_key->index = index; - wep_key->key_len = len; - memcpy(wep_key->key, key, len); - result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, - ARRAY_SIZE(wid_list)); - if (result) - netdev_err(vif->ndev, - "Failed to add wep ap key config packet\n"); - - kfree(wep_key); - return result; -} - int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, const u8 *mac_addr, const u8 *rx_mic, const u8 *tx_mic, u8 mode, u8 cipher_mode, u8 index) diff --git a/drivers/net/wireless/microchip/wilc1000/hif.h b/drivers/net/wireless/microchip/wilc1000/hif.h index 77616fc77575..c9740457ed58 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.h +++ b/drivers/net/wireless/microchip/wilc1000/hif.h @@ -151,12 +151,6 @@ struct host_if_drv { }; struct wilc_vif; -int wilc_remove_wep_key(struct wilc_vif *vif, u8 index); -int wilc_set_wep_default_keyid(struct wilc_vif *vif, u8 index); -int wilc_add_wep_key_bss_sta(struct wilc_vif *vif, const u8 *key, u8 len, - u8 index); -int wilc_add_wep_key_bss_ap(struct wilc_vif *vif, const u8 *key, u8 len, - u8 index, u8 mode, enum authtype auth_type); int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, const u8 *mac_addr, const u8 *rx_mic, const u8 *tx_mic, u8 mode, u8 cipher_mode, u8 index); diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.h b/drivers/net/wireless/microchip/wilc1000/netdev.h index a067274c2014..630b1e85e68f 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.h +++ b/drivers/net/wireless/microchip/wilc1000/netdev.h @@ -45,12 +45,6 @@ struct wilc_wfi_key { u32 cipher; }; -struct wilc_wfi_wep_key { - u8 *key; - u8 key_len; - u8 key_idx; -}; - struct sta_info { u8 sta_associated_bss[WILC_MAX_NUM_STA][ETH_ALEN]; }; @@ -63,8 +57,6 @@ struct wilc_wfi_p2p_listen_params { }; static const u32 wilc_cipher_suites[] = { - WLAN_CIPHER_SUITE_WEP40, - WLAN_CIPHER_SUITE_WEP104, WLAN_CIPHER_SUITE_TKIP, WLAN_CIPHER_SUITE_CCMP, WLAN_CIPHER_SUITE_AES_CMAC @@ -132,8 +124,6 @@ struct wilc_priv { struct net_device *dev; struct host_if_drv *hif_drv; struct wilc_pmkid_attr pmkid_list; - u8 wep_key[4][WLAN_KEY_LEN_WEP104]; - u8 wep_key_len[4]; /* The real interface that the monitor is on */ struct net_device *real_ndev; From patchwork Mon May 23 14:09:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 575725 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 991A2C433EF for ; Mon, 23 May 2022 14:09:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236906AbiEWOJR (ORCPT ); Mon, 23 May 2022 10:09:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236900AbiEWOJM (ORCPT ); Mon, 23 May 2022 10:09:12 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42EFE590A8 for ; Mon, 23 May 2022 07:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1653314951; x=1684850951; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=KsH5sYE2u2YRHQc9eXQt5Tfd+tPOiENJz897/d76V4Y=; b=sE7HJvz6gwHmZW/OH02BURyegu4KtskZDIu93KWqlUcT3n1r1r3/zYLJ gE1JMlSI/bDOLp/nr4v67npdxIvnUJPimwCDDdL+oJIpXrPMKdfBCcrj2 xrE+tjv9VgNZk80jUAkKoqmZPZoFS04JQWspRZwr5bcet4Q9oC5unTEV3 dOa6Ld0wdEMQFN5wZCeyiYggGdM+1+JR2x5ombCgyTaO/ZaZgctT0En6M besjmFMaJ/mK+I7U3H+vE4wSrpf2UyUBT+qo/bsq2Q5eznznKu4F2puEH JvEIa4D0U785anhJTH7pK1gSXACKWzfDpWoj0jbydvNjZFMv7TGVPRP5m A==; X-IronPort-AV: E=Sophos;i="5.91,246,1647327600"; d="scan'208";a="165280792" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 23 May 2022 07:09:10 -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.2375.17; Mon, 23 May 2022 07:09:09 -0700 Received: from NAM04-MW2-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.2375.17 via Frontend Transport; Mon, 23 May 2022 07:09:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mZtFLDZuWzeXy4ppJdC5dc9fE5KBueaAjcuGWVKJxJrNeMIOFEGpQs/NPKvqk6tEc3eiQoEeN+ff1RuCJys8Svqjl/U35Vc5QgZbNb2uckKb0SQpvK3OO7Y08/wXm21kVHeoVpT1IwcVAyueHTZxI9zyYJB1D99cvxk2pWfZTo+hdckmFSLG/rsUmZVaiEqAmB+HHKmQQ+IFzNBVqrAqJrjmfsKLEzbJ31MY28zuneH7EffSpZs3ua5p2vGY7gWi8zQWRqRpJ5NjVbgHkXiO4A1Ct+GClhBMbqtRDYEyduMtRrxP/NoHVekUBIWj+K13kNkUxTpM1qPHIufBnXBdYg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tH34q5DUTaS4NO+saZpHmJDS1O8nIf305oT33HboKPY=; b=iNKuPQbAkAprnpH5MqyCiXc/HM+gFQjU929TRkLYaX8pPPEFf7UiXnAFtneRwwBWcUsekBOLR9Mo5fPepT38+G0jta9yuTXOdjwcPGV/6FX38LJ27pKTOhVQugIJS3lXW3K5YIvttamFVQ/nsdLksGetvpaQdeluYLy1LFh0F9oSRHxSlTHi9PabVn+Ec/HVmGpz5L+CvTGpZeAra23bfnVBoXsTIYgz2mbhykL/K6Jl2u0B7JpteO9dutBM1iw0D6/8IlCxBKdEC6IWmzD5oYpHKMcwFzh0X+LQbjWGNQkCkSxqBVOIKBXZpNkEPRg+0EyaVX2dpdlraUMmKkaTQA== 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=tH34q5DUTaS4NO+saZpHmJDS1O8nIf305oT33HboKPY=; b=tMMtcgkIh69471Ob5AF/yg8tvXrK1825lWNkfGp5yeeL68HsrRNAyrolvzrAMUxF+Xu8PHtJVPxu584biMwcQUvLFbQACr++/5i5jrX23IJd+kQ1o8rsGNOP7I5ScVEtCrwsfiDZCcRfCk2OZSkCwKXtZeaO58XdbllGMnpZqvY= Received: from PH0PR11MB5176.namprd11.prod.outlook.com (2603:10b6:510:3f::5) by SJ0PR11MB5600.namprd11.prod.outlook.com (2603:10b6:a03:3ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Mon, 23 May 2022 14:09:08 +0000 Received: from PH0PR11MB5176.namprd11.prod.outlook.com ([fe80::d0fc:845b:ce0b:11fa]) by PH0PR11MB5176.namprd11.prod.outlook.com ([fe80::d0fc:845b:ce0b:11fa%8]) with mapi id 15.20.5273.023; Mon, 23 May 2022 14:09:08 +0000 From: To: CC: , , Subject: [PATCH v2 3/4] wilc1000: add WPA3 SAE support Thread-Topic: [PATCH v2 3/4] wilc1000: add WPA3 SAE support Thread-Index: AQHYbq6qvTuLXN4jmUugCJjfcMRvPw== Date: Mon, 23 May 2022 14:09:07 +0000 Message-ID: <20220523140812.164028-3-ajay.kathat@microchip.com> References: <20220523140812.164028-1-ajay.kathat@microchip.com> In-Reply-To: <20220523140812.164028-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: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b2002d2d-2b14-4cb0-76c4-08da3cc5cd82 x-ms-traffictypediagnostic: SJ0PR11MB5600:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pnPaRGRGMq9Qs8J/jYKYSf3tjpjnSSstb7dkTB5vn+c0aa8san8X998gVDM7UgsL9nngUCeUyzK5F4zu/dcg0EwYG3hoEyjH+mWhwzG5EGu2fFHiCDMOToxxz6/HAuqkibrfuWZRT4mL3py/epM3l2cZu1ND4aCh4AhUghpv7EiaZvU55f5i7x2OVtZw5G1wRihF10Mq5iWa03miu6KPpChZIECSEzzGfw8xHMBSoDVFeR6C+rfBu+4+KBUKMtqLitvdI5AkLs4MXHa2k4qU1qg7QNb1ILulljBEnDFOuIcj1r7vBHYnAuIIw1us3Wk9yASXGNQUh1SOxZww3QA4lZ59+4WMJVPebjZctBYu7KUWKZ64WeIREeNpjBCcVCdp1UsyLfrWClnnLfL+NDO1iHCaCLeOo9N4QsjtnpVzBB5X+N6fasgcbgL1Zl0Dp/c4la6YywOZ6+d5OqDB+AEtm+f7zOVQNa5HpICGpg8YaMv4z7bZ0hkKhGJcSNsLTPHNwHzgJK43uB/gKwP+O/3LO3lF3yYmNbU+7yYjjFUJygENwoRdNzlWzX/7oIb6jf9CMOMz/HH9Wa3BV51ye1lu0gK6ytwrU2SvRk3QjP/vWfe4f5rhu1byb9m/Mla+u6ulPLtilXueLyWRgBdKomTR3DX8+O9XO2usvxBBIZMHIvE0VMdB/NLr160noGKiHiCqsTsrak0Z/1swtFeWJh7TLA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5176.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(4326008)(83380400001)(76116006)(86362001)(91956017)(5660300002)(6486002)(36756003)(8936002)(508600001)(64756008)(66446008)(66946007)(316002)(8676002)(66476007)(66556008)(186003)(6512007)(30864003)(6916009)(122000001)(6506007)(54906003)(1076003)(107886003)(2616005)(2906002)(71200400001)(38070700005)(38100700002)(26005); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?GFoBkSBB2xfP/3YXWwuZtXQ?= =?iso-8859-1?q?PxkjAg8QKGSUZsBqwaWB/T6Vp/cVl8KbnxCBmeRITcnNhDRJmJgh+nPpEjwf?= =?iso-8859-1?q?24Oz6q2Kt4pJs1OryI2teMtOdLNWnLZKxy06HBgpAiXm0bTcOXLC0waC/iW5?= =?iso-8859-1?q?ccugq1LZY6UfY1EGlWxE2hkvXDDCkHkvzu/i8EtDbiFv+HBLw/nMCsxdKa93?= =?iso-8859-1?q?oIQRNwR2RGbzUrbgYS02DX6ceez34GYiX3p+BvCyfMVSDStCx89JwiF9ZWMh?= =?iso-8859-1?q?Wjt7Kc+syR5irpbOHeyi6ccM6crRqM616ZmaSjoLCQ6+xMIVw6IY5BYblV+S?= =?iso-8859-1?q?xA8X/JhnBoOkIQMmDpzGzqyY1loBNsOOsdgq5fqpXBAaj3xiJKbS/9EWL+V4?= =?iso-8859-1?q?V9tvkcwktsK/pPCCDkdpAc1JQXDN6gXOcCxkidkSKpg94BcdV3kR43v8jRZm?= =?iso-8859-1?q?vYq1XkWggOAkQloirhu/0GhQGYS3WUUA6uFbUiI/IytmmQyjLjiKuzsnT9KK?= =?iso-8859-1?q?funiArd5kXMo2SbsztozeemgeXxv92dXkHge3z2NcGcM2iQb+ydq5u1tr4lp?= =?iso-8859-1?q?MtcByAy2hbLwBVYHwhOerLM0ebBlYPcj4FjkgFPLuX10iOOIG1If9JPClT2e?= =?iso-8859-1?q?XeDsuFfaGMrq2x9j5ZQCNIU7JiDq4L2n/AhcEM+1BQt9UfJMWRT5LZLGXsgf?= =?iso-8859-1?q?rW2U7+pknZxv6kAHslCPMJ8Qdc7jczedLG4EXeY0lIs3KoJr+Oc+PxA6b4IR?= =?iso-8859-1?q?aLD3iPXmIQkR2i8M+xbQQX/lxhfURf8l8IHMUs+vsbQ2uC5BmlCH9iIV8a9c?= =?iso-8859-1?q?YFaBH+sfY10zkYfg0k4MRTLG0uFw5To+BPt1DFHpjMrLvmioSp9BycGY/hjO?= =?iso-8859-1?q?RkJRYmbtJ1JHE9l2I7MuQeKeb68/+/ZqVDbPx/h1E+kxhTr+azI2PFN8TBgX?= =?iso-8859-1?q?zff7yx1dz0BEjhfI0WFE6P6KkUUfmfib+ubpcXwSCf4c9Qq8mXKn6jqCkUHU?= =?iso-8859-1?q?1Z9yoowevaBfGwxKgsCcVJpcp4K6ZfPyEfD1hNlfWP1BP61Tfr2DEBJBp1mY?= =?iso-8859-1?q?buSI9ezEdNuRIRr5SCUwmSWJWCPnFIzNJFazG9l4e75R933qJO3ACzD9A/N4?= =?iso-8859-1?q?zmmr+JrQ6npdaAK1xK+73Z/MzJtXRvCGVebjzJFhBcbpNyn5ynLu49FzlokJ?= =?iso-8859-1?q?+LyFXjg+xDckE7d+LNaYWCEboN2OabDUxtH5xNPyR5BpOjYOP44vhw+gRSnU?= =?iso-8859-1?q?EYySzb50psfVfDKJedigOzvSLVfbxYgfUJnlwdHW+dXF0+VV889Ss9EnGwuj?= =?iso-8859-1?q?RLYi2aSdKjsREeppmVi0D6zb8x3DuYEoJetLrLqISC3QNQi5IHJFM1DFTLAS?= =?iso-8859-1?q?rcIYNN4wiclwa8NyOJTyv4axusjuGI/p/ZsnZUogB1h1eyqoeGlvAAlMjxp+?= =?iso-8859-1?q?k3FYOw7uOH5IXPcs7uEGeypTE6vLjkDLgoc+LxsbAnObeUQ1E2bgxlnVkoTp?= =?iso-8859-1?q?X0tt1ZX7HWw32r10P2NP8oD/ahJ7M4xxV9prHP9aW8W1aD7lpeuQPXF/KJYl?= =?iso-8859-1?q?mTqbRZZLJRTJii/rpn9ipsEdC5xDVlaK7OmTWwAJEmXn0cFIOLqFz6rhKnIo?= =?iso-8859-1?q?HDsTmjOxz7muNZc8IFP65/0Yc3JL0lBBvEOjgKW17+cvV15Nrcq2i7VqIm+U?= =?iso-8859-1?q?QFOl/XxrUMAeVakLi6YfYM4+iWxwAWstAHseWGUKQIzYFPCWYmFG0ghGAFVp?= =?iso-8859-1?q?xIEvyTHUNfPDdPgxgwTdGtNCcCD0jJLLynRBeXNTUBB1/o20rMqAAhicdUMM?= =?iso-8859-1?q?mfH0FsmhYVrfYYD3WlXO31sXnC9sG?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5176.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2002d2d-2b14-4cb0-76c4-08da3cc5cd82 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 May 2022 14:09:07.9824 (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: ufgDoUp8GsceizvtNTp4kTkf0RQH6l8dDtyVP3eBY+l4bPjyFmxZ6/yHlHNyHunCGIygGRyyaxwaIStZ95jDfo9b7VNlfV3R2zWXJF8v6SY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5600 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Enable SAE authentication for AP and STA mode. In STA mode, allow the driver to pass the auth frames which are received from firmware to userspace application(hostapd) so that SAE authentication is offloaded to userspace. Signed-off-by: Ajay Singh --- v2: remove unused variable reported by kernel test robot .../wireless/microchip/wilc1000/cfg80211.c | 62 +++++++++++++++++-- drivers/net/wireless/microchip/wilc1000/fw.h | 9 +++ drivers/net/wireless/microchip/wilc1000/hif.c | 44 ++++++++++++- drivers/net/wireless/microchip/wilc1000/hif.h | 3 + .../net/wireless/microchip/wilc1000/netdev.c | 11 +++- .../net/wireless/microchip/wilc1000/netdev.h | 3 +- .../net/wireless/microchip/wilc1000/wlan.c | 3 +- .../net/wireless/microchip/wilc1000/wlan.h | 2 + .../net/wireless/microchip/wilc1000/wlan_if.h | 10 ++- 9 files changed, 133 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index 256026d57a70..ea59ce9fd991 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -20,9 +20,11 @@ static const struct ieee80211_txrx_stypes wilc_wfi_cfg80211_mgmt_types[NUM_NL80211_IFTYPES] = { [NL80211_IFTYPE_STATION] = { - .tx = 0xffff, + .tx = BIT(IEEE80211_STYPE_ACTION >> 4) | + BIT(IEEE80211_STYPE_AUTH >> 4), .rx = BIT(IEEE80211_STYPE_ACTION >> 4) | - BIT(IEEE80211_STYPE_PROBE_REQ >> 4) + BIT(IEEE80211_STYPE_PROBE_REQ >> 4) | + BIT(IEEE80211_STYPE_AUTH >> 4) }, [NL80211_IFTYPE_AP] = { .tx = 0xffff, @@ -350,6 +352,16 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, auth_type = WILC_FW_AUTH_OPEN_SYSTEM; break; + case NL80211_AUTHTYPE_SAE: + auth_type = WILC_FW_AUTH_SAE; + if (sme->ssid_len) { + memcpy(vif->auth.ssid.ssid, sme->ssid, sme->ssid_len); + vif->auth.ssid.ssid_len = sme->ssid_len; + } + vif->auth.key_mgmt_suite = cpu_to_be32(sme->crypto.akm_suites[0]); + ether_addr_copy(vif->auth.bssid, sme->bssid); + break; + default: break; } @@ -357,6 +369,10 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, if (sme->crypto.n_akm_suites) { if (sme->crypto.akm_suites[0] == WLAN_AKM_SUITE_8021X) auth_type = WILC_FW_AUTH_IEEE8021; + else if (sme->crypto.akm_suites[0] == WLAN_AKM_SUITE_PSK_SHA256) + auth_type = WILC_FW_AUTH_OPEN_SYSTEM_SHA256; + else if (sme->crypto.akm_suites[0] == WLAN_AKM_SUITE_8021X_SHA256) + auth_type = WILC_FW_AUTH_IEE8021X_SHA256; } if (wfi_drv->usr_scan_req.scan_result) { @@ -905,6 +921,18 @@ static inline void wilc_wfi_cfg_parse_ch_attr(u8 *buf, u32 len, u8 sta_ch) } } +bool wilc_wfi_mgmt_frame_rx(struct wilc_vif *vif, u8 *buff, u32 size) +{ + struct wilc *wl = vif->wilc; + struct wilc_priv *priv = &vif->priv; + int freq, ret; + + freq = ieee80211_channel_to_frequency(wl->op_ch, NL80211_BAND_2GHZ); + ret = cfg80211_rx_mgmt(&priv->wdev, freq, 0, buff, size, 0); + + return ret; +} + void wilc_wfi_p2p_rx(struct wilc_vif *vif, u8 *buff, u32 size) { struct wilc *wl = vif->wilc; @@ -1090,8 +1118,14 @@ static int mgmt_tx(struct wiphy *wiphy, goto out_txq_add_pkt; } - if (!ieee80211_is_public_action((struct ieee80211_hdr *)buf, len)) + if (!ieee80211_is_public_action((struct ieee80211_hdr *)buf, len)) { + if (chan) + wilc_set_mac_chnl_num(vif, chan->hw_value); + else + wilc_set_mac_chnl_num(vif, vif->wilc->op_ch); + goto out_set_timeout; + } d = (struct wilc_p2p_pub_act_frame *)(&mgmt->u.action); if (d->oui_type != WLAN_OUI_TYPE_WFA_P2P || @@ -1158,6 +1192,7 @@ void wilc_update_mgmt_frame_registrations(struct wiphy *wiphy, struct wilc_vif *vif = netdev_priv(wdev->netdev); u32 presp_bit = BIT(IEEE80211_STYPE_PROBE_REQ >> 4); u32 action_bit = BIT(IEEE80211_STYPE_ACTION >> 4); + u32 pauth_bit = BIT(IEEE80211_STYPE_AUTH >> 4); if (wl->initialized) { bool prev = vif->mgmt_reg_stypes & presp_bit; @@ -1171,10 +1206,26 @@ void wilc_update_mgmt_frame_registrations(struct wiphy *wiphy, if (now != prev) wilc_frame_register(vif, IEEE80211_STYPE_ACTION, now); + + prev = vif->mgmt_reg_stypes & pauth_bit; + now = upd->interface_stypes & pauth_bit; + if (now != prev) + wilc_frame_register(vif, IEEE80211_STYPE_AUTH, now); } vif->mgmt_reg_stypes = - upd->interface_stypes & (presp_bit | action_bit); + upd->interface_stypes & (presp_bit | action_bit | pauth_bit); +} + +static int external_auth(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_external_auth_params *auth) +{ + struct wilc_vif *vif = netdev_priv(dev); + + if (auth->status == WLAN_STATUS_SUCCESS) + wilc_set_external_auth_param(vif, auth); + + return 0; } static int set_cqm_rssi_config(struct wiphy *wiphy, struct net_device *dev, @@ -1590,6 +1641,7 @@ static const struct cfg80211_ops wilc_cfg80211_ops = { .change_bss = change_bss, .set_wiphy_params = set_wiphy_params, + .external_auth = external_auth, .set_pmksa = set_pmksa, .del_pmksa = del_pmksa, .flush_pmksa = flush_pmksa, @@ -1732,7 +1784,7 @@ struct wilc *wilc_create_wiphy(struct device *dev) BIT(NL80211_IFTYPE_P2P_GO) | BIT(NL80211_IFTYPE_P2P_CLIENT); wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL; - + wiphy->features |= NL80211_FEATURE_SAE; set_wiphy_dev(wiphy, dev); wl->wiphy = wiphy; ret = wiphy_register(wiphy); diff --git a/drivers/net/wireless/microchip/wilc1000/fw.h b/drivers/net/wireless/microchip/wilc1000/fw.h index 237ca348d1f8..9449c5d0b472 100644 --- a/drivers/net/wireless/microchip/wilc1000/fw.h +++ b/drivers/net/wireless/microchip/wilc1000/fw.h @@ -110,4 +110,13 @@ struct wilc_join_bss_param { struct wilc_noa_opp_enable opp_en; }; } __packed; + +struct wilc_external_auth_param { + u8 action; + u8 bssid[ETH_ALEN]; + u8 ssid[IEEE80211_MAX_SSID_LEN]; + u8 ssid_len; + __le32 key_mgmt_suites; + __le16 status; +} __packed; #endif diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c index 573750356007..5d9d3aba737c 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.c +++ b/drivers/net/wireless/microchip/wilc1000/hif.c @@ -306,7 +306,10 @@ static int wilc_send_connect_wid(struct wilc_vif *vif) netdev_err(vif->ndev, "failed to send config packet\n"); goto error; } else { - hif_drv->hif_state = HOST_IF_WAITING_CONN_RESP; + if (conn_attr->auth_type == WILC_FW_AUTH_SAE) + hif_drv->hif_state = HOST_IF_EXTERNAL_AUTH; + else + hif_drv->hif_state = HOST_IF_WAITING_CONN_RESP; } return 0; @@ -665,7 +668,12 @@ static void handle_rcvd_gnrl_async_info(struct work_struct *work) goto free_msg; } - if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) { + + if (hif_drv->hif_state == HOST_IF_EXTERNAL_AUTH) { + cfg80211_external_auth_request(vif->ndev, &vif->auth, + GFP_KERNEL); + hif_drv->hif_state = HOST_IF_WAITING_CONN_RESP; + } else if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) { host_int_parse_assoc_resp_info(vif, mac_info->status); } else if (mac_info->status == WILC_MAC_STATUS_DISCONNECTED) { if (hif_drv->hif_state == HOST_IF_CONNECTED) { @@ -710,7 +718,8 @@ int wilc_disconnect(struct wilc_vif *vif) } if (conn_info->conn_result) { - if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) + if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP || + hif_drv->hif_state == HOST_IF_EXTERNAL_AUTH) del_timer(&hif_drv->connect_timer); conn_info->conn_result(CONN_DISCONN_EVENT_DISCONN_NOTIF, 0, @@ -986,6 +995,31 @@ void wilc_set_wowlan_trigger(struct wilc_vif *vif, bool enabled) pr_err("Failed to send wowlan trigger config packet\n"); } +int wilc_set_external_auth_param(struct wilc_vif *vif, + struct cfg80211_external_auth_params *auth) +{ + int ret; + struct wid wid; + struct wilc_external_auth_param *param; + + wid.id = WID_EXTERNAL_AUTH_PARAM; + wid.type = WID_BIN_DATA; + wid.size = sizeof(*param); + param = kzalloc(sizeof(*param), GFP_KERNEL); + if (!param) + return -EINVAL; + + wid.val = (u8 *)param; + param->action = auth->action; + ether_addr_copy(param->bssid, auth->bssid); + memcpy(param->ssid, auth->ssid.ssid, auth->ssid.ssid_len); + param->ssid_len = auth->ssid.ssid_len; + ret = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1); + + kfree(param); + return ret; +} + static void handle_scan_timer(struct work_struct *work) { struct host_if_msg *msg = container_of(work, struct host_if_msg, work); @@ -1647,6 +1681,10 @@ void wilc_frame_register(struct wilc_vif *vif, u16 frame_type, bool reg) reg_frame.reg_id = WILC_FW_PROBE_REQ_IDX; break; + case IEEE80211_STYPE_AUTH: + reg_frame.reg_id = WILC_FW_AUTH_REQ_IDX; + break; + default: break; } diff --git a/drivers/net/wireless/microchip/wilc1000/hif.h b/drivers/net/wireless/microchip/wilc1000/hif.h index c9740457ed58..f1a0a1f042ca 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.h +++ b/drivers/net/wireless/microchip/wilc1000/hif.h @@ -47,6 +47,7 @@ enum host_if_state { HOST_IF_WAITING_CONN_RESP = 3, HOST_IF_CONNECTED = 4, HOST_IF_P2P_LISTEN = 5, + HOST_IF_EXTERNAL_AUTH = 6, HOST_IF_FORCE_32BIT = 0xFFFFFFFF }; @@ -202,6 +203,8 @@ 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); +int wilc_set_external_auth_param(struct wilc_vif *vif, + struct cfg80211_external_auth_params *param); 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/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c index 3c292e3464c2..fcc4e61592ee 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.c +++ b/drivers/net/wireless/microchip/wilc1000/netdev.c @@ -835,15 +835,24 @@ void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size, } } -void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size) +void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size, bool is_auth) { int srcu_idx; struct wilc_vif *vif; srcu_idx = srcu_read_lock(&wilc->srcu); list_for_each_entry_rcu(vif, &wilc->vif_list, list) { + struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buff; u16 type = le16_to_cpup((__le16 *)buff); u32 type_bit = BIT(type >> 4); + u32 auth_bit = BIT(IEEE80211_STYPE_AUTH >> 4); + + if ((vif->mgmt_reg_stypes & auth_bit && + ieee80211_is_auth(mgmt->frame_control)) && + vif->iftype == WILC_STATION_MODE && is_auth) { + wilc_wfi_mgmt_frame_rx(vif, buff, size); + break; + } if (vif->priv.p2p_listen_state && vif->mgmt_reg_stypes & type_bit) diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.h b/drivers/net/wireless/microchip/wilc1000/netdev.h index 630b1e85e68f..a0d9e981500e 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.h +++ b/drivers/net/wireless/microchip/wilc1000/netdev.h @@ -185,6 +185,7 @@ struct wilc_vif { struct wilc_priv priv; struct list_head list; struct cfg80211_bss *bss; + struct cfg80211_external_auth_params auth; }; struct wilc_tx_queue_status { @@ -278,7 +279,7 @@ struct wilc_wfi_mon_priv { void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); void wilc_mac_indicate(struct wilc *wilc); void wilc_netdev_cleanup(struct wilc *wilc); -void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size); +void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size, bool is_auth); void wilc_wlan_set_bssid(struct net_device *wilc_netdev, const u8 *bssid, u8 mode); struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name, diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c index 48441f0389ca..f3f504d12873 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -968,7 +968,8 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size) if (pkt_offset & IS_MANAGMEMENT) { buff_ptr += HOST_HDR_OFFSET; - wilc_wfi_mgmt_rx(wilc, buff_ptr, pkt_len); + wilc_wfi_mgmt_rx(wilc, buff_ptr, pkt_len, + pkt_offset & IS_MGMT_AUTH_PKT); } else { if (!is_cfg_packet) { wilc_frmw_to_host(wilc, buff_ptr, pkt_len, diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/wireless/microchip/wilc1000/wlan.h index eb7978166d73..b45e72789a0e 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.h +++ b/drivers/net/wireless/microchip/wilc1000/wlan.h @@ -305,6 +305,7 @@ #define IS_MANAGMEMENT 0x100 #define IS_MANAGMEMENT_CALLBACK 0x080 #define IS_MGMT_STATUS_SUCCES 0x040 +#define IS_MGMT_AUTH_PKT 0x010 #define WILC_WID_TYPE GENMASK(15, 12) #define WILC_VMM_ENTRY_FULL_RETRY 1 @@ -423,6 +424,7 @@ int wilc_wlan_get_num_conn_ifcs(struct wilc *wilc); netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev); void wilc_wfi_p2p_rx(struct wilc_vif *vif, u8 *buff, u32 size); +bool wilc_wfi_mgmt_frame_rx(struct wilc_vif *vif, u8 *buff, u32 size); void host_wakeup_notify(struct wilc *wilc); void host_sleep_notify(struct wilc *wilc); void chip_allow_sleep(struct wilc *wilc); diff --git a/drivers/net/wireless/microchip/wilc1000/wlan_if.h b/drivers/net/wireless/microchip/wilc1000/wlan_if.h index 6eb7eb4ac294..18f13b5643e8 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan_if.h +++ b/drivers/net/wireless/microchip/wilc1000/wlan_if.h @@ -85,7 +85,10 @@ enum authtype { WILC_FW_AUTH_OPEN_SYSTEM = 1, WILC_FW_AUTH_SHARED_KEY = 2, WILC_FW_AUTH_ANY = 3, - WILC_FW_AUTH_IEEE8021 = 5 + WILC_FW_AUTH_IEEE8021 = 5, + WILC_FW_AUTH_SAE = 7, + WILC_FW_AUTH_IEE8021X_SHA256 = 9, + WILC_FW_AUTH_OPEN_SYSTEM_SHA256 = 13 }; enum site_survey { @@ -176,7 +179,8 @@ enum { enum { WILC_FW_ACTION_FRM_IDX = 0, - WILC_FW_PROBE_REQ_IDX = 1 + WILC_FW_PROBE_REQ_IDX = 1, + WILC_FW_AUTH_REQ_IDX = 2 }; enum wid_type { @@ -789,7 +793,7 @@ enum { WID_ADD_BEACON = 0x408a, WID_SETUP_MULTICAST_FILTER = 0x408b, - + WID_EXTERNAL_AUTH_PARAM = 0x408d, /* Miscellaneous WIDs */ WID_ALL = 0x7FFE, WID_MAX = 0xFFFF From patchwork Mon May 23 14:09:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 576876 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03777C433FE for ; Mon, 23 May 2022 14:09:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236900AbiEWOJT (ORCPT ); Mon, 23 May 2022 10:09:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236911AbiEWOJO (ORCPT ); Mon, 23 May 2022 10:09:14 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0761858E7C for ; Mon, 23 May 2022 07:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1653314952; x=1684850952; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+atr0/0MXTn7B0bydlEGXJeZuoDpzYPQdLS76n4uN5k=; b=ZSf5HCAnktUQbdgAr89dz4VwNBwbqumUnyc3iIDeTeOdnJ4MUb88QqvL /oDlO5Ii6vBMO7KYDHuBkm6nkB5r5KGNwJX5FGmvnDuZIvDuHk/rUKS6L SkSukPrPca/kB8XqrgutR2FqHMg6bCUEz7Yyo/RDF5gJMqDyZjDjWmMCJ glXweh/UzK1MZMURxWv3nwuKFZsAdQJfVcA0DOadsvq9XUy/gzGRw05fz N2fDQY63hMMxY1sAXbRTUKf+jDzwH6FmSMnY42Q+GkED8es9qOeQSzPIg o08JIDc06GU6uuyU/K8vdPvuQHT/1+1CADa8ro1qXKVTlmjF3enlzk34u g==; X-IronPort-AV: E=Sophos;i="5.91,246,1647327600"; d="scan'208";a="165280799" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 23 May 2022 07:09:10 -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.2375.17; Mon, 23 May 2022 07:09:10 -0700 Received: from NAM04-MW2-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.2375.17 via Frontend Transport; Mon, 23 May 2022 07:09:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kmoRLmCYWkB0zOf7qwrSbh3r0wszaqqhVkb8IPwlJ6vqW6R4mDfkgP/3Gt/d1sysLisME9IrcJNKpUCGEUdRuXxNy1yR7bt0/ag25KIzOqWKwYs4lkbapbTxZKBoP0gwBgeRn9EFI0LVeW3FkuK5YiMYuJ/m4Ev0mquhiRPHofBcfT4QA306npAKJw/3dA1aBvYUpw7Z/c6BxzUQ0+rpCIMh3h+CAlnkEbflGLlt95RLG85DGimeDYLk0Rtqb2/2C9t6+xb+r0wyNgwpeHZ7cN7dHcslCT12b3WMgwAKN5RifImtCC9MTJjU2mE7BRck4c7+5Ooq/p2XCNt8D7Eu8A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=I/RbBnx9MuTxXy3AIuE07M1tgT9K4llkesdWxxCcjfc=; b=AIRfyyRm22Kam78WOkcYVqGJqSzs4zarA5VUHilMNQ8qZXwaX4eyjbqTNsIOIXky7W4mv7Y9nbvWwDAztLVNCV5ktNt2Abg0GQkn9XRQIx59OLFEfjpjxZowD9I0lhDHs2bpO2songwIC5ek8mFrmC9CwjPV+4sfWYByOyEFSspzPvpQlCEXVGlsTcGCw+fu7Q2f25TsN8ojnGY+HxreL3NPJYkEvMCm6kYmGfjWe1IjTfmn412ir/d11NT48X6xHpVlhRiY0bmMKNVPKE2i5AdcvCqP88cDhX8JwrD8W3/ZmFuBZXUjjKfWIMZe2NGcHzTi7WrbHqSUZA9buA/ULQ== 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=I/RbBnx9MuTxXy3AIuE07M1tgT9K4llkesdWxxCcjfc=; b=iHNUvLB4sHAnJo5VGjYznI1wZT+X/gx8/shAmMrZLoFUs9cJ58hC8R7fm7rt1LnSCqVCeN6hByCuXCno9avFtVAgncjJCileSjwFp1nI23RuTjK+SROaCIZL6HjIKCZoxhez5+fIftObzsgdaN+Zy+Iidsjy74uwacaOvmJayzw= Received: from PH0PR11MB5176.namprd11.prod.outlook.com (2603:10b6:510:3f::5) by SJ0PR11MB5600.namprd11.prod.outlook.com (2603:10b6:a03:3ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Mon, 23 May 2022 14:09:08 +0000 Received: from PH0PR11MB5176.namprd11.prod.outlook.com ([fe80::d0fc:845b:ce0b:11fa]) by PH0PR11MB5176.namprd11.prod.outlook.com ([fe80::d0fc:845b:ce0b:11fa%8]) with mapi id 15.20.5273.023; Mon, 23 May 2022 14:09:08 +0000 From: To: CC: , , Subject: [PATCH v2 4/4] wilc1000: add IGTK support Thread-Topic: [PATCH v2 4/4] wilc1000: add IGTK support Thread-Index: AQHYbq6rTRndsxX6oEWOZv6VnFIdPg== Date: Mon, 23 May 2022 14:09:08 +0000 Message-ID: <20220523140812.164028-4-ajay.kathat@microchip.com> References: <20220523140812.164028-1-ajay.kathat@microchip.com> In-Reply-To: <20220523140812.164028-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: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c823430c-f1c5-4dc0-5922-08da3cc5cdeb x-ms-traffictypediagnostic: SJ0PR11MB5600:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7a1FHWcp/C43N+Tq+kq4rQputLFaQHqHowx1aSdaL59DDJs+xg63V57R0vM+ScKbU8R3gSwub6zMPaHeEO28NKpLESryFF7HK5RHxDCmymfZOqmt8Mv8250mHXkkyeVHkyhEJ/MAh94vLzAcWNqsW6IQYGo3kahrYOp7t+08Qbz0dqrW6ODZ2HhWNDnbLo/hTLPQYM1hURZvIGsikRCDpNQCdozwAGQxOKiu4a+oC1tr5P0k9nfRE/h4Fj5KmbdfxqF4YVZ6vV6aOgvs8EB5By3wvHejiYynOOuOemHyGGt+T5as+cvGiuZPKdLdgLNrqAoZeatm2Xa9sZhlRgZUc8WWewfZOYJ10d4arRrI3Z4oxXcgG9iPR8yOw9JP2R9jE9huJ/lg4ROhGOr8B7FGNWylkgUS8oMYSxX8VZzszGyPTP57jDubdweoBpwWbtoucZpYRVhvMna0otkAQhLtnfuniZy+0zxe+JATDX7kescGvwU16aN1xUgg7pWtK5L4GyKAUrZVifdccwkcFK7SpGPv5NHZak74WT8ke7K2HYUmd4KcAWS1Yb3RXpXlURsFE4ApcciB9Kq9OejWMcnIqOGs1Yt8ktak0GPJsOmva3wLn7WT+C+dJ6THPnMIiMrAzlZ3okx+Nv8TvkeqdoJNUCB8EjmFjuP3uwqTJ+rkLIRRTmfHjUBXRXMhrVhimEdgP/KeOdrskQN9KbUpBU6PVA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5176.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(4326008)(83380400001)(76116006)(86362001)(91956017)(5660300002)(6486002)(36756003)(8936002)(508600001)(64756008)(66446008)(66946007)(316002)(8676002)(66476007)(66556008)(186003)(6512007)(30864003)(6916009)(122000001)(6506007)(54906003)(1076003)(107886003)(2616005)(2906002)(71200400001)(38070700005)(38100700002)(26005); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?2bTykAOBrXTBi8g2nJN/cS6?= =?iso-8859-1?q?d41ib373j8k8foFNH5bwSaEtLrHkKirf+gK5TD1QVQsdvPpxnJajx1xmmgnP?= =?iso-8859-1?q?lMAt26IznUNyYVADG5TR+ULHO0D25f1NWd5RMQISyEe+m2ocLygxuYWMuN/Z?= =?iso-8859-1?q?sTBoXhOLa7DADQSAy8lEiTcwvHMUkvecUcfQiSoiAm+8wtLA6qh8FVfomhX2?= =?iso-8859-1?q?w/vRTnSjt38xI1bl3KoVNvis16+uBvmBV4AJdVf04dkxiveri5cej2vK1rSz?= =?iso-8859-1?q?UNHFrKuEvw7DNFsTqe6O7AuBcP7KBUZKYNZA6phyQgh1eQetRVfGMc1wAEa/?= =?iso-8859-1?q?tQ4I3VnuSAKyCm4dAgqqDBBaqNFH2WQUX2GfE0FbiQ3DBPWrv+NwnbwQuoZy?= =?iso-8859-1?q?3Od03Qwok0i0xGX5DMuNcMHd5GSppVbGbLoGYHgJBcLLgHm1/aaveIBk6w89?= =?iso-8859-1?q?+jCDJLPxL688nmA+7Vq67gJiApNiTAf3cXYWRl0QWbYCmwhbJEYjO3Xfgo3w?= =?iso-8859-1?q?47cGbeUIEJde1DCKoBSUU14niGpqerU8htkDOllQuS0bpkoDZAPkj46UKiAx?= =?iso-8859-1?q?A21YyiOhjpk6T8TZqoPxEyxP94X2TffrOQ4bruqiW5r2mnSSyNO8EefKcoh1?= =?iso-8859-1?q?4nmQKbtuLGFMMlDaEJgS+fmbnCsvx/QYlnQ6QjDIh4dUvpgUB48stG47Vlae?= =?iso-8859-1?q?3WUaIqk3CqlbvysAz9QAI5dkFHxmm40KLU/CJB07/ftLs7jkQpq/HpWV6JOU?= =?iso-8859-1?q?wBFPaCr3xBIN7TDdwwV4Odo9ihZNV7fJc+SUzwbVq1KNznUu2ZphL0BY/mry?= =?iso-8859-1?q?ALDFXID4zZrngRjGbHONDH1GmtLazg28/FlWjO0yk92860unD5V/fUNK4jnE?= =?iso-8859-1?q?psSVm39JU0KI14xG7GD4Gbh61zonq53jvjzT4teyc5P3rL0TAdXbbVkUScLl?= =?iso-8859-1?q?2ZytOMG6iCtgdgpSzrmwFdtxm4YPqRXYDO6HfWUzHRH6y34kvRNns7rs3Oha?= =?iso-8859-1?q?slXltT04RL45gyIulwDEJ5gCzdLQRycZTuqOxkWr9yRbsBVkcvVJqUNG979m?= =?iso-8859-1?q?zYe+2aFWKF64MRSjmnEWhhZB13wA1lLbOX/17nqlMbXnZVLW7uC8KLlHxex6?= =?iso-8859-1?q?QLZlhcDXbNYkuQHR9Ix4ha83mSst9il4Z3hKqp9YO9L0Boi0B4lPNzhVA1F/?= =?iso-8859-1?q?+J4w0qxXFTDMIMj/dkFvKmDuuzPlIkdVU1/wfkdhgucI/mblecYjs7e1wd9U?= =?iso-8859-1?q?q0REVfTpVY2SrNbj1ude5k/enmQHHC35kDA0uOvOZm1PRBFOsJJqf5D4Yjff?= =?iso-8859-1?q?lmycrV9Z/dFjR0nkCazupB+pwoHP/vcRbQY+rBdaq3cKB+1FZ4dAoKgkf4GR?= =?iso-8859-1?q?Uk3Evn6N+xFG3WV1XTF+MhskdYLqqw8xCQ1uk8Ni07kTtp0ffP7GgqIwtC+6?= =?iso-8859-1?q?Em9myFZE9hMXWhFVMC4J/hIQUrHxEx2ktxpLSh80xg9aiOJCX6jCmQlBR3Po?= =?iso-8859-1?q?Ny1vurbudZ8Ywq/BNVaKcPXZFkY0tWAQjkY9Fecy0A6G4XVsO46zuObNtXRy?= =?iso-8859-1?q?W9k4pfKlgKCWQubG0HQEHPi+V2pxpn5dPPV75d50XSFRLw8Kpe54Ik6pH/df?= =?iso-8859-1?q?VGxbIjIOP8SfKyHYZ7hatlk0Mr8Kl6nTcqS95olekB9Ow0Kdz7739hlGN603?= =?iso-8859-1?q?Ex6ghdwHc0hY0NrRqNA1zUL+YryMsE4zZj87msUavtdpHdrd+W5JGXunFwM9?= =?iso-8859-1?q?DNj/CvW/dZMWhFMo4/5UWUeuK/1yQcE2ry199XDZ61AP3BvYWuOlZ7SEsRlP?= =?iso-8859-1?q?22c1O0IucCjVbLg+NZ4H4ef1AMBYi?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5176.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c823430c-f1c5-4dc0-5922-08da3cc5cdeb X-MS-Exchange-CrossTenant-originalarrivaltime: 23 May 2022 14:09:08.7010 (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: Fa0MStKjGi5f4vik2xyBES+FieODvU3FczUGkWxS0uqRuTkMs6bxFqWpKF4CcCUxjcrsqgc7J9qfBS6TEVOy8FQ1HproJiQ7Hpt++ERr12E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5600 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Add support to handle IGTK keys which are required for MFP to FW. Index ID 4 and 5 are used to store the IGTK key. Signed-off-by: Ajay Singh --- .../wireless/microchip/wilc1000/cfg80211.c | 114 ++++++++++++++---- drivers/net/wireless/microchip/wilc1000/fw.h | 8 ++ drivers/net/wireless/microchip/wilc1000/hif.c | 56 ++++++++- drivers/net/wireless/microchip/wilc1000/hif.h | 5 + .../net/wireless/microchip/wilc1000/netdev.h | 1 + .../net/wireless/microchip/wilc1000/wlan_if.h | 10 ++ 6 files changed, 171 insertions(+), 23 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index ea59ce9fd991..1ac4684fab25 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -307,6 +307,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, int ret; u32 i; u8 security = WILC_FW_SEC_NO; + enum mfptype mfp_type = WILC_FW_MFP_NONE; enum authtype auth_type = WILC_FW_AUTH_ANY; u32 cipher_group; struct cfg80211_bss *bss; @@ -416,6 +417,13 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, wfi_drv->conn_info.arg = priv; wfi_drv->conn_info.param = join_params; + if (sme->mfp == NL80211_MFP_OPTIONAL) + mfp_type = WILC_FW_MFP_OPTIONAL; + else if (sme->mfp == NL80211_MFP_REQUIRED) + mfp_type = WILC_FW_MFP_REQUIRED; + + wfi_drv->conn_info.mfp_type = mfp_type; + ret = wilc_set_join_req(vif, bss->bssid, sme->ie, sme->ie_len); if (ret) { netdev_err(dev, "wilc_set_join_req(): Error\n"); @@ -495,6 +503,18 @@ static int wilc_wfi_cfg_allocate_wpa_entry(struct wilc_priv *priv, u8 idx) return 0; } +static int wilc_wfi_cfg_allocate_wpa_igtk_entry(struct wilc_priv *priv, u8 idx) +{ + idx -= 4; + if (!priv->wilc_igtk[idx]) { + priv->wilc_igtk[idx] = kzalloc(sizeof(*priv->wilc_igtk[idx]), + GFP_KERNEL); + if (!priv->wilc_igtk[idx]) + return -ENOMEM; + } + return 0; +} + static int wilc_wfi_cfg_copy_wpa_info(struct wilc_wfi_key *key_info, struct key_params *params) { @@ -531,6 +551,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, u8 op_mode; struct wilc_vif *vif = netdev_priv(netdev); struct wilc_priv *priv = &vif->priv; + struct wilc_wfi_key *key; switch (params->cipher) { case WLAN_CIPHER_SUITE_TKIP: @@ -594,6 +615,26 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, key_index); break; + case WLAN_CIPHER_SUITE_AES_CMAC: + ret = wilc_wfi_cfg_allocate_wpa_igtk_entry(priv, key_index); + if (ret) + return -ENOMEM; + + key = priv->wilc_igtk[key_index - 4]; + ret = wilc_wfi_cfg_copy_wpa_info(key, params); + if (ret) + return -ENOMEM; + + if (priv->wdev.iftype == NL80211_IFTYPE_AP || + priv->wdev.iftype == NL80211_IFTYPE_P2P_GO) + op_mode = WILC_AP_MODE; + else + op_mode = WILC_STATION_MODE; + + ret = wilc_add_igtk(vif, params->key, keylen, params->seq, + params->seq_len, mac_addr, op_mode, + key_index); + break; default: netdev_err(netdev, "%s: Unsupported cipher\n", __func__); @@ -611,23 +652,34 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, struct wilc_vif *vif = netdev_priv(netdev); struct wilc_priv *priv = &vif->priv; - if (priv->wilc_gtk[key_index]) { - kfree(priv->wilc_gtk[key_index]->key); - priv->wilc_gtk[key_index]->key = NULL; - kfree(priv->wilc_gtk[key_index]->seq); - priv->wilc_gtk[key_index]->seq = NULL; - - kfree(priv->wilc_gtk[key_index]); - priv->wilc_gtk[key_index] = NULL; - } - - if (priv->wilc_ptk[key_index]) { - kfree(priv->wilc_ptk[key_index]->key); - priv->wilc_ptk[key_index]->key = NULL; - kfree(priv->wilc_ptk[key_index]->seq); - priv->wilc_ptk[key_index]->seq = NULL; - kfree(priv->wilc_ptk[key_index]); - priv->wilc_ptk[key_index] = NULL; + if (!pairwise && (key_index == 4 || key_index == 5)) { + key_index -= 4; + if (priv->wilc_igtk[key_index]) { + kfree(priv->wilc_igtk[key_index]->key); + priv->wilc_igtk[key_index]->key = NULL; + kfree(priv->wilc_igtk[key_index]->seq); + priv->wilc_igtk[key_index]->seq = NULL; + kfree(priv->wilc_igtk[key_index]); + priv->wilc_igtk[key_index] = NULL; + } + } else { + if (priv->wilc_gtk[key_index]) { + kfree(priv->wilc_gtk[key_index]->key); + priv->wilc_gtk[key_index]->key = NULL; + kfree(priv->wilc_gtk[key_index]->seq); + priv->wilc_gtk[key_index]->seq = NULL; + + kfree(priv->wilc_gtk[key_index]); + priv->wilc_gtk[key_index] = NULL; + } + if (priv->wilc_ptk[key_index]) { + kfree(priv->wilc_ptk[key_index]->key); + priv->wilc_ptk[key_index]->key = NULL; + kfree(priv->wilc_ptk[key_index]->seq); + priv->wilc_ptk[key_index]->seq = NULL; + kfree(priv->wilc_ptk[key_index]); + priv->wilc_ptk[key_index] = NULL; + } } return 0; @@ -642,11 +694,20 @@ static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, struct key_params key_params; if (!pairwise) { - key_params.key = priv->wilc_gtk[key_index]->key; - key_params.cipher = priv->wilc_gtk[key_index]->cipher; - key_params.key_len = priv->wilc_gtk[key_index]->key_len; - key_params.seq = priv->wilc_gtk[key_index]->seq; - key_params.seq_len = priv->wilc_gtk[key_index]->seq_len; + if (key_index == 4 || key_index == 5) { + key_index -= 4; + key_params.key = priv->wilc_igtk[key_index]->key; + key_params.cipher = priv->wilc_igtk[key_index]->cipher; + key_params.key_len = priv->wilc_igtk[key_index]->key_len; + key_params.seq = priv->wilc_igtk[key_index]->seq; + key_params.seq_len = priv->wilc_igtk[key_index]->seq_len; + } else { + key_params.key = priv->wilc_gtk[key_index]->key; + key_params.cipher = priv->wilc_gtk[key_index]->cipher; + key_params.key_len = priv->wilc_gtk[key_index]->key_len; + key_params.seq = priv->wilc_gtk[key_index]->seq; + key_params.seq_len = priv->wilc_gtk[key_index]->seq_len; + } } else { key_params.key = priv->wilc_ptk[key_index]->key; key_params.cipher = priv->wilc_ptk[key_index]->cipher; @@ -667,6 +728,14 @@ static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, return 0; } +static int set_default_mgmt_key(struct wiphy *wiphy, struct net_device *netdev, + u8 key_index) +{ + struct wilc_vif *vif = netdev_priv(netdev); + + return wilc_set_default_mgmt_key_index(vif, key_index); +} + static int get_station(struct wiphy *wiphy, struct net_device *dev, const u8 *mac, struct station_info *sinfo) { @@ -1626,6 +1695,7 @@ static const struct cfg80211_ops wilc_cfg80211_ops = { .del_key = del_key, .get_key = get_key, .set_default_key = set_default_key, + .set_default_mgmt_key = set_default_mgmt_key, .add_virtual_intf = add_virtual_intf, .del_virtual_intf = del_virtual_intf, .change_virtual_intf = change_virtual_intf, diff --git a/drivers/net/wireless/microchip/wilc1000/fw.h b/drivers/net/wireless/microchip/wilc1000/fw.h index 9449c5d0b472..5c5cac4aab02 100644 --- a/drivers/net/wireless/microchip/wilc1000/fw.h +++ b/drivers/net/wireless/microchip/wilc1000/fw.h @@ -54,6 +54,14 @@ struct wilc_ap_wpa_ptk { u8 key[]; } __packed; +struct wilc_wpa_igtk { + u8 index; + u8 pn_len; + u8 pn[6]; + u8 key_len; + u8 key[]; +} __packed; + struct wilc_gtk_key { u8 mac_addr[ETH_ALEN]; u8 rsc[8]; diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c index 5d9d3aba737c..4038a254465f 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.c +++ b/drivers/net/wireless/microchip/wilc1000/hif.c @@ -271,12 +271,19 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type, static int wilc_send_connect_wid(struct wilc_vif *vif) { int result = 0; - struct wid wid_list[4]; + struct wid wid_list[5]; u32 wid_cnt = 0; struct host_if_drv *hif_drv = vif->hif_drv; struct wilc_conn_info *conn_attr = &hif_drv->conn_info; struct wilc_join_bss_param *bss_param = conn_attr->param; + + wid_list[wid_cnt].id = WID_SET_MFP; + wid_list[wid_cnt].type = WID_CHAR; + wid_list[wid_cnt].size = sizeof(char); + wid_list[wid_cnt].val = (s8 *)&conn_attr->mfp_type; + wid_cnt++; + wid_list[wid_cnt].id = WID_INFO_ELEMENT_ASSOCIATE; wid_list[wid_cnt].type = WID_BIN_DATA; wid_list[wid_cnt].val = conn_attr->req_ies; @@ -1143,6 +1150,36 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, return result; } +int wilc_add_igtk(struct wilc_vif *vif, const u8 *igtk, u8 igtk_key_len, + const u8 *pn, u8 pn_len, const u8 *mac_addr, u8 mode, u8 index) +{ + int result = 0; + u8 t_key_len = igtk_key_len; + struct wid wid; + struct wilc_wpa_igtk *key_buf; + + key_buf = kzalloc(sizeof(*key_buf) + t_key_len, GFP_KERNEL); + if (!key_buf) + return -ENOMEM; + + key_buf->index = index; + + memcpy(&key_buf->pn[0], pn, pn_len); + key_buf->pn_len = pn_len; + + memcpy(&key_buf->key[0], igtk, igtk_key_len); + key_buf->key_len = t_key_len; + + wid.id = WID_ADD_IGTK; + wid.type = WID_STR; + wid.size = sizeof(*key_buf) + t_key_len; + wid.val = (s8 *)key_buf; + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1); + kfree(key_buf); + + return result; +} + int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, u8 index, u32 key_rsc_len, const u8 *key_rsc, const u8 *rx_mic, const u8 *tx_mic, u8 mode, @@ -1932,3 +1969,20 @@ int wilc_get_tx_power(struct wilc_vif *vif, u8 *tx_power) return wilc_send_config_pkt(vif, WILC_GET_CFG, &wid, 1); } + +int wilc_set_default_mgmt_key_index(struct wilc_vif *vif, u8 index) +{ + struct wid wid; + int result; + + wid.id = WID_DEFAULT_MGMT_KEY_ID; + wid.type = WID_CHAR; + wid.size = sizeof(char); + wid.val = &index; + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1); + if (result) + netdev_err(vif->ndev, + "Failed to send default mgmt key index\n"); + + return result; +} diff --git a/drivers/net/wireless/microchip/wilc1000/hif.h b/drivers/net/wireless/microchip/wilc1000/hif.h index f1a0a1f042ca..d8dd94dcfe14 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.h +++ b/drivers/net/wireless/microchip/wilc1000/hif.h @@ -108,6 +108,7 @@ struct wilc_conn_info { u8 bssid[ETH_ALEN]; u8 security; enum authtype auth_type; + enum mfptype mfp_type; u8 ch; u8 *req_ies; size_t req_ies_len; @@ -155,6 +156,9 @@ struct wilc_vif; int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, const u8 *mac_addr, const u8 *rx_mic, const u8 *tx_mic, u8 mode, u8 cipher_mode, u8 index); +int wilc_add_igtk(struct wilc_vif *vif, const u8 *igtk, u8 igtk_key_len, + const u8 *pn, u8 pn_len, const u8 *mac_addr, u8 mode, + u8 index); s32 wilc_get_inactive_time(struct wilc_vif *vif, const u8 *mac, u32 *out_val); int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, @@ -210,4 +214,5 @@ 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); void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, struct cfg80211_crypto_settings *crypto); +int wilc_set_default_mgmt_key_index(struct wilc_vif *vif, u8 index); #endif diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.h b/drivers/net/wireless/microchip/wilc1000/netdev.h index a0d9e981500e..822e65d00f53 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.h +++ b/drivers/net/wireless/microchip/wilc1000/netdev.h @@ -129,6 +129,7 @@ struct wilc_priv { struct net_device *real_ndev; struct wilc_wfi_key *wilc_gtk[WILC_MAX_NUM_STA]; struct wilc_wfi_key *wilc_ptk[WILC_MAX_NUM_STA]; + struct wilc_wfi_key *wilc_igtk[2]; u8 wilc_groupkey; /* mutexes */ diff --git a/drivers/net/wireless/microchip/wilc1000/wlan_if.h b/drivers/net/wireless/microchip/wilc1000/wlan_if.h index 18f13b5643e8..df2f5a63bdf6 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan_if.h +++ b/drivers/net/wireless/microchip/wilc1000/wlan_if.h @@ -91,6 +91,12 @@ enum authtype { WILC_FW_AUTH_OPEN_SYSTEM_SHA256 = 13 }; +enum mfptype { + WILC_FW_MFP_NONE = 0x0, + WILC_FW_MFP_OPTIONAL = 0x1, + WILC_FW_MFP_REQUIRED = 0x2 +}; + enum site_survey { WILC_FW_SITE_SURVEY_1CH = 0, WILC_FW_SITE_SURVEY_ALL_CH = 1, @@ -661,6 +667,9 @@ enum { WID_LOG_TERMINAL_SWITCH = 0x00CD, WID_TX_POWER = 0x00CE, WID_WOWLAN_TRIGGER = 0X00CF, + WID_SET_MFP = 0x00D0, + + WID_DEFAULT_MGMT_KEY_ID = 0x00D2, /* EMAC Short WID list */ /* RTS Threshold */ /* @@ -750,6 +759,7 @@ enum { WID_REMOVE_KEY = 0x301E, WID_ASSOC_REQ_INFO = 0x301F, WID_ASSOC_RES_INFO = 0x3020, + WID_ADD_IGTK = 0x3022, WID_MANUFACTURER = 0x3026, /* Added for CAPI tool */ WID_MODEL_NAME = 0x3027, /* Added for CAPI tool */ WID_MODEL_NUM = 0x3028, /* Added for CAPI tool */