wifi: iwlwifi: mvm: make pldr_sync AX210 specific
authorJohannes Berg <johannes.berg@intel.com>
Thu, 21 Sep 2023 08:58:06 +0000 (11:58 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 25 Sep 2023 07:15:00 +0000 (09:15 +0200)
The register here is device specific, so we need to gate
the reading/checking to apply only on AX210 family.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230921110726.928901700ad8.I648efdc4400d9e537359915a9a8f363d5d255ead@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/fw.c

index 6e5c0f81e041ba360819555d4a722d3a5d9bc800..5c719636c9bd30d6efd6c81f29beb0290355a8f3 100644 (file)
@@ -593,11 +593,13 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
 
        mvm->rfkill_safe_init_done = false;
 
-       sb_cfg = iwl_read_umac_prph(mvm->trans, SB_MODIFY_CFG_FLAG);
-       /* if needed, we'll reset this on our way out later */
-       mvm->pldr_sync = !(sb_cfg & SB_CFG_RESIDES_IN_OTP_MASK);
-       if (mvm->pldr_sync && iwl_mei_pldr_req())
-               return -EBUSY;
+       if (mvm->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_AX210) {
+               sb_cfg = iwl_read_umac_prph(mvm->trans, SB_MODIFY_CFG_FLAG);
+               /* if needed, we'll reset this on our way out later */
+               mvm->pldr_sync = !(sb_cfg & SB_CFG_RESIDES_IN_OTP_MASK);
+               if (mvm->pldr_sync && iwl_mei_pldr_req())
+                       return -EBUSY;
+       }
 
        iwl_init_notification_wait(&mvm->notif_wait,
                                   &init_wait,