wifi: iwlwifi: move iwl_trans_pcie_write_mem to iwl-trans.c

Move the iwl_trans_pcie_write_mem function to iwl_trans_write_mem
in iwl-trans.c as it is not specific to PCIe.

Signed-off-by: Rotem Kerem <rotem.kerem@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250612144708.52034d131773.Ie783304faae7ec3a95a510dfee925838fe6466b4@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
index 5dba76b009a629fd26cba1f961c1174e9ed1454a..78808c956444f2bc0e2ae384be107d6974e984e4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
@@ -497,7 +497,19 @@ IWL_EXPORT_SYMBOL(iwl_trans_read_mem);
 int iwl_trans_write_mem(struct iwl_trans *trans, u32 addr,
                        const void *buf, int dwords)
 {
-       return iwl_trans_pcie_write_mem(trans, addr, buf, dwords);
+       int offs, ret = 0;
+       const u32 *vals = buf;
+
+       if (iwl_trans_grab_nic_access(trans)) {
+               iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr);
+               for (offs = 0; offs < dwords; offs++)
+                       iwl_write32(trans, HBUS_TARG_MEM_WDAT,
+                                   vals ? vals[offs] : 0);
+               iwl_trans_release_nic_access(trans);
+       } else {
+               ret = -EBUSY;
+       }
+       return ret;
 }
 IWL_EXPORT_SYMBOL(iwl_trans_write_mem);
 

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 52c6c22e2cc657d46a27f745880b58f3b73a95cf..007f63a8d3c84ffad57e9f83fe5af6596863f92e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
@@ -1089,8 +1089,6 @@ u32 iwl_trans_pcie_read_prph(struct iwl_trans *trans, u32 reg);
 void iwl_trans_pcie_write_prph(struct iwl_trans *trans, u32 addr, u32 val);
 int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,
                            void *buf, int dwords);
-int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr,
-                            const void *buf, int dwords);
 int iwl_trans_pcie_sw_reset(struct iwl_trans *trans, bool retake_ownership);
 struct iwl_trans_dump_data *
 iwl_trans_pcie_dump_data(struct iwl_trans *trans, u32 dump_mask,

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 c31a62b8f92582a94cb12302cd176770bcd9807b..174bfc66c285ec7d614d20c1c5968c932c2f2f3e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -2485,24 +2485,6 @@ int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,
        return 0;
 }
 
-int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr,
-                            const void *buf, int dwords)
-{
-       int offs, ret = 0;
-       const u32 *vals = buf;
-
-       if (iwl_trans_grab_nic_access(trans)) {
-               iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr);
-               for (offs = 0; offs < dwords; offs++)
-                       iwl_write32(trans, HBUS_TARG_MEM_WDAT,
-                                   vals ? vals[offs] : 0);
-               iwl_trans_release_nic_access(trans);
-       } else {
-               ret = -EBUSY;
-       }
-       return ret;
-}
-
 int iwl_trans_pcie_read_config32(struct iwl_trans *trans, u32 ofs,
                                 u32 *val)
 {

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
index 7abd7c7daa89f61cb9dbe508c4084cdd75c77dd2..e39451d27a93198272df926b784eaaea26da68fc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
@@ -494,9 +494,9 @@ void iwl_pcie_tx_start(struct iwl_trans *trans)
                iwl_read_prph(trans, SCD_SRAM_BASE_ADDR);
 
        /* reset context data, TX status and translation data */
-       iwl_trans_pcie_write_mem(trans, trans_pcie->scd_base_addr +
-                                       SCD_CONTEXT_MEM_LOWER_BOUND,
-                                NULL, clear_dwords);
+       iwl_trans_write_mem(trans, trans_pcie->scd_base_addr +
+                                  SCD_CONTEXT_MEM_LOWER_BOUND,
+                           NULL, clear_dwords);
 
        iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
                       trans_pcie->txqs.scd_bc_tbls.dma >> 10);
@@ -1292,9 +1292,8 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id,
        if (configure_scd) {
                iwl_scd_txq_set_inactive(trans, txq_id);
 
-               iwl_trans_pcie_write_mem(trans, stts_addr,
-                                        (const void *)zero_val,
-                                        ARRAY_SIZE(zero_val));
+               iwl_trans_write_mem(trans, stts_addr, (const void *)zero_val,
+                                   ARRAY_SIZE(zero_val));
        }
 
        iwl_pcie_txq_unmap(trans, txq_id);