wifi: iwlwifi: pcie: avoid a warning in case prepare card failed

In case CSME holds the NIC and SAP connection is already established,
iwl_pcie_prepare_card_hw() during iwl_pci_probe() will fail
(which is fine since CSME will release the nic later when asked with
a SAP message). In this case tring to grab nic access to read the
crf ids will fail with a warning.
Avoid the warning by only trying to read the crf ids in case prepare
card succeeded.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230822103048.9b026fa7b97e.I12bea7e6eef54eeeaf916b68d71583e92ff310fd@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 73c1fb3c0c5ecdafa4aa678a60a4e034ac63db54..bc83d2ba55c676a9dce5c40f92f12757e38beccc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1132,12 +1132,6 @@ static int get_crf_id(struct iwl_trans *iwl_trans)
        else
                sd_reg_ver_addr = SD_REG_VER;
 
-       if (!iwl_trans_grab_nic_access(iwl_trans)) {
-               IWL_ERR(iwl_trans, "Failed to grab nic access before reading crf id\n");
-               ret = -EIO;
-               goto out;
-       }
-
        /* Enable access to peripheral registers */
        val = iwl_read_umac_prph_no_grab(iwl_trans, WFPM_CTRL_REG);
        val |= ENABLE_WFPM;
@@ -1157,9 +1151,6 @@ static int get_crf_id(struct iwl_trans *iwl_trans)
                 iwl_trans->hw_crf_id, iwl_trans->hw_cnv_id,
                 iwl_trans->hw_wfpm_id);
 
-       iwl_trans_release_nic_access(iwl_trans);
-
-out:
        return ret;
 }
 
@@ -1351,6 +1342,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                if (ret)
                        goto out_free_trans;
                if (iwl_trans_grab_nic_access(iwl_trans)) {
+                       get_crf_id(iwl_trans);
                        /* all good */
                        iwl_trans_release_nic_access(iwl_trans);
                } else {
@@ -1360,7 +1352,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
 
        iwl_trans->hw_rf_id = iwl_read32(iwl_trans, CSR_HW_RF_ID);
-       get_crf_id(iwl_trans);
 
        /*
         * The RF_ID is set to zero in blank OTP so read version to