From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0CF813A244; Tue, 27 May 2025 17:07:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365650; cv=none; b=MBUz+SxbUjDXnvhRSlK8zMOIyUzjQL1dw+UR6RyAABa2dUFCxoJpM/QYQS/dkhH4ay3a3GK+O4d1kpek3wgTRUWHBHuqRlbGAI4sg4gqw7mXCrK4vjRUb7de/s/FGU78oC8z0EBlt6ZRaV3mIdxe+qwvTXEyWGgYwV2djxVMT7A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365650; c=relaxed/simple; bh=eP1lwCd8gK5bRaBEmECotp7ApbuaTpoFXpDpgwwhdqk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sF/7t30VEK+XmEWXX2Mz/Bj3/z56s1GZZF7xxSWIQ6IMmsWwUI8mrZ/cpsnO1P0N4WlXUjMKFmGaoeIGdlb9DuBkGnyaaNuHaY9wgrmZwqhI7H7okEnbn5Pwmuicbt84XtZbcAsOMxZXlkySSUlBNbavCF02u9ny67cQhWmEPGM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jBciV7Y7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jBciV7Y7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFFF9C4CEE9; Tue, 27 May 2025 17:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365649; bh=eP1lwCd8gK5bRaBEmECotp7ApbuaTpoFXpDpgwwhdqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jBciV7Y7lOin2sZ49WSA9f2tE3jN5YsMjONblTSEoliwXmDnxrfx48EbxylIzXK0R ENIOeyEnR3yHja/O9ggJv9KoM4Sk5jSNII/4aMqzgiZQAjaZ5k0M6Sshw2njTzf82H taz8r6f5krcRcvl2UTQOQgl2lTZK6bgdKaBOaBYs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Berg , Miri Korenblit , Sasha Levin Subject: [PATCH 6.12 414/626] wifi: iwlwifi: use correct IMR dump variable Date: Tue, 27 May 2025 18:25:07 +0200 Message-ID: <20250527162501.827785846@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg [ Upstream commit 21e4d29ac0def546d57bacebe4a51cbed1209b03 ] We shouldn't dump the reg_data here which dumps the last entry again, it should use the imr_reg_data. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250205145347.3313b18667d1.Iaa9ab66b1d397912a573525e060d39ea01b29d19@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index 6594216f873c4..cd284767ff4ba 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2005-2014, 2018-2024 Intel Corporation + * Copyright (C) 2005-2014, 2018-2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH */ @@ -2691,7 +2691,7 @@ static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt, } /* collect DRAM_IMR region in the last */ if (imr_reg_data.reg_tlv) - size += iwl_dump_ini_mem(fwrt, list, ®_data, + size += iwl_dump_ini_mem(fwrt, list, &imr_reg_data, &iwl_dump_ini_region_ops[IWL_FW_INI_REGION_DRAM_IMR]); if (size) { -- 2.39.5