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

Commit 43146925 authored by Sara Sharon's avatar Sara Sharon Committed by Emmanuel Grumbach
Browse files

iwlwifi: pcie: fix global table size 



My patch resized the pool size, but neglected to resize
the global table, which is obviously wrong since the global
table maps the pool's rxb to vid one to one. This results
in a panic in 9000 devices.
Add a build bug to avoid such a case in the future.

Fixes: 7b542436 ("iwlwifi: pcie: fine tune number of rxbs")
Reported-by: default avatarHaim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent dedfc0f3

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

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ struct iwl_tso_hdr_page { 
struct iwl_trans_pcie {

	struct iwl_rxq *rxq;

	struct iwl_rx_mem_buffer rx_pool[RX_POOL_SIZE];

	struct iwl_rx_mem_buffer *global_table[MQ_RX_TABLE_SIZE];

	struct iwl_rx_mem_buffer *global_table[RX_POOL_SIZE];

	struct iwl_rb_allocator rba;

	struct iwl_trans *trans;

	struct iwl_drv *drv;

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

+2 −0
Original line number Diff line number Diff line
@@ -908,6 +908,8 @@ int iwl_pcie_rx_init(struct iwl_trans *trans) 
	allocator_pool_size = trans->num_rx_queues *

		(RX_CLAIM_REQ_ALLOC - RX_POST_REQ_ALLOC);

	num_alloc = queue_size + allocator_pool_size;

	BUILD_BUG_ON(ARRAY_SIZE(trans_pcie->global_table) !=

		     ARRAY_SIZE(trans_pcie->rx_pool));

	for (i = 0; i < num_alloc; i++) {

		struct iwl_rx_mem_buffer *rxb = &trans_pcie->rx_pool[i];