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

Commit 046db346 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: make the BC table layout configurable 



This is needed for newer NICs.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a49f0d1e

drivers/net/wireless/iwlwifi/iwl-trans.h

+3 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r) 
 * @n_no_reclaim_cmds: # of commands in list

 * @rx_buf_size_8k: 8 kB RX buffer size needed for A-MSDUs,

 *	if unset 4k will be the RX buffer size

 * @bc_table_dword: set to true if the BC table expects the byte count to be

 *	in DWORD (as opposed to bytes)

 * @queue_watchdog_timeout: time (in ms) after which queues

 *	are considered stuck and will trigger device restart

 * @command_names: array of command names, must be 256 entries
@@ -335,6 +337,7 @@ struct iwl_trans_config { 
	int n_no_reclaim_cmds;



	bool rx_buf_size_8k;

	bool bc_table_dword;

	unsigned int queue_watchdog_timeout;

	const char **command_names;

};

drivers/net/wireless/iwlwifi/pcie/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ struct iwl_txq { 
 * @status - transport specific status flags

 * @cmd_queue - command queue number

 * @rx_buf_size_8k: 8 kB RX buffer size

 * @bc_table_dword: true if the BC table expects DWORD (as opposed to bytes)

 * @rx_page_order: page order for receive buffer size

 * @wd_timeout: queue watchdog timeout (jiffies)

 */
@@ -279,6 +280,7 @@ struct iwl_trans_pcie { 
	u8 no_reclaim_cmds[MAX_NO_RECLAIM_CMDS];



	bool rx_buf_size_8k;

	bool bc_table_dword;

	u32 rx_page_order;



	const char **command_names;

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

+1 −0
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ static void iwl_trans_pcie_configure(struct iwl_trans *trans, 
		msecs_to_jiffies(trans_cfg->queue_watchdog_timeout);



	trans_pcie->command_names = trans_cfg->command_names;

	trans_pcie->bc_table_dword = trans_cfg->bc_table_dword;

}



void iwl_trans_pcie_free(struct iwl_trans *trans)

drivers/net/wireless/iwlwifi/pcie/tx.c

+4 −1
Original line number Diff line number Diff line
@@ -237,7 +237,10 @@ static void iwl_pcie_txq_update_byte_cnt_tbl(struct iwl_trans *trans, 
		break;

	}



	bc_ent = cpu_to_le16((len & 0xFFF) | (sta_id << 12));

	if (trans_pcie->bc_table_dword)

		len = DIV_ROUND_UP(len, 4);



	bc_ent = cpu_to_le16(len | (sta_id << 12));



	scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent;