wifi: iwlwifi: remove GEN3 from a couple of macros

'GEN3' here really means 'AX210'. Rename.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250511195137.b7fb5b854ded.Ib52b84c6e36e312b2eeb84a3cf71c6185fb52ee7@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-fh.h b/drivers/net/wireless/intel/iwlwifi/iwl-fh.h
index c1c24f33e637283963aa0e10caae0a7dd9d30c36..df4bb499446a9e166d436d2e0409df58db287ef5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-fh.h
@@ -378,14 +378,14 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,
  * Once the RXF-to-DRAM DMA is active, this flag is immediately turned off.
  */
 #define RFH_GEN_STATUS         0xA09808
-#define RFH_GEN_STATUS_GEN3    0xA07824
+#define RFH_GEN_STATUS_AX210   0xA07824
 #define RBD_FETCH_IDLE BIT(29)
 #define SRAM_DMA_IDLE  BIT(30)
 #define RXF_DMA_IDLE   BIT(31)
 
 /* DMA configuration */
 #define RFH_RXF_DMA_CFG                0xA09820
-#define RFH_RXF_DMA_CFG_GEN3   0xA07880
+#define RFH_RXF_DMA_CFG_AX210  0xA07880
 /* RB size */
 #define RFH_RXF_DMA_RB_SIZE_MASK (0x000F0000) /* bits 16-19 */
 #define RFH_RXF_DMA_RB_SIZE_POS 16
@@ -593,8 +593,8 @@ struct iwl_rb_status {
 #define TFD_QUEUE_CB_SIZE(x)   (ilog2(x) - 3)
 #define TFD_QUEUE_SIZE_BC_DUP  (64)
 #define TFD_QUEUE_BC_SIZE      (TFD_QUEUE_SIZE_MAX + TFD_QUEUE_SIZE_BC_DUP)
-#define TFD_QUEUE_BC_SIZE_GEN3_AX210   1024
-#define TFD_QUEUE_BC_SIZE_GEN3_BZ      (1024 * 4)
+#define TFD_QUEUE_BC_SIZE_AX210        1024
+#define TFD_QUEUE_BC_SIZE_BZ   (1024 * 4)
 #define IWL_TX_DMA_MASK        DMA_BIT_MASK(36)
 #define IWL_NUM_OF_TBS         20
 #define IWL_TFH_NUM_TBS                25

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
index c5fdadf7de1f89aff64771b2d78f91fab2ec1f9b..72ee9ddc1b19655e623f70aae142858a73c92dc6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
@@ -146,8 +146,8 @@ int iwl_pcie_rx_stop(struct iwl_trans *trans)
 {
        if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_AX210) {
                /* TODO: remove this once fw does it */
-               iwl_write_umac_prph(trans, RFH_RXF_DMA_CFG_GEN3, 0);
-               return iwl_poll_umac_prph_bit(trans, RFH_GEN_STATUS_GEN3,
+               iwl_write_umac_prph(trans, RFH_RXF_DMA_CFG_AX210, 0);
+               return iwl_poll_umac_prph_bit(trans, RFH_GEN_STATUS_AX210,
                                              RXF_DMA_IDLE, RXF_DMA_IDLE, 1000);
        } else if (trans->mac_cfg->mq_rx_supported) {
                iwl_write_prph(trans, RFH_RXF_DMA_CFG, 0);

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index bc4753ec4819f1bc387e63847a003074ddf1d841..694e1ed1eae01606e59be3e1559f4144172673a5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3834,10 +3834,10 @@ iwl_trans_pcie_alloc(struct pci_dev *pdev,
 
        if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)
                trans_pcie->txqs.bc_tbl_size =
-                       sizeof(struct iwl_gen3_bc_tbl_entry) * TFD_QUEUE_BC_SIZE_GEN3_BZ;
+                       sizeof(struct iwl_gen3_bc_tbl_entry) * TFD_QUEUE_BC_SIZE_BZ;
        else if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_AX210)
                trans_pcie->txqs.bc_tbl_size =
-                       sizeof(struct iwl_gen3_bc_tbl_entry) * TFD_QUEUE_BC_SIZE_GEN3_AX210;
+                       sizeof(struct iwl_gen3_bc_tbl_entry) * TFD_QUEUE_BC_SIZE_AX210;
        else
                trans_pcie->txqs.bc_tbl_size = sizeof(struct iwlagn_scd_bc_tbl);
        /*