Received: by 2002:a17:90a:88:0:0:0:0 with SMTP id a8csp53827pja; Fri, 22 Nov 2019 03:21:42 -0800 (PST) X-Google-Smtp-Source: APXvYqyZ6yA7s0iGwB0qWq0h0pRXZSb6zy3DClyCV7elysahMEmbrKo5k3S1iZoG1NGaSFga0j15 X-Received: by 2002:a17:906:80d5:: with SMTP id a21mr21377710ejx.114.1574421701924; Fri, 22 Nov 2019 03:21:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421701; cv=none; d=google.com; s=arc-20160816; b=aRE66jSCQt6KY064wYEX3hJqprA3Sztz4qZ3Hrm7CDO3fi8m3X4ChIBBsxJmOwWs3R s7KfjjkU6Sb9DmlkJGBIE+pbeMYtWc0OQhpTlREpoVQ8Yt3UYf6JNSP+veQHUsChdQbn 9dxxbPztk7VVc2nBl8InNreNka7pCl+wpMWPHiUmNDPPumcOVW6gzek+ni3c8DkAnPwt fRRohoJWk3c5uK5hP6GYBSRQqgtgm1EGJZ4AmYZoMosUuqw/qoNPldOIF3JusdFpwhmB 7xLLjJCx7BOgmZLPdMggmv6Kjs4WUzdhyfhCmrOvHr0eMWuDUHinuxvUwT5hDoWoR3TO r+eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BAm7+yH7wmxal8cRFTOIgifiPIXO/sOO4Xq/mzuOrgk=; b=x010CX15PbBxnRomFOjdVXzykOrtJ4LITnoOrmh7sOkdrm4LwYLML5VdR2m3kaUCVH 5GpacXdcczACuyRY5WPMAs9ap/OodhkjF/Lk3ZCHmiJz57fHSK/5Cn8fbTJK5bell6Ey 1OsLFzPCaXGyT26l1p1uQ6aB5R5eWQWCKFokZQ3TR0r1GI0RgqHQ5gWpmSmzSkt4u/mR Fj21m61/9s2+ABAiYBh5shG6SKl891ybfMjCmHKvDxJSysKCRFQfnXw9HTt2aZP21on+ ih0VqQecFykH3GGZTV+EsurI0CHZ12poor0Nk59F1pPaOc8v75+f2YON9KqZ3SJRxnwI /1jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nUYE0PYq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x95si2689745ede.192.2019.11.22.03.21.17; Fri, 22 Nov 2019 03:21:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nUYE0PYq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729963AbfKVLTC (ORCPT + 99 others); Fri, 22 Nov 2019 06:19:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:56760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729857AbfKVKsM (ORCPT ); Fri, 22 Nov 2019 05:48:12 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0B1EA205C9; Fri, 22 Nov 2019 10:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419691; bh=oIuPZIKjSWr+B1tN15q/Yf7G/jszH9poscu1Os74aYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nUYE0PYq09GvhVrny52V2G0PRA9njF1heneCsikPVHVvp2XSEHKS3AC7IDwEmmaLX 6ciPyh5tLpKDpl09aqXcgxGh878etf86u/W1SmkThQpNj8UAUuHB3LWmvn5KY7VRk3 jsxNawZA1UIA1YZNbi3Y9RDGpECJgD4jPjuYSQBY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sara Sharon , Luca Coelho , Sasha Levin Subject: [PATCH 4.9 198/222] iwlwifi: mvm: dont send keys when entering D3 Date: Fri, 22 Nov 2019 11:28:58 +0100 Message-Id: <20191122100916.524397942@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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