Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp475745pxb; Thu, 9 Sep 2021 05:25:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhH8VswcutS0flKIsMIwHqCQXWohgrnqA6mDHgQQz0e2BWxX1JbeXdHUz4q1D9AXC7pHaO X-Received: by 2002:a17:906:585a:: with SMTP id h26mr3143846ejs.31.1631190346259; Thu, 09 Sep 2021 05:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631190346; cv=none; d=google.com; s=arc-20160816; b=Pz6FgSX6nZMNm4ONJSJMkAkHNb4LaCZxxO0VXNy4aHknPfYx+xjK8ESCdf8//uyfSF EqGNS+A8r13dOzIsGDwbzfvejEljb+xA/yIyF9ZXSqGmZL+PKUBI+j/DnVUpM/2gE4Cn 9H8sSG2vhJzKoj/Z1lYMQnIxbzaLREoh1nInbEycyiSrhESi9CbEgSHfGKLBxLX4gM9F FrexuPYGKUcDvnf74WnR4PaAKYIFr8CCW1xX2O6aeijVeLtKaF5IFtnGLse3CqlV0KkE BjxZcmFiQrZmz7eZxsDgfr0HwyfHpHU5oeqeXMi/N0yU21cesHjeGp+a+t7xEDdL1vp0 53wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EJ0P1B4wtnh4CM/hxEkftzfmhBqADwhjjv2Y20nqEs8=; b=VWB+U//QwCzrt5JjVa4DVC5i6JLroDUzP6BeIYz85I8gjtDF4E3aIlpwKZJT9aMoHK 0xvSNefAVuxtAFmchQIZfoFIp8DI5GymZXBG20j3MNLAOsFqO256t+tNtdCfp1DNZwwg MWyehdKkLSb8PKu/N+80V9CVhQHY06St5Y/8GYs0YvSF1jzab+T0dD/vU0/2v/zmxNGY skyPHKXECXyh2UYiLvxRdG59NjPG0BSz+2mFZFziBr7BOTH1Z8ONxm68kHDM0cDGUCt1 ddRYU9g5Iz2myZIOry/6bg/wyM6Z7SKDzpOIg427xnWduP94d/eWNoVJXblvmZ9h3h9d Sz5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ddcDcU/h"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a1si1659836edx.506.2021.09.09.05.25.20; Thu, 09 Sep 2021 05:25:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ddcDcU/h"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352235AbhIIM0M (ORCPT + 99 others); Thu, 9 Sep 2021 08:26:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:58740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349031AbhIIMWt (ORCPT ); Thu, 9 Sep 2021 08:22:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 00C2861AF0; Thu, 9 Sep 2021 11:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188261; bh=cp4aSFPOVoAmW7bC4hEc24SYlKqIiehUK6guMD+qXfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ddcDcU/h1TqqkLbwHtIdVpKvZMS+Bo4WKjfGJnCRsEvVx8BIGjMVOBpgRyQqV8gEp oE5jYzUxBr4bGr+Zo0+qDyJEJpzNk8TJn2p+QCgL6ZDVGYOCaH52jx280LV7rOvZs6 IMXCQkBh0UR00hoEnUk49SJObHHJiyrHOolz/eVqzRoCemrEb54MdTVTN3jtAWWZD4 g7Y+R1NfVGr4prA6CBXwPaClgMnUpCuXAMdt7CMCLa9AmMYfFeDV6PNKjgtsirWRqo qtS5fYbGY1Dr+9Y/1FAp7VGRxdKjPfLB0+aGkwfVzZyCHOd9WvCrHgzj/0Wkouqcu/ Q/bHomtcjEKrg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Luca Coelho , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 207/219] iwlwifi: fw: correctly limit to monitor dump Date: Thu, 9 Sep 2021 07:46:23 -0400 Message-Id: <20210909114635.143983-207-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114635.143983-1-sashal@kernel.org> References: <20210909114635.143983-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg [ Upstream commit e6344c060209ef4e970cac18adeac1676a2a73cd ] In commit 79f033f6f229 ("iwlwifi: dbg: don't limit dump decisions to all or monitor") we changed the code to pass around a bitmap, but in the monitor_only case, one place accidentally used the bit number, not the bit mask, resulting in CSR and FW_INFO getting dumped instead of monitor data. Fix that. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/iwlwifi.20210805141826.774fd8729a33.Ic985a787071d1c0b127ef0ba8367da896ee11f57@changeid Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index cc4e18ca9566..a27849419d29 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2314,7 +2314,7 @@ static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, return; if (dump_data->monitor_only) - dump_mask &= IWL_FW_ERROR_DUMP_FW_MONITOR; + dump_mask &= BIT(IWL_FW_ERROR_DUMP_FW_MONITOR); fw_error_dump.trans_ptr = iwl_trans_dump_data(fwrt->trans, dump_mask); file_len = le32_to_cpu(dump_file->file_len); -- 2.30.2