Commit 6654cd4e authored by Luca Coelho's avatar Luca Coelho Committed by Kalle Valo
Browse files

iwlwifi: pcie: implement set_pnvm op 



Implement the set_pnvm op to store the PNVM settings to the context
info and the corresponding code to free the DRAM block when the
context is freed.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20201008181047.85847cfb0972.I202d90e99779f722df14b2d4102d3e466343a6f6@changeid
parent a182dfab

drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h

+3 −0
Original line number Diff line number Diff line
@@ -291,4 +291,7 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, 
				 const struct fw_img *fw);

void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans);



int iwl_trans_pcie_ctx_info_gen3_set_pnvm(struct iwl_trans *trans,

					  const void *data, u32 len);



#endif /* __iwl_context_info_file_gen3_h__ */

drivers/net/wireless/intel/iwlwifi/iwl-context-info.h

+5 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -20,7 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -225,5 +225,8 @@ void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans); 
int iwl_pcie_init_fw_sec(struct iwl_trans *trans,

			 const struct fw_img *fw,

			 struct iwl_context_info_dram *ctxt_dram);

int iwl_pcie_ctxt_info_alloc_dma(struct iwl_trans *trans,

				 const void *data, u32 len,

				 struct iwl_dram_data *dram);



#endif /* __iwl_context_info_file_h__ */

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c

+33 −0
Original line number Diff line number Diff line
@@ -300,4 +300,37 @@ void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans) 
			  trans_pcie->prph_info_dma_addr);

	trans_pcie->prph_info_dma_addr = 0;

	trans_pcie->prph_info = NULL;

	dma_free_coherent(trans->dev, trans_pcie->pnvm_dram.size,

			  trans_pcie->pnvm_dram.block,

			  trans_pcie->pnvm_dram.physical);

	trans_pcie->pnvm_dram.size = 0;

	trans_pcie->pnvm_dram.block = NULL;

	trans_pcie->pnvm_dram.physical = 0;

}



int iwl_trans_pcie_ctx_info_gen3_set_pnvm(struct iwl_trans *trans,

					  const void *data, u32 len)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =

		&trans_pcie->prph_scratch->ctrl_cfg;

	int ret;



	if (trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_AX210)

		return 0;



	ret = iwl_pcie_ctxt_info_alloc_dma(trans, data, len,

					   &trans_pcie->pnvm_dram);

	if (ret < 0) {

		IWL_DEBUG_FW(trans, "Failed to allocate PNVM DMA %d.\n",

			     ret);

		return ret;

	}



	prph_sc_ctrl->pnvm_cfg.pnvm_base_addr =

		cpu_to_le64(trans_pcie->pnvm_dram.physical);

	prph_sc_ctrl->pnvm_cfg.pnvm_size =

		cpu_to_le32(trans_pcie->pnvm_dram.size);



	return 0;

}

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c

+12 −9
Original line number Diff line number Diff line
@@ -93,17 +93,17 @@ static void *iwl_pcie_ctxt_info_dma_alloc_coherent(struct iwl_trans *trans, 
	return _iwl_pcie_ctxt_info_dma_alloc_coherent(trans, size, phys, 0);

}



static int iwl_pcie_ctxt_info_alloc_dma(struct iwl_trans *trans,

					const struct fw_desc *sec,

int iwl_pcie_ctxt_info_alloc_dma(struct iwl_trans *trans,

				 const void *data, u32 len,

				 struct iwl_dram_data *dram)

{

	dram->block = iwl_pcie_ctxt_info_dma_alloc_coherent(trans, sec->len,

	dram->block = iwl_pcie_ctxt_info_dma_alloc_coherent(trans, len,

							    &dram->physical);

	if (!dram->block)

		return -ENOMEM;



	dram->size = sec->len;

	memcpy(dram->block, sec->data, sec->len);

	dram->size = len;

	memcpy(dram->block, data, len);



	return 0;

}
@@ -156,7 +156,8 @@ int iwl_pcie_init_fw_sec(struct iwl_trans *trans, 


	/* initialize lmac sections */

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

		ret = iwl_pcie_ctxt_info_alloc_dma(trans, &fw->sec[i],

		ret = iwl_pcie_ctxt_info_alloc_dma(trans, fw->sec[i].data,

						   fw->sec[i].len,

						   &dram->fw[dram->fw_cnt]);

		if (ret)

			return ret;
@@ -169,7 +170,8 @@ int iwl_pcie_init_fw_sec(struct iwl_trans *trans, 
	for (i = 0; i < umac_cnt; i++) {

		/* access FW with +1 to make up for lmac separator */

		ret = iwl_pcie_ctxt_info_alloc_dma(trans,

						   &fw->sec[dram->fw_cnt + 1],

						   fw->sec[dram->fw_cnt + 1].data,

						   fw->sec[dram->fw_cnt + 1].len,

						   &dram->fw[dram->fw_cnt]);

		if (ret)

			return ret;
@@ -192,7 +194,8 @@ int iwl_pcie_init_fw_sec(struct iwl_trans *trans, 
		/* access FW with +2 to make up for lmac & umac separators */

		int fw_idx = dram->fw_cnt + i + 2;



		ret = iwl_pcie_ctxt_info_alloc_dma(trans, &fw->sec[fw_idx],

		ret = iwl_pcie_ctxt_info_alloc_dma(trans, fw->sec[fw_idx].data,

						   fw->sec[fw_idx].len,

						   &dram->paging[i]);

		if (ret)

			return ret;

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

+3 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ struct cont_rec { 
 * @trans: pointer to the generic transport area

 * @scd_base_addr: scheduler sram base address in SRAM

 * @kw: keep warm address

 * @pnvm_dram: DRAM area that contains the PNVM data

 * @pci_dev: basic pci-network driver stuff

 * @hw_base: pci hardware address support

 * @ucode_write_complete: indicates that the ucode has been copied.
@@ -410,6 +411,8 @@ struct iwl_trans_pcie { 
	u32 scd_base_addr;

	struct iwl_dma_ptr kw;



	struct iwl_dram_data pnvm_dram;



	struct iwl_txq *txq_memory;



	/* PCI bus related data */

CRA Git | Maintained and supported by SUSTech CRA and CCSE