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

Commit 72be67e7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: separate IPAv3.5 mhi\non mhi configurations"

parents 80945aba 9b1e836e

drivers/platform/msm/ipa/ipa_v3/ipa.c

+81 −60
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

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

 * it under the terms of the GNU General Public License version 2 and
@@ -3940,6 +3940,10 @@ static enum gsi_ver ipa3_get_gsi_ver(enum ipa_hw_type ipa_hw_type) 
 * @pdev:	The platform device structure representing the IPA driver

 *

 * Function initialization process:

 * - Initialize endpoints bitmaps

 * - Initialize resource groups min and max values

 * - Initialize filtering lists heads and idr

 * - Initialize interrupts

 * - Register BAM/SPS or GSI

 * - Setup APPS pipes

 * - Initialize tethering bridge
@@ -3958,6 +3962,53 @@ static int ipa3_post_init(const struct ipa3_plat_drv_res *resource_p, 
	struct sps_bam_props bam_props = { 0 };

	struct gsi_per_props gsi_props;

	struct ipa3_uc_hdlrs uc_hdlrs = { 0 };

	struct ipa3_flt_tbl *flt_tbl;

	int i;



	/*

	 * indication whether working in MHI config or non MHI config is given

	 * in ipa3_write which is launched before ipa3_post_init. i.e. from

	 * this point it is safe to use ipa3_ep_mapping array and the correct

	 * entry will be returned from ipa3_get_hw_type_index()

	 */

	ipa_init_ep_flt_bitmap();

	IPADBG("EP with flt support bitmap 0x%x (%u pipes)\n",

		ipa3_ctx->ep_flt_bitmap, ipa3_ctx->ep_flt_num);



	/* Assign resource limitation to each group */

	ipa3_set_resorce_groups_min_max_limits();



	for (i = 0; i < ipa3_ctx->ipa_num_pipes; i++) {

		if (!ipa_is_ep_support_flt(i))

			continue;



		flt_tbl = &ipa3_ctx->flt_tbl[i][IPA_IP_v4];

		INIT_LIST_HEAD(&flt_tbl->head_flt_rule_list);

		flt_tbl->in_sys[IPA_RULE_HASHABLE] =

			!ipa3_ctx->ip4_flt_tbl_hash_lcl;

		flt_tbl->in_sys[IPA_RULE_NON_HASHABLE] =

			!ipa3_ctx->ip4_flt_tbl_nhash_lcl;

		idr_init(&flt_tbl->rule_ids);



		flt_tbl = &ipa3_ctx->flt_tbl[i][IPA_IP_v6];

		INIT_LIST_HEAD(&flt_tbl->head_flt_rule_list);

		flt_tbl->in_sys[IPA_RULE_HASHABLE] =

			!ipa3_ctx->ip6_flt_tbl_hash_lcl;

		flt_tbl->in_sys[IPA_RULE_NON_HASHABLE] =

			!ipa3_ctx->ip6_flt_tbl_nhash_lcl;

		idr_init(&flt_tbl->rule_ids);

	}



	if (!ipa3_ctx->apply_rg10_wa) {

		result = ipa3_init_interrupts();

		if (result) {

			IPAERR("ipa initialization of interrupts failed\n");

			result = -ENODEV;

			goto fail_register_device;

		}

	} else {

		IPADBG("Initialization of ipa interrupts skipped\n");

	}



	if (ipa3_ctx->transport_prototype == IPA_TRANSPORT_TYPE_GSI) {

		memset(&gsi_props, 0, sizeof(gsi_props));
@@ -4194,10 +4245,19 @@ static ssize_t ipa3_write(struct file *file, const char __user *buf, 
	if (ipa3_ctx->transport_prototype == IPA_TRANSPORT_TYPE_GSI) {

		IPA_ACTIVE_CLIENTS_INC_SIMPLE();



		if (ipa3_is_msm_device())

		if (ipa3_is_msm_device()) {

			result = ipa3_trigger_fw_loading_msms();

		else

		} else {

			if (!strcasecmp(dbg_buff, "MHI")) {

				ipa3_ctx->ipa_config_is_mhi = true;

				pr_info(

				"IPA is loading with MHI configuration\n");

			} else {

				pr_info(

				"IPA is loading with non MHI configuration\n");

			}

			result = ipa3_trigger_fw_loading_mdms();

		}

		/* No IPAv3.x chipsets that don't support FW loading */



		IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
@@ -4278,37 +4338,36 @@ int ipa3_tz_unlock_reg(struct ipa_tz_unlock_reg_info *reg_info, u16 num_regs) 
* @pdev:	The platform device structure representing the IPA driver

*

* Function initialization process:

* - Allocate memory for the driver context data struct

* - Initializing the ipa3_ctx with:

* * Allocate memory for the driver context data struct

* * Initializing the ipa3_ctx with:

*    1)parsed values from the dts file

*    2)parameters passed to the module initialization

*    3)read HW values(such as core memory size)

* - Map IPA core registers to CPU memory

* - Restart IPA core(HW reset)

* - Set configuration for IPA BAM via BAM_CNFG_BITS

* - Initialize the look-aside caches(kmem_cache/slab) for filter,

* * Map IPA core registers to CPU memory

* * Restart IPA core(HW reset)

* * Set configuration for IPA BAM via BAM_CNFG_BITS

* * Initialize the look-aside caches(kmem_cache/slab) for filter,

*   routing and IPA-tree

* - Create memory pool with 4 objects for DMA operations(each object

* * Create memory pool with 4 objects for DMA operations(each object

*   is 512Bytes long), this object will be use for tx(A5->IPA)

* - Initialize lists head(routing,filter,hdr,system pipes)

* - Initialize mutexes (for ipa_ctx and NAT memory mutexes)

* - Initialize spinlocks (for list related to A5<->IPA pipes)

* - Initialize 2 single-threaded work-queue named "ipa rx wq" and "ipa tx wq"

* - Initialize Red-Black-Tree(s) for handles of header,routing rule,

* * Initialize lists head(routing, hdr, system pipes)

* * Initialize mutexes (for ipa_ctx and NAT memory mutexes)

* * Initialize spinlocks (for list related to A5<->IPA pipes)

* * Initialize 2 single-threaded work-queue named "ipa rx wq" and "ipa tx wq"

* * Initialize Red-Black-Tree(s) for handles of header,routing rule,

*   routing table ,filtering rule

* - Initialize the filter block by committing IPV4 and IPV6 default rules

* - Create empty routing table in system memory(no committing)

* - Initialize pipes memory pool with ipa3_pipe_mem_init for supported platforms

* - Create a char-device for IPA

* - Initialize IPA RM (resource manager)

* - Configure GSI registers (in GSI case)

* * Initialize the filter block by committing IPV4 and IPV6 default rules

* * Create empty routing table in system memory(no committing)

* * Initialize pipes memory pool with ipa3_pipe_mem_init for supported platforms

* * Create a char-device for IPA

* * Initialize IPA RM (resource manager)

* * Configure GSI registers (in GSI case)

*/

static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,

		struct device *ipa_dev)

{

	int result = 0;

	int i;

	struct ipa3_flt_tbl *flt_tbl;

	struct ipa3_rt_tbl_set *rset;

	struct ipa_active_client_logging_info log_info;
@@ -4466,10 +4525,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		goto fail_init_hw;

	}



	ipa_init_ep_flt_bitmap();

	IPADBG("EP with flt support bitmap 0x%x (%u pipes)\n",

		ipa3_ctx->ep_flt_bitmap, ipa3_ctx->ep_flt_num);



	ipa3_ctx->ctrl->ipa_sram_read_settings();

	IPADBG("SRAM, size: 0x%x, restricted bytes: 0x%x\n",

		ipa3_ctx->smem_sz, ipa3_ctx->smem_restricted_bytes);
@@ -4502,9 +4557,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
	ipa3_active_clients_log_inc(&log_info, false);

	ipa3_ctx->ipa3_active_clients.cnt = 1;



	/* Assign resource limitation to each group */

	ipa3_set_resorce_groups_min_max_limits();



	/* Create workqueues for power management */

	ipa3_ctx->power_mgmt_wq =

		create_singlethread_workqueue("ipa_power_mgmt");
@@ -4621,26 +4673,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
	}

	INIT_LIST_HEAD(&ipa3_ctx->rt_tbl_set[IPA_IP_v4].head_rt_tbl_list);

	INIT_LIST_HEAD(&ipa3_ctx->rt_tbl_set[IPA_IP_v6].head_rt_tbl_list);

	for (i = 0; i < ipa3_ctx->ipa_num_pipes; i++) {

		if (!ipa_is_ep_support_flt(i))

			continue;



		flt_tbl = &ipa3_ctx->flt_tbl[i][IPA_IP_v4];

		INIT_LIST_HEAD(&flt_tbl->head_flt_rule_list);

		flt_tbl->in_sys[IPA_RULE_HASHABLE] =

			!ipa3_ctx->ip4_flt_tbl_hash_lcl;

		flt_tbl->in_sys[IPA_RULE_NON_HASHABLE] =

			!ipa3_ctx->ip4_flt_tbl_nhash_lcl;

		idr_init(&flt_tbl->rule_ids);



		flt_tbl = &ipa3_ctx->flt_tbl[i][IPA_IP_v6];

		INIT_LIST_HEAD(&flt_tbl->head_flt_rule_list);

		flt_tbl->in_sys[IPA_RULE_HASHABLE] =

			!ipa3_ctx->ip6_flt_tbl_hash_lcl;

		flt_tbl->in_sys[IPA_RULE_NON_HASHABLE] =

			!ipa3_ctx->ip6_flt_tbl_nhash_lcl;

		idr_init(&flt_tbl->rule_ids);

	}



	rset = &ipa3_ctx->reap_rt_tbl_set[IPA_IP_v4];

	INIT_LIST_HEAD(&rset->head_rt_tbl_list);
@@ -4754,17 +4786,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		goto fail_create_apps_resource;

	}



	if (!ipa3_ctx->apply_rg10_wa) {

		result = ipa3_init_interrupts();

		if (result) {

			IPAERR("ipa initialization of interrupts failed\n");

			result = -ENODEV;

			goto fail_ipa_init_interrupts;

		}

	} else {

		IPADBG("Initialization of ipa interrupts skipped\n");

	}



	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v3_5)

		ipa3_enable_dcd();

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

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

 * it under the terms of the GNU General Public License version 2 and
@@ -1230,6 +1230,7 @@ struct ipa3_context { 
	wait_queue_head_t msg_waitq;

	enum ipa_hw_type ipa_hw_type;

	enum ipa3_hw_mode ipa3_hw_mode;

	bool ipa_config_is_mhi;

	bool use_ipa_teth_bridge;

	bool ipa_bam_remote_mode;

	bool modem_cfg_emb_pipe_flt;

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

+253 −55

File changed.

Preview size limit exceeded, changes collapsed.