Commit 2ee82402 authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Luca Coelho
Browse files

iwlwifi: pcie: support context information for 22560 devices 



Context information structure was added to 22000 devices for
firmware self init.

In the next generation of devices the context information
changes significantly, and the original context information
is divided roughly to three data structures: context information gen3,
prph information and prph scratch.

In addition, the init flow changes so the firmware is loaded
by the IML, and so we must allocate the IML on the DRAM and
give the ROM the IML's address before kicking the firmware's
self init.

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 1b493e30

drivers/net/wireless/intel/iwlwifi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ iwlwifi-objs += iwl-debug.o 
iwlwifi-objs		+= iwl-eeprom-read.o iwl-eeprom-parse.o

iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-objs		+= pcie/ctxt-info.o pcie/trans-gen2.o pcie/tx-gen2.o

iwlwifi-objs		+= pcie/ctxt-info.o pcie/ctxt-info-gen3.o

iwlwifi-objs		+= pcie/trans-gen2.o pcie/tx-gen2.o

iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o

iwlwifi-objs		+= iwl-trans.o

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

0 → 100644
+285 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2018 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

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * BSD LICENSE

 *

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *  * Neither the name Intel Corporation nor the names of its

 *    contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *****************************************************************************/

#ifndef __iwl_context_info_file_gen3_h__

#define __iwl_context_info_file_gen3_h__



#include "iwl-context-info.h"



#define CSR_CTXT_INFO_BOOT_CTRL         0x0

#define CSR_CTXT_INFO_ADDR              0x118

#define CSR_IML_DATA_ADDR               0x120

#define CSR_IML_SIZE_ADDR               0x128



/* Set bit for enabling automatic function boot */

#define CSR_AUTO_FUNC_BOOT_ENA          BIT(1)

/* Set bit for initiating function boot */

#define CSR_AUTO_FUNC_INIT              BIT(7)



/**

 * enum iwl_prph_scratch_mtr_format - tfd size configuration

 * @IWL_PRPH_MTR_FORMAT_16B: 16 bit tfd

 * @IWL_PRPH_MTR_FORMAT_32B: 32 bit tfd

 * @IWL_PRPH_MTR_FORMAT_64B: 64 bit tfd

 * @IWL_PRPH_MTR_FORMAT_256B: 256 bit tfd

 */

enum iwl_prph_scratch_mtr_format {

	IWL_PRPH_MTR_FORMAT_16B = 0x0,

	IWL_PRPH_MTR_FORMAT_32B = 0x40000,

	IWL_PRPH_MTR_FORMAT_64B = 0x80000,

	IWL_PRPH_MTR_FORMAT_256B = 0xC0000,

};



/**

 * enum iwl_prph_scratch_flags - PRPH scratch control flags

 * @IWL_PRPH_SCRATCH_EARLY_DEBUG_EN: enable early debug conf

 * @IWL_PRPH_SCRATCH_EDBG_DEST_DRAM: use DRAM, with size allocated

 *	in hwm config.

 * @IWL_PRPH_SCRATCH_EDBG_DEST_INTERNAL: use buffer on SRAM

 * @IWL_PRPH_SCRATCH_EDBG_DEST_ST_ARBITER: use st arbiter, mainly for

 *	multicomm.

 * @IWL_PRPH_SCRATCH_EDBG_DEST_TB22DTF: route debug data to SoC HW

 * @IWL_PRPH_SCTATCH_RB_SIZE_4K: Use 4K RB size (the default is 2K)

 * @IWL_PRPH_SCRATCH_MTR_MODE: format used for completion - 0: for

 *	completion descriptor, 1 for responses (legacy)

 * @IWL_PRPH_SCRATCH_MTR_FORMAT: a mask for the size of the tfd.

 *	There are 4 optional values: 0: 16 bit, 1: 32 bit, 2: 64 bit,

 *	3: 256 bit.

 */

enum iwl_prph_scratch_flags {

	IWL_PRPH_SCRATCH_EARLY_DEBUG_EN		= BIT(4),

	IWL_PRPH_SCRATCH_EDBG_DEST_DRAM		= BIT(8),

	IWL_PRPH_SCRATCH_EDBG_DEST_INTERNAL	= BIT(9),

	IWL_PRPH_SCRATCH_EDBG_DEST_ST_ARBITER	= BIT(10),

	IWL_PRPH_SCRATCH_EDBG_DEST_TB22DTF	= BIT(11),

	IWL_PRPH_SCRATCH_RB_SIZE_4K		= BIT(16),

	IWL_PRPH_SCRATCH_MTR_MODE		= BIT(17),

	IWL_PRPH_SCRATCH_MTR_FORMAT		= BIT(18) | BIT(19),

};



/*

 * struct iwl_prph_scratch_version - version structure

 * @mac_id: SKU and revision id

 * @version: prph scratch information version id

 * @size: the size of the context information in DWs

 * @reserved: reserved

 */

struct iwl_prph_scratch_version {

	__le16 mac_id;

	__le16 version;

	__le16 size;

	__le16 reserved;

} __packed; /* PERIPH_SCRATCH_VERSION_S */



/*

 * struct iwl_prph_scratch_control - control structure

 * @control_flags: context information flags see &enum iwl_prph_scratch_flags

 * @reserved: reserved

 */

struct iwl_prph_scratch_control {

	__le32 control_flags;

	__le32 reserved;

} __packed; /* PERIPH_SCRATCH_CONTROL_S */



/*

 * struct iwl_prph_scratch_ror_cfg - ror config

 * @ror_base_addr: ror start address

 * @ror_size: ror size in DWs

 * @reserved: reserved

 */

struct iwl_prph_scratch_ror_cfg {

	__le64 ror_base_addr;

	__le32 ror_size;

	__le32 reserved;

} __packed; /* PERIPH_SCRATCH_ROR_CFG_S */



/*

 * struct iwl_prph_scratch_hwm_cfg - hwm config

 * @hwm_base_addr: hwm start address

 * @hwm_size: hwm size in DWs

 * @reserved: reserved

 */

struct iwl_prph_scratch_hwm_cfg {

	__le64 hwm_base_addr;

	__le32 hwm_size;

	__le32 reserved;

} __packed; /* PERIPH_SCRATCH_HWM_CFG_S */



/*

 * struct iwl_prph_scratch_rbd_cfg - RBDs configuration

 * @free_rbd_addr: default queue free RB CB base address

 * @reserved: reserved

 */

struct iwl_prph_scratch_rbd_cfg {

	__le64 free_rbd_addr;

	__le32 reserved;

} __packed; /* PERIPH_SCRATCH_RBD_CFG_S */



/*

 * struct iwl_prph_scratch_ctrl_cfg - prph scratch ctrl and config

 * @version: version information of context info and HW

 * @control: control flags of FH configurations

 * @ror_cfg: ror configuration

 * @hwm_cfg: hwm configuration

 * @rbd_cfg: default RX queue configuration

 */

struct iwl_prph_scratch_ctrl_cfg {

	struct iwl_prph_scratch_version version;

	struct iwl_prph_scratch_control control;

	struct iwl_prph_scratch_ror_cfg ror_cfg;

	struct iwl_prph_scratch_hwm_cfg hwm_cfg;

	struct iwl_prph_scratch_rbd_cfg rbd_cfg;

} __packed; /* PERIPH_SCRATCH_CTRL_CFG_S */



/*

 * struct iwl_prph_scratch - peripheral scratch mapping

 * @ctrl_cfg: control and configuration of prph scratch

 * @dram: firmware images addresses in DRAM

 * @reserved: reserved

 */

struct iwl_prph_scratch {

	struct iwl_prph_scratch_ctrl_cfg ctrl_cfg;

	__le32 reserved[16];

	struct iwl_context_info_dram dram;

} __packed; /* PERIPH_SCRATCH_S */



/*

 * struct iwl_prph_info - peripheral information

 * @boot_stage_mirror: reflects the value in the Boot Stage CSR register

 * @ipc_status_mirror: reflects the value in the IPC Status CSR register

 * @sleep_notif: indicates the peripheral sleep status

 * @reserved: reserved

 */

struct iwl_prph_info {

	__le32 boot_stage_mirror;

	__le32 ipc_status_mirror;

	__le32 sleep_notif;

	__le32 reserved;

} __packed; /* PERIPH_INFO_S */



/*

 * struct iwl_context_info_gen3 - device INIT configuration

 * @version: version of the context information

 * @size: size of context information in DWs

 * @config: context in which the peripheral would execute - a subset of

 *	capability csr register published by the peripheral

 * @prph_info_base_addr: the peripheral information structure start address

 * @cr_head_idx_arr_base_addr: the completion ring head index array

 *	start address

 * @tr_tail_idx_arr_base_addr: the transfer ring tail index array

 *	start address

 * @cr_tail_idx_arr_base_addr: the completion ring tail index array

 *	start address

 * @tr_head_idx_arr_base_addr: the transfer ring head index array

 *	start address

 * @cr_idx_arr_size: number of entries in the completion ring index array

 * @tr_idx_arr_size: number of entries in the transfer ring index array

 * @mtr_base_addr: the message transfer ring start address

 * @mcr_base_addr: the message completion ring start address

 * @mtr_size: number of entries which the message transfer ring can hold

 * @mcr_size: number of entries which the message completion ring can hold

 * @mtr_doorbell_vec: the doorbell vector associated with the message

 *	transfer ring

 * @mcr_doorbell_vec: the doorbell vector associated with the message

 *	completion ring

 * @mtr_msi_vec: the MSI which shall be generated by the peripheral after

 *	completing a transfer descriptor in the message transfer ring

 * @mcr_msi_vec: the MSI which shall be generated by the peripheral after

 *	completing a completion descriptor in the message completion ring

 * @mtr_opt_header_size: the size of the optional header in the transfer

 *	descriptor associated with the message transfer ring in DWs

 * @mtr_opt_footer_size: the size of the optional footer in the transfer

 *	descriptor associated with the message transfer ring in DWs

 * @mcr_opt_header_size: the size of the optional header in the completion

 *	descriptor associated with the message completion ring in DWs

 * @mcr_opt_footer_size: the size of the optional footer in the completion

 *	descriptor associated with the message completion ring in DWs

 * @msg_rings_ctrl_flags: message rings control flags

 * @prph_info_msi_vec: the MSI which shall be generated by the peripheral

 *	after updating the Peripheral Information structure

 * @prph_scratch_base_addr: the peripheral scratch structure start address

 * @prph_scratch_size: the size of the peripheral scratch structure in DWs

 * @reserved: reserved

 */

struct iwl_context_info_gen3 {

	__le16 version;

	__le16 size;

	__le32 config;

	__le64 prph_info_base_addr;

	__le64 cr_head_idx_arr_base_addr;

	__le64 tr_tail_idx_arr_base_addr;

	__le64 cr_tail_idx_arr_base_addr;

	__le64 tr_head_idx_arr_base_addr;

	__le16 cr_idx_arr_size;

	__le16 tr_idx_arr_size;

	__le64 mtr_base_addr;

	__le64 mcr_base_addr;

	__le16 mtr_size;

	__le16 mcr_size;

	__le16 mtr_doorbell_vec;

	__le16 mcr_doorbell_vec;

	__le16 mtr_msi_vec;

	__le16 mcr_msi_vec;

	u8 mtr_opt_header_size;

	u8 mtr_opt_footer_size;

	u8 mcr_opt_header_size;

	u8 mcr_opt_footer_size;

	__le16 msg_rings_ctrl_flags;

	__le16 prph_info_msi_vec;

	__le64 prph_scratch_base_addr;

	__le32 prph_scratch_size;

	__le32 reserved;

} __packed; /* IPC_CONTEXT_INFO_S */



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);



#endif /* __iwl_context_info_file_gen3_h__ */

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

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

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 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
@@ -19,6 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -199,5 +201,8 @@ struct iwl_context_info { 
int iwl_pcie_ctxt_info_init(struct iwl_trans *trans, const struct fw_img *fw);

void iwl_pcie_ctxt_info_free(struct iwl_trans *trans);

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);



#endif /* __iwl_context_info_file_h__ */

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

0 → 100644
+202 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2018 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

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * BSD LICENSE

 *

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *  * Neither the name Intel Corporation nor the names of its

 *    contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *****************************************************************************/



#include "iwl-trans.h"

#include "iwl-fh.h"

#include "iwl-context-info-gen3.h"

#include "internal.h"

#include "iwl-prph.h"



int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,

				 const struct fw_img *fw)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_context_info_gen3 *ctxt_info_gen3;

	struct iwl_prph_scratch *prph_scratch;

	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl;

	struct iwl_prph_info *prph_info;

	void *iml_img;

	u32 control_flags = 0;

	int ret;



	/* Allocate prph scratch */

	prph_scratch = dma_alloc_coherent(trans->dev, sizeof(*prph_scratch),

					  &trans_pcie->prph_scratch_dma_addr,

					  GFP_KERNEL);

	if (!prph_scratch)

		return -ENOMEM;



	prph_sc_ctrl = &prph_scratch->ctrl_cfg;



	prph_sc_ctrl->version.version = 0;

	prph_sc_ctrl->version.mac_id =

		cpu_to_le16((u16)iwl_read32(trans, CSR_HW_REV));

	prph_sc_ctrl->version.size = cpu_to_le16(sizeof(*prph_scratch) / 4);



	control_flags = IWL_PRPH_SCRATCH_RB_SIZE_4K |

			IWL_PRPH_SCRATCH_MTR_MODE |

			(IWL_PRPH_MTR_FORMAT_256B &

			 IWL_PRPH_SCRATCH_MTR_FORMAT);

	prph_sc_ctrl->control.control_flags = cpu_to_le32(control_flags);



	/* initialize RX default queue */

	prph_sc_ctrl->rbd_cfg.free_rbd_addr =

		cpu_to_le64(trans_pcie->rxq->bd_dma);



	/* allocate ucode sections in dram and set addresses */

	ret = iwl_pcie_init_fw_sec(trans, fw, &prph_scratch->dram);

	if (ret) {

		dma_free_coherent(trans->dev,

				  sizeof(*prph_scratch),

				  prph_scratch,

				  trans_pcie->prph_scratch_dma_addr);

		return ret;

	}



	/* Allocate prph information

	 * currently we don't assign to the prph info anything, but it would get

	 * assigned later */

	prph_info = dma_alloc_coherent(trans->dev, sizeof(*prph_info),

				       &trans_pcie->prph_info_dma_addr,

				       GFP_KERNEL);

	if (!prph_info)

		return -ENOMEM;



	/* Allocate context info */

	ctxt_info_gen3 = dma_alloc_coherent(trans->dev,

					    sizeof(*ctxt_info_gen3),

					    &trans_pcie->ctxt_info_dma_addr,

					    GFP_KERNEL);

	if (!ctxt_info_gen3)

		return -ENOMEM;



	ctxt_info_gen3->prph_info_base_addr =

		cpu_to_le64(trans_pcie->prph_info_dma_addr);

	ctxt_info_gen3->prph_scratch_base_addr =

		cpu_to_le64(trans_pcie->prph_scratch_dma_addr);

	ctxt_info_gen3->prph_scratch_size =

		cpu_to_le32(sizeof(*prph_scratch));

	ctxt_info_gen3->cr_head_idx_arr_base_addr =

		cpu_to_le64(trans_pcie->rxq->rb_stts_dma);

	ctxt_info_gen3->tr_tail_idx_arr_base_addr =

		cpu_to_le64(trans_pcie->rxq->tr_tail_dma);

	ctxt_info_gen3->cr_tail_idx_arr_base_addr =

		cpu_to_le64(trans_pcie->rxq->cr_tail_dma);

	ctxt_info_gen3->cr_idx_arr_size =

		cpu_to_le16(IWL_NUM_OF_COMPLETION_RINGS);

	ctxt_info_gen3->tr_idx_arr_size =

		cpu_to_le16(IWL_NUM_OF_TRANSFER_RINGS);

	ctxt_info_gen3->mtr_base_addr =

		cpu_to_le64(trans_pcie->txq[trans_pcie->cmd_queue]->dma_addr);

	ctxt_info_gen3->mcr_base_addr =

		cpu_to_le64(trans_pcie->rxq->used_bd_dma);

	ctxt_info_gen3->mtr_size =

		cpu_to_le16(TFD_QUEUE_CB_SIZE(TFD_CMD_SLOTS));

	ctxt_info_gen3->mcr_size =

		cpu_to_le16(RX_QUEUE_CB_SIZE(MQ_RX_TABLE_SIZE));



	trans_pcie->ctxt_info_gen3 = ctxt_info_gen3;

	trans_pcie->prph_info = prph_info;

	trans_pcie->prph_scratch = prph_scratch;



	/* Allocate IML */

	iml_img = dma_alloc_coherent(trans->dev, trans->iml_len,

				     &trans_pcie->iml_dma_addr, GFP_KERNEL);

	if (!iml_img)

		return -ENOMEM;



	memcpy(iml_img, trans->iml, trans->iml_len);



	iwl_enable_interrupts(trans);



	/* Configure debug, if exists */

	if (trans->dbg_dest_tlv)

		iwl_pcie_apply_destination(trans);



	/* kick FW self load */

	iwl_write64(trans, CSR_CTXT_INFO_ADDR,

		    trans_pcie->ctxt_info_dma_addr);

	iwl_write64(trans, CSR_IML_DATA_ADDR,

		    trans_pcie->iml_dma_addr);

	iwl_write32(trans, CSR_IML_SIZE_ADDR, trans->iml_len);

	iwl_set_bit(trans, CSR_CTXT_INFO_BOOT_CTRL, CSR_AUTO_FUNC_BOOT_ENA);

	iwl_set_bit(trans, CSR_GP_CNTRL, CSR_AUTO_FUNC_INIT);



	return 0;

}



void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	if (!trans_pcie->ctxt_info_gen3)

		return;



	dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info_gen3),

			  trans_pcie->ctxt_info_gen3,

			  trans_pcie->ctxt_info_dma_addr);

	trans_pcie->ctxt_info_dma_addr = 0;

	trans_pcie->ctxt_info_gen3 = NULL;



	iwl_pcie_ctxt_info_free_fw_img(trans);



	dma_free_coherent(trans->dev, sizeof(*trans_pcie->prph_scratch),

			  trans_pcie->prph_scratch,

			  trans_pcie->prph_scratch_dma_addr);

	trans_pcie->prph_scratch_dma_addr = 0;

	trans_pcie->prph_scratch = NULL;



	dma_free_coherent(trans->dev, sizeof(*trans_pcie->prph_info),

			  trans_pcie->prph_info,

			  trans_pcie->prph_info_dma_addr);

	trans_pcie->prph_info_dma_addr = 0;

	trans_pcie->prph_info = NULL;

}

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

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

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 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
@@ -19,6 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -55,57 +57,6 @@ 
#include "internal.h"

#include "iwl-prph.h"



static int iwl_pcie_get_num_sections(const struct fw_img *fw,

				     int start)

{

	int i = 0;



	while (start < fw->num_sec &&

	       fw->sec[start].offset != CPU1_CPU2_SEPARATOR_SECTION &&

	       fw->sec[start].offset != PAGING_SEPARATOR_SECTION) {

		start++;

		i++;

	}



	return i;

}



static int iwl_pcie_ctxt_info_alloc_dma(struct iwl_trans *trans,

					const struct fw_desc *sec,

					struct iwl_dram_data *dram)

{

	dram->block = dma_alloc_coherent(trans->dev, sec->len,

					 &dram->physical,

					 GFP_KERNEL);

	if (!dram->block)

		return -ENOMEM;



	dram->size = sec->len;

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



	return 0;

}



static void iwl_pcie_ctxt_info_free_fw_img(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_self_init_dram *dram = &trans_pcie->init_dram;

	int i;



	if (!dram->fw) {

		WARN_ON(dram->fw_cnt);

		return;

	}



	for (i = 0; i < dram->fw_cnt; i++)

		dma_free_coherent(trans->dev, dram->fw[i].size,

				  dram->fw[i].block, dram->fw[i].physical);



	kfree(dram->fw);

	dram->fw_cnt = 0;

	dram->fw = NULL;

}



void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -128,13 +79,12 @@ void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans) 
	dram->paging = NULL;

}



static int iwl_pcie_ctxt_info_init_fw_sec(struct iwl_trans *trans,

int iwl_pcie_init_fw_sec(struct iwl_trans *trans,

			 const struct fw_img *fw,

					  struct iwl_context_info *ctxt_info)

			 struct iwl_context_info_dram *ctxt_dram)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_self_init_dram *dram = &trans_pcie->init_dram;

	struct iwl_context_info_dram *ctxt_dram = &ctxt_info->dram;

	int i, ret, lmac_cnt, umac_cnt, paging_cnt;



	if (WARN(dram->paging,
@@ -247,7 +197,7 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans, 
		TFD_QUEUE_CB_SIZE(TFD_CMD_SLOTS);



	/* allocate ucode sections in dram and set addresses */

	ret = iwl_pcie_ctxt_info_init_fw_sec(trans, fw, ctxt_info);

	ret = iwl_pcie_init_fw_sec(trans, fw, &ctxt_info->dram);

	if (ret) {

		dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info),

				  ctxt_info, trans_pcie->ctxt_info_dma_addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE