| Message ID | 20221213225723.2a43415d8990.I9ac210740a45b41f1b2e15274e1daf4284f2808a@changeid (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1c4c0b28b517d778d37900deedfe91088839f07a |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: iwlwifi: fw: skip PPAG for JF | expand |
gregory.greenman@intel.com writes: > From: Johannes Berg <johannes.berg@intel.com> > > 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> > --- > > This is a fix for a firmware assert. It can wait until the next RC of v6.2. Ok, I'll take this to wireless tree. > Kalle - should I send a pull request for it? Thanks! For patches to the wireless tree I prefer that I take them directly. What I recommend is to assign the patch to me on patchwork and add "v6.2" to the subject like this: [PATCH v6.2] wifi: iwlwifi: fw: skip PPAG for JF That way I'll then apply it automatically. But this for future patches, I have now assigned this patch to me.
gregory.greenman@intel.com wrote: > From: Johannes Berg <johannes.berg@intel.com> > > 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> Patch applied to wireless.git, thanks. 1c4c0b28b517 wifi: iwlwifi: fw: skip PPAG for JF
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");