wifi: iwlwifi: trans: remove iwl_trans_init

We needed it for setting up trans parameters that could change later in
the probe flow.
This is no longer true, now we know all the parameters before we allocate the
trans, so we can just send the right parameters to iwl_trans_alloc and have all
initializations done there.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
 .../net/wireless/intel/iwlwifi/iwl-trans.c    | 25 ++--------
 .../net/wireless/intel/iwlwifi/iwl-trans.h    |  8 +--
 .../intel/iwlwifi/pcie/gen1_2/trans.c         | 50 ++++++++++++-------
 3 files changed, 41 insertions(+), 42 deletions(-)
Link: https://patch.msgid.link/20250709081300.9602fde079de.Iaede14c91095560852f9b441f1e16546b0a06bdd@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
index 6288779ff8ec524c84aeffa9dd7c6f829d864b16..9604781dd0b7094400e54b63a2f7214a34007512 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
@@ -268,7 +268,9 @@ static void iwl_trans_restart_wk(struct work_struct *wk)
 
 struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
                                  struct device *dev,
-                                 const struct iwl_mac_cfg *mac_cfg)
+                                 const struct iwl_mac_cfg *mac_cfg,
+                                 unsigned int txcmd_size,
+                                 unsigned int txcmd_align)
 {
        struct iwl_trans *trans;
 #ifdef CONFIG_LOCKDEP
@@ -290,23 +292,6 @@ struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
 
        INIT_DELAYED_WORK(&trans->restart.wk, iwl_trans_restart_wk);
 
-       return trans;
-}
-
-int iwl_trans_init(struct iwl_trans *trans, unsigned int txcmd_size,
-                  unsigned int txcmd_align)
-{
-       /* check if name/num_rx_queues were set as a proxy for info being set */
-       if (WARN_ON(!trans->info.name || !trans->info.num_rxqs))
-               return -EINVAL;
-
-       txcmd_size += sizeof(struct iwl_cmd_header);
-       txcmd_size += 36; /* biggest possible 802.11 header */
-
-       /* Ensure device TX cmd cannot reach/cross a page boundary in gen2 */
-       if (WARN_ON(trans->mac_cfg->gen2 && txcmd_size >= txcmd_align))
-               return -EINVAL;
-
        snprintf(trans->dev_cmd_pool_name, sizeof(trans->dev_cmd_pool_name),
                 "iwl_cmd_pool:%s", dev_name(trans->dev));
        trans->dev_cmd_pool =
@@ -314,9 +299,9 @@ int iwl_trans_init(struct iwl_trans *trans, unsigned int txcmd_size,
                                  txcmd_size, txcmd_align,
                                  SLAB_HWCACHE_ALIGN, NULL);
        if (!trans->dev_cmd_pool)
-               return -ENOMEM;
+               return NULL;
 
-       return 0;
+       return trans;
 }
 
 void iwl_trans_free(struct iwl_trans *trans)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index 49a695e301097ab1fbd863713d6c8d505707128c..103a36d8ee306d06dfb020fa28137cc6cb0af3f5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -1204,10 +1204,10 @@ static inline void iwl_trans_finish_sw_reset(struct iwl_trans *trans)
  * transport helper functions
  *****************************************************/
 struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
-                         struct device *dev,
-                         const struct iwl_mac_cfg *cfg_trans);
-int iwl_trans_init(struct iwl_trans *trans, unsigned int txcmd_size,
-                  unsigned int txcmd_align);
+                                 struct device *dev,
+                                 const struct iwl_mac_cfg *mac_cfg,
+                                 unsigned int txcmd_size,
+                                 unsigned int txcmd_align);
 void iwl_trans_free(struct iwl_trans *trans);
 
 static inline bool iwl_trans_is_hw_error_value(u32 val)

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 3f1861efc7164b0e0b73a447adc83f894f48382d..2262c1e96e8d8936880525688e42e36ac042518f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -3684,18 +3684,49 @@ void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans)
        iwl_trans_sync_nmi_with_addr(trans, inta_addr, sw_err_bit);
 }
 
+static int iwl_trans_pcie_set_txcmd_info(const struct iwl_mac_cfg *mac_cfg,
+                                        unsigned int *txcmd_size,
+                                        unsigned int *txcmd_align)
+{
+       if (!mac_cfg->gen2) {
+               *txcmd_size = sizeof(struct iwl_tx_cmd_v6);
+               *txcmd_align = sizeof(void *);
+       } else if (mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210) {
+               *txcmd_size = sizeof(struct iwl_tx_cmd_v9);
+               *txcmd_align = 64;
+       } else {
+               *txcmd_size = sizeof(struct iwl_tx_cmd);
+               *txcmd_align = 128;
+       }
+
+       *txcmd_size += sizeof(struct iwl_cmd_header);
+       *txcmd_size += 36; /* biggest possible 802.11 header */
+
+       /* Ensure device TX cmd cannot reach/cross a page boundary in gen2 */
+       if (WARN_ON((mac_cfg->gen2 && *txcmd_size >= *txcmd_align)))
+               return -EINVAL;
+
+       return 0;
+}
+
 static struct iwl_trans *
 iwl_trans_pcie_alloc(struct pci_dev *pdev,
                     const struct iwl_mac_cfg *mac_cfg,
                     struct iwl_trans_info *info, u8 __iomem *hw_base)
 {
        struct iwl_trans_pcie *trans_pcie, **priv;
+       unsigned int txcmd_size, txcmd_align;
        struct iwl_trans *trans;
        unsigned int bc_tbl_n_entries;
        int ret, addr_size;
 
+       ret = iwl_trans_pcie_set_txcmd_info(mac_cfg, &txcmd_size,
+                                           &txcmd_align);
+       if (ret)
+               return ERR_PTR(ret);
+
        trans = iwl_trans_alloc(sizeof(struct iwl_trans_pcie), &pdev->dev,
-                               mac_cfg);
+                               mac_cfg, txcmd_size, txcmd_align);
        if (!trans)
                return ERR_PTR(-ENOMEM);
 
@@ -4109,7 +4140,6 @@ int iwl_pci_gen1_2_probe(struct pci_dev *pdev,
        };
        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, hw_base);
@@ -4218,22 +4248,6 @@ int iwl_pci_gen1_2_probe(struct pci_dev *pdev,
 
        iwl_trans_set_info(iwl_trans, &info);
 
-       if (!iwl_trans->mac_cfg->gen2) {
-               txcmd_size = sizeof(struct iwl_tx_cmd_v6);
-               txcmd_align = sizeof(void *);
-       } else if (iwl_trans->mac_cfg->device_family <
-                  IWL_DEVICE_FAMILY_AX210) {
-               txcmd_size = sizeof(struct iwl_tx_cmd_v9);
-               txcmd_align = 64;
-       } else {
-               txcmd_size = sizeof(struct iwl_tx_cmd);
-               txcmd_align = 128;
-       }
-       ret = iwl_trans_init(iwl_trans, txcmd_size, txcmd_align);
-
-       if (ret)
-               goto out_free_trans;
-
        pci_set_drvdata(pdev, iwl_trans);
 
        iwl_pcie_check_me_status(iwl_trans);