Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp456320pxb; Thu, 9 Sep 2021 05:02:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVBrX4tPRV7rGVz/KXI+2CZygFN/T00bqinbQQOabqCY+G66Rh/Oy4Uq5+lGcOlujqmI9I X-Received: by 2002:a17:906:25d4:: with SMTP id n20mr3007181ejb.399.1631188923960; Thu, 09 Sep 2021 05:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631188923; cv=none; d=google.com; s=arc-20160816; b=RDJOpuD4eoqg/0ZXn2jLC9YZ72eMvEEJNsBJevcykWWMOIq2B85LFAgNX+TmF7RLk2 h5SBQPmhDOlXJtfJkVqPhKd9K+t+eCoMJTlHzBeTei0TuNaqHyuKZabIj6fejB+82o3J k4lUyN1P+N87VyDIjINt8UOHIzo29DoZOQcLcPsNgV55KQsXlB9eNtUIkYMbPA6YDuFf EA0tRm60aSpa81UZ0xRsYuiR5oU6f7T/euBRM1dOJSHcmKj0HN2YYJ2CQEvSxD+q8rUc zszfWhbygo0VLUbRBkvehHXF8rN6ClIxnLuPylEBePSiF3oK8CrATmV2x9C5cxbh1vSt 0Kdg== 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=A+4EDt4JY2PG0LPjIrvAsDS9xBOCLBmZi0ZE2ZhQ1do=; b=bJvOzq3nCVy62veOnlY2tUlgtb7iNvMEaWEuBixJowMlmdhez4CZmdzPPD6+awNGWB X/8cQ/3M0mjKXZSZcQ49Egu/VeySzu4B+Z2OvAcqie7ZKbj8PkDIYqN3zLKWXiiRLwS1 NFSbWR56CPhf7yL+ZS1QK3f7Fk2uCNP4yE1F2Ov6b2Etl+IgTR0cB/Mup/K6nx/i7DyB b5rHd4GShYXjsv+odfQPjV0Y/iDXgPgWjmJ3Nb74ET0NahFBvLsIHjE+1W7PVmNIsFfH HoQJ2WbNjk46Q02y7fVDuUrPrH7sWgWiP1SK67I2weGmebRDjUlyuBxFv074E8Vuu/J2 W7rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XAUqiDkl; 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 hs6si2312609ejc.12.2021.09.09.05.01.38; Thu, 09 Sep 2021 05:02:03 -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=XAUqiDkl; 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 S1345064AbhIIMC0 (ORCPT + 99 others); Thu, 9 Sep 2021 08:02:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:42124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236624AbhIIMAZ (ORCPT ); Thu, 9 Sep 2021 08:00:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 18CBF61501; Thu, 9 Sep 2021 11:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187970; bh=+5m58+xQFmCuoTRYQN3SD0DmLLnkSLmePDjsPWnD0ks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XAUqiDklHa50QbraVX4onMwX/eUTT2CFWgjP4CiHlOyieppeherNH1bnPjjUMzluJ PlFq/s/8GmmgKY9VdMWPFxAiCVuRqLExdeFA+iUs6PA8s17dFeWuSMeMGDOJAc97CH guATE1u0WxMrj9o+Lx4/wJyo0j/NRUJypponeOfd2o7p9M2RuThQdKxDA8jzQtV43p z5+sG5TJ2l+aTlqBfTup9TxTimmil4bxSmLX3sX4HxvHJUDa94gDLkDnbuU3m6w2li 0eIorBQLzYJEXPxXSt1RQOejnw2NeUuzDo+XloS29E8aJZMv8O5FBF2uWDd87gLHlY XfdDYhMb2Hgkw== 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.14 234/252] iwlwifi: fw: correctly limit to monitor dump Date: Thu, 9 Sep 2021 07:40:48 -0400 Message-Id: <20210909114106.141462-234-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-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 df7c55e06f54..a13fe01e487b 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2321,7 +2321,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