wifi: iwlwifi: trans: move dev_cmd_pool to trans specific

This pool has different parameters for different devices,
move it to the generation specific transport sub-layer.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250828111032.faf685de7aa2.I83e31e36d3159aa5c7e6f82a773d9981d3aac70d@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
index a19ffff2fffba630cfd22c17b82bc2cae06bbbf2..485e00d6158c34e48b712a33651aab243d6a9614 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
@@ -268,9 +268,7 @@ 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,
-                                 unsigned int txcmd_size,
-                                 unsigned int txcmd_align)
+                                 const struct iwl_mac_cfg *mac_cfg)
 {
        struct iwl_trans *trans;
 #ifdef CONFIG_LOCKDEP
@@ -292,22 +290,12 @@ struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
 
        INIT_DELAYED_WORK(&trans->restart.wk, iwl_trans_restart_wk);
 
-       snprintf(trans->dev_cmd_pool_name, sizeof(trans->dev_cmd_pool_name),
-                "iwl_cmd_pool:%s", dev_name(trans->dev));
-       trans->dev_cmd_pool =
-               kmem_cache_create(trans->dev_cmd_pool_name,
-                                 txcmd_size, txcmd_align,
-                                 SLAB_HWCACHE_ALIGN, NULL);
-       if (!trans->dev_cmd_pool)
-               return NULL;
-
        return trans;
 }
 
 void iwl_trans_free(struct iwl_trans *trans)
 {
        cancel_delayed_work_sync(&trans->restart.wk);
-       kmem_cache_destroy(trans->dev_cmd_pool);
 }
 
 int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
@@ -345,6 +333,19 @@ int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
 }
 IWL_EXPORT_SYMBOL(iwl_trans_send_cmd);
 
+struct iwl_device_tx_cmd *iwl_trans_alloc_tx_cmd(struct iwl_trans *trans)
+{
+       return iwl_pcie_gen1_2_alloc_tx_cmd(trans);
+}
+IWL_EXPORT_SYMBOL(iwl_trans_alloc_tx_cmd);
+
+void iwl_trans_free_tx_cmd(struct iwl_trans *trans,
+                          struct iwl_device_tx_cmd *dev_cmd)
+{
+       iwl_pcie_gen1_2_free_tx_cmd(trans, dev_cmd);
+}
+IWL_EXPORT_SYMBOL(iwl_trans_free_tx_cmd);
+
 /* Comparator for struct iwl_hcmd_names.
  * Used in the binary search over a list of host commands.
  *

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index b0bf88a889b4d7c464e4211744ca839b34224ed1..277fd4131999b0f2545c4b399e088431414067b1 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -854,9 +854,6 @@ struct iwl_trans_info {
  * @fail_to_parse_pnvm_image: set to true if pnvm parsing failed
  * @reduce_power_loaded: indicates reduced power section was loaded
  * @failed_to_load_reduce_power_image: set to true if pnvm loading failed
- * @dev_cmd_pool: pool for Tx cmd allocation - for internal use only.
- *     The user should use iwl_trans_{alloc,free}_tx_cmd.
- * @dev_cmd_pool_name: name for the TX command allocation pool
  * @dbgfs_dir: iwlwifi debugfs base dir for this device
  * @sync_cmd_lockdep_map: lockdep map for checking sync commands
  * @dbg: additional debug data, see &struct iwl_trans_debug
@@ -896,10 +893,6 @@ struct iwl_trans {
        u8 reduce_power_loaded:1;
        u8 failed_to_load_reduce_power_image:1;
 
-       /* The following fields are internal only */
-       struct kmem_cache *dev_cmd_pool;
-       char dev_cmd_pool_name[50];
-
        struct dentry *dbgfs_dir;
 
 #ifdef CONFIG_LOCKDEP
@@ -948,19 +941,12 @@ iwl_trans_dump_data(struct iwl_trans *trans, u32 dump_mask,
                    const struct iwl_dump_sanitize_ops *sanitize_ops,
                    void *sanitize_ctx);
 
-static inline struct iwl_device_tx_cmd *
-iwl_trans_alloc_tx_cmd(struct iwl_trans *trans)
-{
-       return kmem_cache_zalloc(trans->dev_cmd_pool, GFP_ATOMIC);
-}
+struct iwl_device_tx_cmd *iwl_trans_alloc_tx_cmd(struct iwl_trans *trans);
 
 int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);
 
-static inline void iwl_trans_free_tx_cmd(struct iwl_trans *trans,
-                                        struct iwl_device_tx_cmd *dev_cmd)
-{
-       kmem_cache_free(trans->dev_cmd_pool, dev_cmd);
-}
+void iwl_trans_free_tx_cmd(struct iwl_trans *trans,
+                          struct iwl_device_tx_cmd *dev_cmd);
 
 int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,
                 struct iwl_device_tx_cmd *dev_cmd, int queue);
@@ -1187,9 +1173,7 @@ static inline void iwl_trans_finish_sw_reset(struct iwl_trans *trans)
  *****************************************************/
 struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
                                  struct device *dev,
-                                 const struct iwl_mac_cfg *mac_cfg,
-                                 unsigned int txcmd_size,
-                                 unsigned int txcmd_align);
+                                 const struct iwl_mac_cfg *mac_cfg);
 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/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
index 54b9788300436f6dc9b1ef019cf36fbffe5ea8ee..b5ff7a6da325aca1f294022053e258027e4c87da 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
@@ -400,6 +400,9 @@ struct iwl_pcie_txqs {
  * @me_recheck_wk: worker to recheck WiAMT/CSME presence
  * @invalid_tx_cmd: invalid TX command buffer
  * @wait_command_queue: wait queue for sync commands
+ * @dev_cmd_pool: pool for Tx cmd allocation - for internal use only.
+ *     The user should use iwl_trans_{alloc,free}_tx_cmd.
+ * @dev_cmd_pool_name: name for the TX command allocation pool
  */
 struct iwl_trans_pcie {
        struct iwl_rxq *rxq;
@@ -506,6 +509,9 @@ struct iwl_trans_pcie {
        struct iwl_dma_ptr invalid_tx_cmd;
 
        wait_queue_head_t wait_command_queue;
+
+       struct kmem_cache *dev_cmd_pool;
+       char dev_cmd_pool_name[50];
 };
 
 static inline struct iwl_trans_pcie *
@@ -783,6 +789,23 @@ static inline u16 iwl_txq_gen1_tfd_tb_get_len(struct iwl_trans *trans,
        return le16_to_cpu(tb->hi_n_len) >> 4;
 }
 
+static inline struct iwl_device_tx_cmd *
+iwl_pcie_gen1_2_alloc_tx_cmd(struct iwl_trans *trans)
+{
+       struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+
+       return kmem_cache_zalloc(trans_pcie->dev_cmd_pool, GFP_ATOMIC);
+}
+
+static inline void
+iwl_pcie_gen1_2_free_tx_cmd(struct iwl_trans *trans,
+                           struct iwl_device_tx_cmd *dev_cmd)
+{
+       struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+
+       kmem_cache_free(trans_pcie->dev_cmd_pool, dev_cmd);
+}
+
 void iwl_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
                      struct sk_buff_head *skbs, bool is_flush);
 void iwl_pcie_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr);

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 0946ea223e460c31fb431593868315b2e6da4966..7aa9683624f06e634dfb3f5250bb61bea68a4d3d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -2023,6 +2023,7 @@ void iwl_trans_pcie_free(struct iwl_trans *trans)
                free_percpu(trans_pcie->txqs.tso_hdr_page);
        }
 
+       kmem_cache_destroy(trans_pcie->dev_cmd_pool);
        iwl_trans_free(trans);
 }
 
@@ -3707,28 +3708,40 @@ 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)
+static int iwl_trans_pcie_alloc_txcmd_pool(struct iwl_trans *trans)
 {
-       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;
+       struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+       unsigned int txcmd_size, txcmd_align;
+
+       if (!trans->mac_cfg->gen2) {
+               txcmd_size = sizeof(struct iwl_tx_cmd_v6);
+               txcmd_align = sizeof(void *);
+       } else if (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;
+               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 */
+       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)))
+       if (WARN_ON((trans->mac_cfg->gen2 && txcmd_size >= txcmd_align)))
                return -EINVAL;
 
+       snprintf(trans_pcie->dev_cmd_pool_name,
+                sizeof(trans_pcie->dev_cmd_pool_name),
+                "iwl_cmd_pool:%s", dev_name(trans->dev));
+
+       trans_pcie->dev_cmd_pool =
+               kmem_cache_create(trans_pcie->dev_cmd_pool_name,
+                                 txcmd_size, txcmd_align,
+                                 SLAB_HWCACHE_ALIGN, NULL);
+       if (!trans_pcie->dev_cmd_pool)
+               return -ENOMEM;
+
        return 0;
 }
 
@@ -3738,18 +3751,12 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
                     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, txcmd_size, txcmd_align);
+                               mac_cfg);
        if (!trans)
                return ERR_PTR(-ENOMEM);
 
@@ -3760,6 +3767,10 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
        /* Initialize the wait queue for commands */
        init_waitqueue_head(&trans_pcie->wait_command_queue);
 
+       ret = iwl_trans_pcie_alloc_txcmd_pool(trans);
+       if (ret)
+               goto out_free_trans;
+
        if (trans->mac_cfg->gen2) {
                trans_pcie->txqs.tfd.addr_size = 64;
                trans_pcie->txqs.tfd.max_tbs = IWL_TFH_NUM_TBS;
@@ -3779,7 +3790,7 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
        trans_pcie->txqs.tso_hdr_page = alloc_percpu(struct iwl_tso_hdr_page);
        if (!trans_pcie->txqs.tso_hdr_page) {
                ret = -ENOMEM;
-               goto out_free_trans;
+               goto out_free_txcmd_pool;
        }
 
        if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)
@@ -3929,6 +3940,8 @@ out_free_ndev:
        free_netdev(trans_pcie->napi_dev);
 out_free_tso:
        free_percpu(trans_pcie->txqs.tso_hdr_page);
+out_free_txcmd_pool:
+       kmem_cache_destroy(trans_pcie->dev_cmd_pool);
 out_free_trans:
        iwl_trans_free(trans);
        return ERR_PTR(ret);