wifi: iwlwifi: pcie move common probe logic

Move the parts of the probe that are not gen specific to the common
probe function.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250709081300.91aee0874e79.Ib762365933d4dd4fc0bf07833226cd7118dee0a1@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 2729e0890fc61613f8367f20cd4d66453472baf6..02a031433b234791045aa2747be805d116b8b239 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1127,8 +1127,44 @@ EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_pci_find_dev_info);
 static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        const struct iwl_mac_cfg *mac_cfg = (void *)ent->driver_data;
+       u8 __iomem *hw_base;
+       u32 bar0, hw_rev;
+       int ret;
+
+       /* reassign our BAR 0 if invalid due to possible runtime PM races */
+       pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &bar0);
+       if (bar0 == PCI_BASE_ADDRESS_MEM_TYPE_64) {
+               ret = pci_assign_resource(pdev, 0);
+               if (ret)
+                       return ret;
+       }
+
+       ret = pcim_enable_device(pdev);
+       if (ret)
+               return ret;
+
+       pci_set_master(pdev);
+
+       ret = pcim_request_all_regions(pdev, DRV_NAME);
+       if (ret) {
+               dev_err(&pdev->dev, "Requesting all PCI BARs failed.\n");
+               return ret;
+       }
+
+       hw_base = pcim_iomap(pdev, 0, 0);
+       if (!hw_base) {
+               dev_err(&pdev->dev, "Failed to map BAR 0.\n");
+               return -ENOMEM;
+       }
+
+       /* We can't use iwl_read32 because trans wasn't allocated */
+       hw_rev = readl(hw_base + CSR_HW_REV);
+       if (hw_rev == 0xffffffff) {
+               dev_err(&pdev->dev, "HW_REV=0xFFFFFFFF, PCI issues?\n");
+               return -EIO;
+       }
 
-       return iwl_pci_gen1_2_probe(pdev, ent, mac_cfg);
+       return iwl_pci_gen1_2_probe(pdev, ent, mac_cfg, hw_base, hw_rev);
 }
 
 static void iwl_pci_remove(struct pci_dev *pdev)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
index 5530f35042ad32a94865a728ebe1355f5c917c64..ec17e2e84151284123b0422b8db152038d478db9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
@@ -1078,8 +1078,9 @@ void __releases(nic_access_nobh)
 iwl_trans_pcie_release_nic_access(struct iwl_trans *trans);
 void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans, u8 max_power);
 int iwl_pci_gen1_2_probe(struct pci_dev *pdev,
-                        const struct pci_device_id *ent,
-                        const struct iwl_mac_cfg *trans);
+                       const struct pci_device_id *ent,
+                       const struct iwl_mac_cfg *trans, u8 __iomem *hw_base,
+                       u32 hw_rev);
 
 /* transport gen 1 exported functions */
 void iwl_trans_pcie_fw_alive(struct iwl_trans *trans);

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
index 9355d5a9d933fd79ffd0717422eea92a25d6521f..3f1861efc7164b0e0b73a447adc83f894f48382d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -3687,25 +3687,12 @@ void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans)
 static struct iwl_trans *
 iwl_trans_pcie_alloc(struct pci_dev *pdev,
                     const struct iwl_mac_cfg *mac_cfg,
-                    struct iwl_trans_info *info)
+                    struct iwl_trans_info *info, u8 __iomem *hw_base)
 {
        struct iwl_trans_pcie *trans_pcie, **priv;
        struct iwl_trans *trans;
        unsigned int bc_tbl_n_entries;
        int ret, addr_size;
-       u32 bar0;
-
-       /* reassign our BAR 0 if invalid due to possible runtime PM races */
-       pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &bar0);
-       if (bar0 == PCI_BASE_ADDRESS_MEM_TYPE_64) {
-               ret = pci_assign_resource(pdev, 0);
-               if (ret)
-                       return ERR_PTR(ret);
-       }
-
-       ret = pcim_enable_device(pdev);
-       if (ret)
-               return ERR_PTR(ret);
 
        trans = iwl_trans_alloc(sizeof(struct iwl_trans_pcie), &pdev->dev,
                                mac_cfg);
@@ -3714,6 +3701,8 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
 
        trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
+       trans_pcie->hw_base = hw_base;
+
        /* Initialize the wait queue for commands */
        init_waitqueue_head(&trans_pcie->wait_command_queue);
 
@@ -3811,8 +3800,6 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
                                       PCIE_LINK_STATE_CLKPM);
        }
 
-       pci_set_master(pdev);
-
        addr_size = trans_pcie->txqs.tfd.addr_size;
        ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(addr_size));
        if (ret) {
@@ -3824,19 +3811,6 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
                }
        }
 
-       ret = pcim_request_all_regions(pdev, DRV_NAME);
-       if (ret) {
-               dev_err(&pdev->dev, "Requesting all PCI BARs failed.\n");
-               goto out_no_pci;
-       }
-
-       trans_pcie->hw_base = pcim_iomap(pdev, 0, 0);
-       if (!trans_pcie->hw_base) {
-               dev_err(&pdev->dev, "Could not ioremap PCI BAR 0.\n");
-               ret = -ENODEV;
-               goto out_no_pci;
-       }
-
        /* We disable the RETRY_TIMEOUT register (0x41) to keep
         * PCI Tx retries from interfering with C3 CPU state */
        pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
@@ -3844,13 +3818,6 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
        trans_pcie->pci_dev = pdev;
        iwl_disable_interrupts(trans);
 
-       info->hw_rev = iwl_read32(trans, CSR_HW_REV);
-       if (info->hw_rev == 0xffffffff) {
-               dev_err(&pdev->dev, "HW_REV=0xFFFFFFFF, PCI issues?\n");
-               ret = -EIO;
-               goto out_no_pci;
-       }
-
        /*
         * In the 8000 HW family the format of the 4 bytes of CSR_HW_REV have
         * changed, and now the revision step also includes bit 0-1 (no more
@@ -4132,18 +4099,20 @@ static void iwl_pcie_check_me_status(struct iwl_trans *trans)
 
 int iwl_pci_gen1_2_probe(struct pci_dev *pdev,
                         const struct pci_device_id *ent,
-                        const struct iwl_mac_cfg *trans)
+                        const struct iwl_mac_cfg *trans, u8 __iomem *hw_base,
+                        u32 hw_rev)
 {
        const struct iwl_dev_info *dev_info;
        struct iwl_trans_info info = {
                .hw_id = (pdev->device << 16) + pdev->subsystem_device,
+               .hw_rev = hw_rev,
        };
        struct iwl_trans *iwl_trans;
        struct iwl_trans_pcie *trans_pcie;
        unsigned int txcmd_size, txcmd_align;
        int ret;
 
-       iwl_trans = iwl_trans_pcie_alloc(pdev, trans, &info);
+       iwl_trans = iwl_trans_pcie_alloc(pdev, trans, &info, hw_base);
        if (IS_ERR(iwl_trans))
                return PTR_ERR(iwl_trans);