47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From 5b16c1aaae72edd3f895da027a532ee6a740df7b Mon Sep 17 00:00:00 2001
|
|
From: Sasha Levin <sashal@kernel.org>
|
|
Date: Tue, 13 Dec 2022 23:15:04 +0200
|
|
Subject: wifi: iwlwifi: fw: skip PPAG for JF
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
From: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
[ Upstream commit 1c4c0b28b517d778d37900deedfe91088839f07a ]
|
|
|
|
For JF RFs we don't support PPAG, but many firmware
|
|
images lie about it. Always skip support for JF to
|
|
avoid firmware errors when sending the command.
|
|
|
|
Reported-and-tested-by: Íñigo Huguet <ihuguet@redhat.com>
|
|
Link: https://lore.kernel.org/linux-wireless/CACT4oufQsqHGp6bah2c4+jPn2wG1oZqY=UKa_TmPx=F6Lxng8Q@mail.gmail.com
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
|
|
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
|
Link: https://lore.kernel.org/r/20221213225723.2a43415d8990.I9ac210740a45b41f1b2e15274e1daf4284f2808a@changeid
|
|
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
|
---
|
|
drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
|
|
index e6d64152c81a..a02e5a67b706 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
|
|
@@ -1106,6 +1106,11 @@ int iwl_read_ppag_table(struct iwl_fw_runtime *fwrt, union iwl_ppag_table_cmd *c
|
|
int i, j, num_sub_bands;
|
|
s8 *gain;
|
|
|
|
+ /* many firmware images for JF lie about this */
|
|
+ if (CSR_HW_RFID_TYPE(fwrt->trans->hw_rf_id) ==
|
|
+ CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_JF))
|
|
+ return -EOPNOTSUPP;
|
|
+
|
|
if (!fw_has_capa(&fwrt->fw->ucode_capa, IWL_UCODE_TLV_CAPA_SET_PPAG)) {
|
|
IWL_DEBUG_RADIO(fwrt,
|
|
"PPAG capability not supported by FW, command not sent.\n");
|
|
--
|
|
2.35.1
|
|
|