Commit f74cb4d0 authored by Miri Korenblit's avatar Miri Korenblit
Browse files

wifi: iwlwifi: remove GEN3 from a couple of macros 



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

Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250511195137.b7fb5b854ded.Ib52b84c6e36e312b2eeb84a3cf71c6185fb52ee7@changeid
parent 1c97c73c

drivers/net/wireless/intel/iwlwifi/iwl-fh.h

+4 −4
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/intel/iwlwifi/pcie/rx.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	/*