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

Commit db06f04d authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: support new shared memory config API 



In a000 devices we have 15 fifos, so in the shared memory
config the number of tx fifos in the array was changed
accordingly.
As it is in the middle of the struct, the parsing code needs
to be duplicated.
To minimize the duplication, do not save variables we never
actually use.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 585a2627

drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h

+19 −3
Original line number Original line Diff line number Diff line
@@ -1977,7 +1977,8 @@ struct iwl_tdls_config_res { 
	struct iwl_tdls_config_sta_info_res sta_info[IWL_MVM_TDLS_STA_COUNT];

	struct iwl_tdls_config_sta_info_res sta_info[IWL_MVM_TDLS_STA_COUNT];

} __packed; /* TDLS_CONFIG_RSP_API_S_VER_1 */

} __packed; /* TDLS_CONFIG_RSP_API_S_VER_1 */





#define TX_FIFO_MAX_NUM		8

#define TX_FIFO_MAX_NUM_9000		8

#define TX_FIFO_MAX_NUM			15

#define RX_FIFO_MAX_NUM			2

#define RX_FIFO_MAX_NUM			2

#define TX_FIFO_INTERNAL_MAX_NUM	6

#define TX_FIFO_INTERNAL_MAX_NUM	6
@@ -2004,6 +2005,21 @@ struct iwl_tdls_config_res { 
 * NOTE: on firmware that don't have IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG

 * NOTE: on firmware that don't have IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG

 *	 set, the last 3 members don't exist.

 *	 set, the last 3 members don't exist.

 */

 */

struct iwl_shared_mem_cfg_v1 {

	__le32 shared_mem_addr;

	__le32 shared_mem_size;

	__le32 sample_buff_addr;

	__le32 sample_buff_size;

	__le32 txfifo_addr;

	__le32 txfifo_size[TX_FIFO_MAX_NUM_9000];

	__le32 rxfifo_size[RX_FIFO_MAX_NUM];

	__le32 page_buff_addr;

	__le32 page_buff_size;

	__le32 rxfifo_addr;

	__le32 internal_txfifo_addr;

	__le32 internal_txfifo_size[TX_FIFO_INTERNAL_MAX_NUM];

} __packed; /* SHARED_MEM_ALLOC_API_S_VER_2 */



struct iwl_shared_mem_cfg {

struct iwl_shared_mem_cfg {

	__le32 shared_mem_addr;

	__le32 shared_mem_addr;

	__le32 shared_mem_size;

	__le32 shared_mem_size;
@@ -2017,7 +2033,7 @@ struct iwl_shared_mem_cfg { 
	__le32 rxfifo_addr;

	__le32 rxfifo_addr;

	__le32 internal_txfifo_addr;

	__le32 internal_txfifo_addr;

	__le32 internal_txfifo_size[TX_FIFO_INTERNAL_MAX_NUM];

	__le32 internal_txfifo_size[TX_FIFO_INTERNAL_MAX_NUM];

} __packed; /* SHARED_MEM_ALLOC_API_S_VER_2 */

} __packed; /* SHARED_MEM_ALLOC_API_S_VER_3 */





/**

/**

 * VHT MU-MIMO group configuration

 * VHT MU-MIMO group configuration

drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -557,7 +557,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
					 sizeof(struct iwl_fw_error_dump_fifo);

					 sizeof(struct iwl_fw_error_dump_fifo);

		}

		}





		for (i = 0; i < ARRAY_SIZE(mem_cfg->txfifo_size); i++) {

		for (i = 0; i < mem_cfg->num_txfifo_entries; i++) {

			if (!mem_cfg->txfifo_size[i])

			if (!mem_cfg->txfifo_size[i])

				continue;

				continue;

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+56 −40
Original line number Original line Diff line number Diff line
@@ -838,59 +838,48 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
	return ret;

	return ret;

}

}





static void iwl_mvm_get_shared_mem_conf(struct iwl_mvm *mvm)

static void iwl_mvm_parse_shared_mem_a000(struct iwl_mvm *mvm,

					  struct iwl_rx_packet *pkt)

{

{

	struct iwl_host_cmd cmd = {

	struct iwl_shared_mem_cfg *mem_cfg = (void *)pkt->data;

		.flags = CMD_WANT_SKB,

	int i;

		.data = { NULL, },

		.len = { 0, },

	};

	struct iwl_shared_mem_cfg *mem_cfg;

	struct iwl_rx_packet *pkt;

	u32 i;





	lockdep_assert_held(&mvm->mutex);

	mvm->shared_mem_cfg.num_txfifo_entries =

		ARRAY_SIZE(mvm->shared_mem_cfg.txfifo_size);

	for (i = 0; i < ARRAY_SIZE(mem_cfg->txfifo_size); i++)

		mvm->shared_mem_cfg.txfifo_size[i] =

			le32_to_cpu(mem_cfg->txfifo_size[i]);

	for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.rxfifo_size); i++)

		mvm->shared_mem_cfg.rxfifo_size[i] =

			le32_to_cpu(mem_cfg->rxfifo_size[i]);





	if (fw_has_capa(&mvm->fw->ucode_capa,

	BUILD_BUG_ON(sizeof(mvm->shared_mem_cfg.internal_txfifo_size) !=

			IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG))

		     sizeof(mem_cfg->internal_txfifo_size));

		cmd.id = iwl_cmd_id(SHARED_MEM_CFG_CMD, SYSTEM_GROUP, 0);

	else

		cmd.id = SHARED_MEM_CFG;





	if (WARN_ON(iwl_mvm_send_cmd(mvm, &cmd)))

	for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.internal_txfifo_size);

		return;

	     i++)

		mvm->shared_mem_cfg.internal_txfifo_size[i] =

			le32_to_cpu(mem_cfg->internal_txfifo_size[i]);

}





	pkt = cmd.resp_pkt;

static void iwl_mvm_parse_shared_mem(struct iwl_mvm *mvm,

	mem_cfg = (void *)pkt->data;

				     struct iwl_rx_packet *pkt)



{

	mvm->shared_mem_cfg.shared_mem_addr =

	struct iwl_shared_mem_cfg_v1 *mem_cfg = (void *)pkt->data;

		le32_to_cpu(mem_cfg->shared_mem_addr);

	int i;

	mvm->shared_mem_cfg.shared_mem_size =



		le32_to_cpu(mem_cfg->shared_mem_size);

	mvm->shared_mem_cfg.num_txfifo_entries =

	mvm->shared_mem_cfg.sample_buff_addr =

		ARRAY_SIZE(mvm->shared_mem_cfg.txfifo_size);

		le32_to_cpu(mem_cfg->sample_buff_addr);

	for (i = 0; i < ARRAY_SIZE(mem_cfg->txfifo_size); i++)

	mvm->shared_mem_cfg.sample_buff_size =

		le32_to_cpu(mem_cfg->sample_buff_size);

	mvm->shared_mem_cfg.txfifo_addr = le32_to_cpu(mem_cfg->txfifo_addr);

	for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.txfifo_size); i++)

		mvm->shared_mem_cfg.txfifo_size[i] =

		mvm->shared_mem_cfg.txfifo_size[i] =

			le32_to_cpu(mem_cfg->txfifo_size[i]);

			le32_to_cpu(mem_cfg->txfifo_size[i]);

	for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.rxfifo_size); i++)

	for (i = 0; i < ARRAY_SIZE(mvm->shared_mem_cfg.rxfifo_size); i++)

		mvm->shared_mem_cfg.rxfifo_size[i] =

		mvm->shared_mem_cfg.rxfifo_size[i] =

			le32_to_cpu(mem_cfg->rxfifo_size[i]);

			le32_to_cpu(mem_cfg->rxfifo_size[i]);

	mvm->shared_mem_cfg.page_buff_addr =

		le32_to_cpu(mem_cfg->page_buff_addr);

	mvm->shared_mem_cfg.page_buff_size =

		le32_to_cpu(mem_cfg->page_buff_size);





	/* new API has more data */

	/* new API has more data, from rxfifo_addr field and on */

	if (fw_has_capa(&mvm->fw->ucode_capa,

	if (fw_has_capa(&mvm->fw->ucode_capa,

			IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG)) {

			IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG)) {

		mvm->shared_mem_cfg.rxfifo_addr =

			le32_to_cpu(mem_cfg->rxfifo_addr);

		mvm->shared_mem_cfg.internal_txfifo_addr =

			le32_to_cpu(mem_cfg->internal_txfifo_addr);



		BUILD_BUG_ON(sizeof(mvm->shared_mem_cfg.internal_txfifo_size) !=

		BUILD_BUG_ON(sizeof(mvm->shared_mem_cfg.internal_txfifo_size) !=

			     sizeof(mem_cfg->internal_txfifo_size));

			     sizeof(mem_cfg->internal_txfifo_size));
@@ -900,6 +889,33 @@ static void iwl_mvm_get_shared_mem_conf(struct iwl_mvm *mvm) 
			mvm->shared_mem_cfg.internal_txfifo_size[i] =

			mvm->shared_mem_cfg.internal_txfifo_size[i] =

				le32_to_cpu(mem_cfg->internal_txfifo_size[i]);

				le32_to_cpu(mem_cfg->internal_txfifo_size[i]);

	}

	}

}



static void iwl_mvm_get_shared_mem_conf(struct iwl_mvm *mvm)

{

	struct iwl_host_cmd cmd = {

		.flags = CMD_WANT_SKB,

		.data = { NULL, },

		.len = { 0, },

	};

	struct iwl_rx_packet *pkt;



	lockdep_assert_held(&mvm->mutex);



	if (fw_has_capa(&mvm->fw->ucode_capa,

			IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG))

		cmd.id = iwl_cmd_id(SHARED_MEM_CFG_CMD, SYSTEM_GROUP, 0);

	else

		cmd.id = SHARED_MEM_CFG;



	if (WARN_ON(iwl_mvm_send_cmd(mvm, &cmd)))

		return;



	pkt = cmd.resp_pkt;

	if (iwl_mvm_has_new_tx_api(mvm))

		iwl_mvm_parse_shared_mem_a000(mvm, pkt);

	else

		iwl_mvm_parse_shared_mem(mvm, pkt);





	IWL_DEBUG_INFO(mvm, "SHARED MEM CFG: got memory offsets/sizes\n");

	IWL_DEBUG_INFO(mvm, "SHARED MEM CFG: got memory offsets/sizes\n");

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+1 −8
Original line number Original line Diff line number Diff line
@@ -602,16 +602,9 @@ enum iwl_mvm_tdls_cs_state { 
};

};





struct iwl_mvm_shared_mem_cfg {

struct iwl_mvm_shared_mem_cfg {

	u32 shared_mem_addr;

	int num_txfifo_entries;

	u32 shared_mem_size;

	u32 sample_buff_addr;

	u32 sample_buff_size;

	u32 txfifo_addr;

	u32 txfifo_size[TX_FIFO_MAX_NUM];

	u32 txfifo_size[TX_FIFO_MAX_NUM];

	u32 rxfifo_size[RX_FIFO_MAX_NUM];

	u32 rxfifo_size[RX_FIFO_MAX_NUM];

	u32 page_buff_addr;

	u32 page_buff_size;

	u32 rxfifo_addr;

	u32 internal_txfifo_addr;

	u32 internal_txfifo_addr;

	u32 internal_txfifo_size[TX_FIFO_INTERNAL_MAX_NUM];

	u32 internal_txfifo_size[TX_FIFO_INTERNAL_MAX_NUM];

};

};