Commit c53c339d authored by Ariel Malamud's avatar Ariel Malamud Committed by Johannes Berg
Browse files

wifi: iwlwifi: fw: Add new FSEQ defines to fw dump 



On fw error dump, dmesg prints FSEQ register data. Add 4
additional prints in order to match those being dumped
by Windows driver. Allows fw infra to correctly detect
version mismatch.

Signed-off-by: default avatarAriel Malamud <ariel.malamud@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230614123446.f40dc9c810a8.I26227900d0b7e9a71fefe5cbf57cf6b46ee44413@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c2a1c8c1

drivers/net/wireless/intel/iwlwifi/fw/dump.c

+5 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2012-2014, 2018-2022 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2023 Intel Corporation

 * Copyright (C) 2013-2014 Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 */
@@ -467,6 +467,10 @@ static void iwl_fwrt_dump_fseq_regs(struct iwl_fw_runtime *fwrt) 
		FSEQ_REG(CNVR_AUX_MISC_CHIP),

		FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_DIG_DCDC_VTRIM),

		FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR),

		FSEQ_REG(FSEQ_PREV_CNVIO_INIT_VERSION),

		FSEQ_REG(FSEQ_WIFI_FSEQ_VERSION),

		FSEQ_REG(FSEQ_BT_FSEQ_VERSION),

		FSEQ_REG(FSEQ_CLASS_TP_VERSION),

	};



	if (!iwl_trans_grab_nic_access(trans))

drivers/net/wireless/intel/iwlwifi/iwl-prph.h

+5 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2005-2014, 2018-2022 Intel Corporation

 * Copyright (C) 2005-2014, 2018-2023 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016 Intel Deutschland GmbH

 */
@@ -486,6 +486,10 @@ enum { 
#define FSEQ_ALIVE_TOKEN		0xA340F0

#define FSEQ_CNVI_ID			0xA3408C

#define FSEQ_CNVR_ID			0xA34090

#define FSEQ_PREV_CNVIO_INIT_VERSION	0xA34084

#define FSEQ_WIFI_FSEQ_VERSION		0xA34040

#define FSEQ_BT_FSEQ_VERSION		0xA34044

#define FSEQ_CLASS_TP_VERSION		0xA34078



#define IWL_D3_SLEEP_STATUS_SUSPEND	0xD3

#define IWL_D3_SLEEP_STATUS_RESUME	0xD0