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

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

iwlwifi: mvm: support new paging command format 



For a000 devices there is a support of 64 bit DMA addressing.
The paging command was changed accordingly - support it.

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

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

+6 −2
Original line number Diff line number Diff line
@@ -482,13 +482,17 @@ struct iwl_nvm_access_cmd { 
 * @block_size: the block size in powers of 2

 * @block_num: number of blocks specified in the command.

 * @device_phy_addr: virtual addresses from device side

 *	32 bit address for API version 1, 64 bit address for API version 2.

*/

struct iwl_fw_paging_cmd {

	__le32 flags;

	__le32 block_size;

	__le32 block_num;

	__le32 device_phy_addr[NUM_OF_FW_PAGING_BLOCKS];

} __packed; /* FW_PAGING_BLOCK_CMD_API_S_VER_1 */

	union {

		__le32 addr32[NUM_OF_FW_PAGING_BLOCKS];

		__le64 addr64[NUM_OF_FW_PAGING_BLOCKS];

	} device_phy_addr;

} __packed; /* FW_PAGING_BLOCK_CMD_API_S_VER_2 */



/*

 * Fw items ID's

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

+20 −8
Original line number Diff line number Diff line
@@ -385,9 +385,7 @@ static int iwl_save_fw_paging(struct iwl_mvm *mvm, 
/* send paging cmd to FW in case CPU2 has paging image */

static int iwl_send_paging_cmd(struct iwl_mvm *mvm, const struct fw_img *fw)

{

	int blk_idx;

	__le32 dev_phy_addr;

	struct iwl_fw_paging_cmd fw_paging_cmd = {

	struct iwl_fw_paging_cmd paging_cmd = {

		.flags =

			cpu_to_le32(PAGING_CMD_IS_SECURED |

				    PAGING_CMD_IS_ENABLED |
@@ -396,18 +394,32 @@ static int iwl_send_paging_cmd(struct iwl_mvm *mvm, const struct fw_img *fw) 
		.block_size = cpu_to_le32(BLOCK_2_EXP_SIZE),

		.block_num = cpu_to_le32(mvm->num_of_paging_blk),

	};

	int blk_idx, size = sizeof(paging_cmd);



	/* A bit hard coded - but this is the old API and will be deprecated */

	if (!iwl_mvm_has_new_tx_api(mvm))

		size -= NUM_OF_FW_PAGING_BLOCKS * 4;



	/* loop for for all paging blocks + CSS block */

	for (blk_idx = 0; blk_idx < mvm->num_of_paging_blk + 1; blk_idx++) {

		dev_phy_addr =

			cpu_to_le32(mvm->fw_paging_db[blk_idx].fw_paging_phys >>

				    PAGE_2_EXP_SIZE);

		fw_paging_cmd.device_phy_addr[blk_idx] = dev_phy_addr;

		dma_addr_t addr = mvm->fw_paging_db[blk_idx].fw_paging_phys;



		addr = addr >> PAGE_2_EXP_SIZE;



		if (iwl_mvm_has_new_tx_api(mvm)) {

			__le64 phy_addr = cpu_to_le64(addr);



			paging_cmd.device_phy_addr.addr64[blk_idx] = phy_addr;

		} else {

			__le32 phy_addr = cpu_to_le32(addr);



			paging_cmd.device_phy_addr.addr32[blk_idx] = phy_addr;

		}

	}



	return iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(FW_PAGING_BLOCK_CMD,

						    IWL_ALWAYS_LONG_GROUP, 0),

				    0, sizeof(fw_paging_cmd), &fw_paging_cmd);

				    0, size, &paging_cmd);

}



/*

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

+6 −0
Original line number Diff line number Diff line
@@ -1192,6 +1192,12 @@ static inline bool iwl_mvm_has_new_rx_api(struct iwl_mvm *mvm) 
			   IWL_UCODE_TLV_CAPA_MULTI_QUEUE_RX_SUPPORT);

}



static inline bool iwl_mvm_has_new_tx_api(struct iwl_mvm *mvm)

{

	/* TODO - replace with TLV once defined */

	return mvm->trans->cfg->use_tfh;

}



static inline bool iwl_mvm_is_tt_in_fw(struct iwl_mvm *mvm)

{

#ifdef CONFIG_THERMAL