From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2D7FC17441 for ; Wed, 13 Nov 2019 02:07:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA64A206B6 for ; Wed, 13 Nov 2019 02:07:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610832; bh=oIuPZIKjSWr+B1tN15q/Yf7G/jszH9poscu1Os74aYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HuaP2VPxj+B5+lT8v92ANsEsHqAPWQlMK/SJROKdH54wc+aIUgYBNY7/yBJRMfPdq q6lcXyACgnzPsNrSIkOz9QPdCOFOHfqn8jYgXE9q/fTaablW5eZ6vBrXkPEyCgJ8U+ meP3xMmas6LGZiWQZhF7/VPcBDpemnuInFZ/7NS0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730606AbfKMCAy (ORCPT ); Tue, 12 Nov 2019 21:00:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:56340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730589AbfKMCAv (ORCPT ); Tue, 12 Nov 2019 21:00:51 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0C0982246D; Wed, 13 Nov 2019 02:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610450; bh=oIuPZIKjSWr+B1tN15q/Yf7G/jszH9poscu1Os74aYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Px5sp0gjSHsWymfPJ7wNOSPrN9lOsaPM1En4xJdMQeQzs3fqoDsrLVKIA6peoBb0h 0hmPp3Pxi/5xCi7QTCC8UhFH0hZvf7nphB51H9CohUbsCkJ1cQJsJLZoH7ZrYag9S6 Rf0rwTzK07BnjJWvbr5v1mjltgAWzWs+6gFLrwzY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sara Sharon , Luca Coelho , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 45/68] iwlwifi: mvm: don't send keys when entering D3 Date: Tue, 12 Nov 2019 20:59:09 -0500 Message-Id: <20191113015932.12655-45-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015932.12655-1-sashal@kernel.org> References: <20191113015932.12655-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sara Sharon [ Upstream commit 8c7fd6a365eb5b2647b2c01918730d0a485b9f85 ] In the past, we needed to program the keys when entering D3. This was since we replaced the image. However, now that there is a single image, this is no longer needed. Note that RSC is sent separately in a new command. This solves issues with newer devices that support PN offload. Since driver re-sent the keys, the PN got zeroed and the receiver dropped the next packets, until PN caught up again. Signed-off-by: Sara Sharon Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c index 207d8ae1e1160..19052efe53f12 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c @@ -935,8 +935,10 @@ int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, { struct iwl_wowlan_kek_kck_material_cmd kek_kck_cmd = {}; struct iwl_wowlan_tkip_params_cmd tkip_cmd = {}; + bool unified = fw_has_capa(&mvm->fw->ucode_capa, + IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG); struct wowlan_key_data key_data = { - .configure_keys = !d0i3, + .configure_keys = !d0i3 && !unified, .use_rsc_tsc = false, .tkip = &tkip_cmd, .use_tkip = false, -- 2.20.1