wifi: iwlwifi: pcie: relocate finish_nic_init logic to gen1_2

Refactor finish_nic_init by moving its logic to the gen1_2 transport
layer.
Prepares for future gen3 support.

Signed-off-by: Itamar Shalev <itamar.shalev@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250826184046.9fcc48d81435.I13403938219765b79c299ea081e8373d0e007785@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
index 5e483a55a4ba2326f28cb9abc1a2335d6c5fdb8a..0a68378dd5059a30c7729d923fa23a42cc3ac5c5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -3,7 +3,6 @@
  * Copyright (C) 2003-2014, 2018-2022, 2024-2025 Intel Corporation
  * Copyright (C) 2015-2016 Intel Deutschland GmbH
  */
-#include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/export.h>
 
@@ -13,6 +12,7 @@
 #include "iwl-debug.h"
 #include "iwl-prph.h"
 #include "iwl-fh.h"
+#include "pcie/gen1_2/internal.h"
 
 void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val)
 {
@@ -396,94 +396,9 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf)
        return 0;
 }
 
-#define IWL_HOST_MON_BLOCK_PEMON       0x00
-#define IWL_HOST_MON_BLOCK_HIPM                0x22
-
-#define IWL_HOST_MON_BLOCK_PEMON_VEC0  0x00
-#define IWL_HOST_MON_BLOCK_PEMON_VEC1  0x01
-#define IWL_HOST_MON_BLOCK_PEMON_WFPM  0x06
-
-static void iwl_dump_host_monitor_block(struct iwl_trans *trans,
-                                       u32 block, u32 vec, u32 iter)
-{
-       int i;
-
-       IWL_ERR(trans, "Host monitor block 0x%x vector 0x%x\n", block, vec);
-       iwl_write32(trans, CSR_MONITOR_CFG_REG, (block << 8) | vec);
-       for (i = 0; i < iter; i++)
-               IWL_ERR(trans, "    value [iter %d]: 0x%08x\n",
-                       i, iwl_read32(trans, CSR_MONITOR_STATUS_REG));
-}
-
-static void iwl_dump_host_monitor(struct iwl_trans *trans)
-{
-       switch (trans->mac_cfg->device_family) {
-       case IWL_DEVICE_FAMILY_22000:
-       case IWL_DEVICE_FAMILY_AX210:
-               IWL_ERR(trans, "CSR_RESET = 0x%x\n",
-                       iwl_read32(trans, CSR_RESET));
-               iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,
-                                           IWL_HOST_MON_BLOCK_PEMON_VEC0, 15);
-               iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,
-                                           IWL_HOST_MON_BLOCK_PEMON_VEC1, 15);
-               iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,
-                                           IWL_HOST_MON_BLOCK_PEMON_WFPM, 15);
-               iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_HIPM,
-                                           IWL_HOST_MON_BLOCK_PEMON_VEC0, 1);
-               break;
-       default:
-               /* not supported yet */
-               return;
-       }
-}
-
 int iwl_finish_nic_init(struct iwl_trans *trans)
 {
-       const struct iwl_mac_cfg *mac_cfg = trans->mac_cfg;
-       u32 poll_ready;
-       int err;
-
-       if (mac_cfg->bisr_workaround) {
-               /* ensure the TOP FSM isn't still in previous reset */
-               mdelay(2);
-       }
-
-       /*
-        * Set "initialization complete" bit to move adapter from
-        * D0U* --> D0A* (powered-up active) state.
-        */
-       if (mac_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) {
-               iwl_set_bit(trans, CSR_GP_CNTRL,
-                           CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ |
-                           CSR_GP_CNTRL_REG_FLAG_MAC_INIT);
-               poll_ready = CSR_GP_CNTRL_REG_FLAG_MAC_STATUS;
-       } else {
-               iwl_set_bit(trans, CSR_GP_CNTRL,
-                           CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
-               poll_ready = CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY;
-       }
-
-       if (mac_cfg->device_family == IWL_DEVICE_FAMILY_8000)
-               udelay(2);
-
-       /*
-        * Wait for clock stabilization; once stabilized, access to
-        * device-internal resources is supported, e.g. iwl_write_prph()
-        * and accesses to uCode SRAM.
-        */
-       err = iwl_poll_bits(trans, CSR_GP_CNTRL, poll_ready, 25000);
-       if (err < 0) {
-               IWL_DEBUG_INFO(trans, "Failed to wake NIC\n");
-
-               iwl_dump_host_monitor(trans);
-       }
-
-       if (mac_cfg->bisr_workaround) {
-               /* ensure BISR shift has finished */
-               udelay(200);
-       }
-
-       return err < 0 ? err : 0;
+       return iwl_pcie_gen1_2_finish_nic_init(trans);
 }
 IWL_EXPORT_SYMBOL(iwl_finish_nic_init);
 

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 f48aeebb151cc6c85f39114ed44e35cb57f73121..eca524c6a9f3a18c815d7c9047f7ed5ca0893ce2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
@@ -1105,6 +1105,7 @@ int iwl_pcie_alloc_dma_ptr(struct iwl_trans *trans,
                           struct iwl_dma_ptr *ptr, size_t size);
 void iwl_pcie_free_dma_ptr(struct iwl_trans *trans, struct iwl_dma_ptr *ptr);
 void iwl_pcie_apply_destination(struct iwl_trans *trans);
+int iwl_pcie_gen1_2_finish_nic_init(struct iwl_trans *trans);
 
 /* transport gen 2 exported functions */
 int iwl_trans_pcie_gen2_start_fw(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 327366bf87de78a5d4c16d8e228b7fa74f0e94d6..3e50a935e1d039ddb2e170d01c165875a491a9f5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -32,6 +32,46 @@
 #include "pcie/iwl-context-info-v2.h"
 #include "pcie/utils.h"
 
+#define IWL_HOST_MON_BLOCK_PEMON       0x00
+#define IWL_HOST_MON_BLOCK_HIPM                0x22
+
+#define IWL_HOST_MON_BLOCK_PEMON_VEC0  0x00
+#define IWL_HOST_MON_BLOCK_PEMON_VEC1  0x01
+#define IWL_HOST_MON_BLOCK_PEMON_WFPM  0x06
+
+static void iwl_dump_host_monitor_block(struct iwl_trans *trans,
+                                       u32 block, u32 vec, u32 iter)
+{
+       int i;
+
+       IWL_ERR(trans, "Host monitor block 0x%x vector 0x%x\n", block, vec);
+       iwl_write32(trans, CSR_MONITOR_CFG_REG, (block << 8) | vec);
+       for (i = 0; i < iter; i++)
+               IWL_ERR(trans, "    value [iter %d]: 0x%08x\n",
+                       i, iwl_read32(trans, CSR_MONITOR_STATUS_REG));
+}
+
+static void iwl_pcie_dump_host_monitor(struct iwl_trans *trans)
+{
+       switch (trans->mac_cfg->device_family) {
+       case IWL_DEVICE_FAMILY_22000:
+       case IWL_DEVICE_FAMILY_AX210:
+               IWL_ERR(trans, "CSR_RESET = 0x%x\n",
+                       iwl_read32(trans, CSR_RESET));
+               iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,
+                                           IWL_HOST_MON_BLOCK_PEMON_VEC0, 15);
+               iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,
+                                           IWL_HOST_MON_BLOCK_PEMON_VEC1, 15);
+               iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,
+                                           IWL_HOST_MON_BLOCK_PEMON_WFPM, 15);
+               iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_HIPM,
+                                           IWL_HOST_MON_BLOCK_PEMON_VEC0, 1);
+               break;
+       default:
+               return;
+       }
+}
+
 /* extended range in FW SRAM */
 #define IWL_FW_MEM_EXTENDED_START      0x40000
 #define IWL_FW_MEM_EXTENDED_END                0x57FFF
@@ -4271,3 +4311,52 @@ out_free_trans:
        iwl_trans_pcie_free(iwl_trans);
        return ret;
 }
+
+int iwl_pcie_gen1_2_finish_nic_init(struct iwl_trans *trans)
+{
+       const struct iwl_mac_cfg *mac_cfg = trans->mac_cfg;
+       u32 poll_ready;
+       int err;
+
+       if (mac_cfg->bisr_workaround) {
+               /* ensure the TOP FSM isn't still in previous reset */
+               mdelay(2);
+       }
+
+       /*
+        * Set "initialization complete" bit to move adapter from
+        * D0U* --> D0A* (powered-up active) state.
+        */
+       if (mac_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) {
+               iwl_set_bit(trans, CSR_GP_CNTRL,
+                           CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ |
+                           CSR_GP_CNTRL_REG_FLAG_MAC_INIT);
+               poll_ready = CSR_GP_CNTRL_REG_FLAG_MAC_STATUS;
+       } else {
+               iwl_set_bit(trans, CSR_GP_CNTRL,
+                           CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+               poll_ready = CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY;
+       }
+
+       if (mac_cfg->device_family == IWL_DEVICE_FAMILY_8000)
+               udelay(2);
+
+       /*
+        * Wait for clock stabilization; once stabilized, access to
+        * device-internal resources is supported, e.g. iwl_write_prph()
+        * and accesses to uCode SRAM.
+        */
+       err = iwl_poll_bits(trans, CSR_GP_CNTRL, poll_ready, 25000);
+       if (err < 0) {
+               IWL_DEBUG_INFO(trans, "Failed to wake NIC\n");
+
+               iwl_pcie_dump_host_monitor(trans);
+       }
+
+       if (mac_cfg->bisr_workaround) {
+               /* ensure BISR shift has finished */
+               udelay(200);
+       }
+
+       return err;
+}