Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d86422a authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwlwifi: move rx queue read pointer into rxq 



This patch moves rx status/read registers into
iwl_rx_queue structures. This solution is more memory
hungry but is more structured and provides needed RX/TX
separation

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5c5aa3f1

drivers/net/wireless/iwlwifi/iwl-4965-hw.h

+0 −27
Original line number Diff line number Diff line
@@ -927,33 +927,6 @@ struct iwl4965_schedq_bc_tbl { 
 */

struct iwl4965_shared {

	struct iwl4965_schedq_bc_tbl queues_bc_tbls[IWL49_NUM_QUEUES];

	__le32 rb_closed;



	/* __le32 rb_closed_stts_rb_num:12; */

#define IWL_rb_closed_stts_rb_num_POS 0

#define IWL_rb_closed_stts_rb_num_LEN 12

#define IWL_rb_closed_stts_rb_num_SYM rb_closed

	/* __le32 rsrv1:4; */

	/* __le32 rb_closed_stts_rx_frame_num:12; */

#define IWL_rb_closed_stts_rx_frame_num_POS 16

#define IWL_rb_closed_stts_rx_frame_num_LEN 12

#define IWL_rb_closed_stts_rx_frame_num_SYM rb_closed

	/* __le32 rsrv2:4; */



	__le32 frm_finished;

	/* __le32 frame_finished_stts_rb_num:12; */

#define IWL_frame_finished_stts_rb_num_POS 0

#define IWL_frame_finished_stts_rb_num_LEN 12

#define IWL_frame_finished_stts_rb_num_SYM frm_finished

	/* __le32 rsrv3:4; */

	/* __le32 frame_finished_stts_rx_frame_num:12; */

#define IWL_frame_finished_stts_rx_frame_num_POS 16

#define IWL_frame_finished_stts_rx_frame_num_LEN 12

#define IWL_frame_finished_stts_rx_frame_num_SYM frm_finished

	/* __le32 rsrv4:4; */



	__le32 padding1;  /* so that allocation will be aligned to 16B */

	__le32 padding2;

} __attribute__ ((packed));



#endif /* __iwl4965_4965_hw_h__ */

drivers/net/wireless/iwlwifi/iwl-4965.c

+0 −9
Original line number Diff line number Diff line
@@ -1631,12 +1631,6 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel) 
}

#endif



static int iwl4965_shared_mem_rx_idx(struct iwl_priv *priv)

{

	struct iwl4965_shared *s = priv->shared_virt;

	return le32_to_cpu(s->rb_closed) & 0xFFF;

}



static int iwl4965_alloc_shared_mem(struct iwl_priv *priv)

{

	priv->shared_virt = pci_alloc_consistent(priv->pci_dev,
@@ -1647,8 +1641,6 @@ static int iwl4965_alloc_shared_mem(struct iwl_priv *priv) 


	memset(priv->shared_virt, 0, sizeof(struct iwl4965_shared));



	priv->rb_closed_offset = offsetof(struct iwl4965_shared, rb_closed);



	return 0;

}
@@ -2306,7 +2298,6 @@ static struct iwl_lib_ops iwl4965_lib = { 
	.set_hw_params = iwl4965_hw_set_hw_params,

	.alloc_shared_mem = iwl4965_alloc_shared_mem,

	.free_shared_mem = iwl4965_free_shared_mem,

	.shared_mem_rx_idx = iwl4965_shared_mem_rx_idx,

	.txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,

	.txq_set_sched = iwl4965_txq_set_sched,

	.txq_agg_enable = iwl4965_txq_agg_enable,

drivers/net/wireless/iwlwifi/iwl-5000-hw.h

+0 −29
Original line number Diff line number Diff line
@@ -96,38 +96,9 @@ struct iwl5000_schedq_bc_tbl { 


/**

 * struct iwl5000_shared

 * @rb_closed

 * 	address is provided to FH_RSCSR_CHNL0_STTS_WPTR_REG

 */

struct iwl5000_shared {

	struct iwl5000_schedq_bc_tbl queues_bc_tbls[IWL50_NUM_QUEUES];

	__le32 rb_closed;



	/* __le32 rb_closed_stts_rb_num:12; */

#define IWL_rb_closed_stts_rb_num_POS 0

#define IWL_rb_closed_stts_rb_num_LEN 12

#define IWL_rb_closed_stts_rb_num_SYM rb_closed

	/* __le32 rsrv1:4; */

	/* __le32 rb_closed_stts_rx_frame_num:12; */

#define IWL_rb_closed_stts_rx_frame_num_POS 16

#define IWL_rb_closed_stts_rx_frame_num_LEN 12

#define IWL_rb_closed_stts_rx_frame_num_SYM rb_closed

	/* __le32 rsrv2:4; */



	__le32 frm_finished;

	/* __le32 frame_finished_stts_rb_num:12; */

#define IWL_frame_finished_stts_rb_num_POS 0

#define IWL_frame_finished_stts_rb_num_LEN 12

#define IWL_frame_finished_stts_rb_num_SYM frm_finished

	/* __le32 rsrv3:4; */

	/* __le32 frame_finished_stts_rx_frame_num:12; */

#define IWL_frame_finished_stts_rx_frame_num_POS 16

#define IWL_frame_finished_stts_rx_frame_num_LEN 12

#define IWL_frame_finished_stts_rx_frame_num_SYM frm_finished

	/* __le32 rsrv4:4; */



	__le32 padding1;  /* so that allocation will be aligned to 16B */

	__le32 padding2;

} __attribute__ ((packed));



#endif /* __iwl_5000_hw_h__ */

drivers/net/wireless/iwlwifi/iwl-5000.c

+0 −9
Original line number Diff line number Diff line
@@ -863,8 +863,6 @@ static int iwl5000_alloc_shared_mem(struct iwl_priv *priv) 


	memset(priv->shared_virt, 0, sizeof(struct iwl5000_shared));



	priv->rb_closed_offset = offsetof(struct iwl5000_shared, rb_closed);



	return 0;

}
@@ -877,12 +875,6 @@ static void iwl5000_free_shared_mem(struct iwl_priv *priv) 
				    priv->shared_phys);

}



static int iwl5000_shared_mem_rx_idx(struct iwl_priv *priv)

{

	struct iwl5000_shared *s = priv->shared_virt;

	return le32_to_cpu(s->rb_closed) & 0xFFF;

}



/**

 * iwl5000_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array

 */
@@ -1460,7 +1452,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
	.set_hw_params = iwl5000_hw_set_hw_params,

	.alloc_shared_mem = iwl5000_alloc_shared_mem,

	.free_shared_mem = iwl5000_free_shared_mem,

	.shared_mem_rx_idx = iwl5000_shared_mem_rx_idx,

	.txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl,

	.txq_inval_byte_cnt_tbl = iwl5000_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwl5000_txq_set_sched,

drivers/net/wireless/iwlwifi/iwl-agn.c

+1 −1
Original line number Diff line number Diff line
@@ -1359,7 +1359,7 @@ void iwl_rx_handle(struct iwl_priv *priv) 


	/* uCode's read index (stored in shared DRAM) indicates the last Rx

	 * buffer that the driver may process (last buffer filled by ucode). */

	r = priv->cfg->ops->lib->shared_mem_rx_idx(priv);

	r = le16_to_cpu(rxq->rb_stts->closed_rb_num) &  0x0FFF;

	i = rxq->read;



	/* Rx interrupt, but nothing sent from uCode */