diff options
| author |  Mukesh Sisodiya <mukesh.sisodiya@intel.com>
| 2022-12-05 10:35:41 +0200 |
|---|---|---|
| committer |  Gregory Greenman <gregory.greenman@intel.com>
| 2022-12-07 17:36:03 +0200 |
| commit | 838a0c7d144111df7f1fd426d099ab68e81bb24c (patch) | |
| tree | 80bd5d6c50c9660c545de89db6afbd82d595f479 /drivers/net/wireless/intel/iwlwifi/fw | |
| parent | wifi: iwlwifi: mvm: don't access packet before checking len (diff) | |
| download | linux-838a0c7d144111df7f1fd426d099ab68e81bb24c.tar.gz linux-838a0c7d144111df7f1fd426d099ab68e81bb24c.tar.bz2 linux-838a0c7d144111df7f1fd426d099ab68e81bb24c.zip | |
wifi: iwlwifi: dump: Update check for valid FW address
The error dump base address need an update based
on current hardware.
Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20221205102808.a521691632e9.Ic15fa65107c0d4d0b555a1fb3a2a20ab2725b683@changeid
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/fw')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/fw/dump.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dump.c b/drivers/net/wireless/intel/iwlwifi/fw/dump.c index b90f1e9ce691..03b1b2428b5e 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dump.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dump.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2012-2014, 2018-2021 Intel Corporation + * Copyright (C) 2012-2014, 2018-2022 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH */ @@ -157,7 +157,8 @@ static void iwl_fwrt_dump_lmac_error_log(struct iwl_fw_runtime *fwrt, u8 lmac_nu base = fwrt->fw->inst_errlog_ptr; } - if (base < 0x400000) { + if ((fwrt->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ && !base) || + (fwrt->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_BZ && base < 0x400000)) { IWL_ERR(fwrt, "Not valid error log pointer 0x%08X for %s uCode\n", base, |