Commit 4f7411d6 authored by Roee Goldfiner's avatar Roee Goldfiner Committed by Luca Coelho
Browse files

iwlwifi: mvm: umac error table mismatch 



umac_error_table In TLV address was read using mask on MSB
but on the same table in alive message it was without which
caused mismatch in devices with different memory region MSB

Signed-off-by: default avatarRoee Goldfiner <roee.h.goldfiner@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210411124417.179fee442115.Ib6eabe86cfda0b6044f07c07448c366b6e07e53d@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 4cf2f590

drivers/net/wireless/intel/iwlwifi/fw/img.h

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

/*

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

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

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

 * Copyright (C) 2016 Intel Deutschland GmbH

 */
@@ -116,6 +116,9 @@ struct fw_img { 
#define PAGING_CMD_NUM_OF_PAGES_IN_LAST_GRP_POS	0

#define PAGING_TLV_SECURE_MASK 1



/* FW MSB Mask for regions/cache_control */

#define FW_ADDR_CACHE_CONTROL 0xC0000000UL



/**

 * struct iwl_fw_paging

 * @fw_paging_phys: page phy pointer

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

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

/*

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

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

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

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -550,8 +550,6 @@ static int iwl_parse_v1_v2_firmware(struct iwl_drv *drv, 
	return 0;

}



#define FW_ADDR_CACHE_CONTROL 0xC0000000



static int iwl_parse_tlv_firmware(struct iwl_drv *drv,

				const struct firmware *ucode_raw,

				struct iwl_firmware_pieces *pieces,

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

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

/*

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

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

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

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -186,7 +186,8 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait, 
		mvm->trans->dbg.lmac_error_event_table[1] =

			le32_to_cpu(lmac2->dbg_ptrs.error_event_table_ptr);



	umac_error_table = le32_to_cpu(umac->dbg_ptrs.error_info_addr);

	umac_error_table = le32_to_cpu(umac->dbg_ptrs.error_info_addr) &

							~FW_ADDR_CACHE_CONTROL;



	if (umac_error_table) {

		if (umac_error_table >=