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

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

Merge "msm: ipa: unify wdi 1/2 and wdi 3 API"

parents bd618d9d 105b31fb

drivers/platform/msm/ipa/ipa_api.c

+14 −13
Original line number Diff line number Diff line
@@ -3167,52 +3167,53 @@ int ipa_get_smmu_params(struct ipa_smmu_in_params *in, 
EXPORT_SYMBOL(ipa_get_smmu_params);



/**

 * ipa_conn_wdi3_pipes() - connect wdi3 pipes

 * ipa_conn_wdi_pipes() - connect wdi pipes

 */

int ipa_conn_wdi3_pipes(struct ipa_wdi3_conn_in_params *in,

	struct ipa_wdi3_conn_out_params *out)

int ipa_conn_wdi_pipes(struct ipa_wdi_conn_in_params *in,

	struct ipa_wdi_conn_out_params *out,

	ipa_wdi_meter_notifier_cb wdi_notify)

{

	int ret;



	IPA_API_DISPATCH_RETURN(ipa_conn_wdi3_pipes, in, out);

	IPA_API_DISPATCH_RETURN(ipa_conn_wdi_pipes, in, out, wdi_notify);



	return ret;

}



/**

 * ipa_disconn_wdi3_pipes() - disconnect wdi3 pipes

 * ipa_disconn_wdi_pipes() - disconnect wdi pipes

 */

int ipa_disconn_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)

int ipa_disconn_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)

{

	int ret;



	IPA_API_DISPATCH_RETURN(ipa_disconn_wdi3_pipes, ipa_ep_idx_tx,

	IPA_API_DISPATCH_RETURN(ipa_disconn_wdi_pipes, ipa_ep_idx_tx,

		ipa_ep_idx_rx);



	return ret;

}



/**

 * ipa_enable_wdi3_pipes() - enable wdi3 pipes

 * ipa_enable_wdi_pipes() - enable wdi pipes

 */

int ipa_enable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)

int ipa_enable_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)

{

	int ret;



	IPA_API_DISPATCH_RETURN(ipa_enable_wdi3_pipes, ipa_ep_idx_tx,

	IPA_API_DISPATCH_RETURN(ipa_enable_wdi_pipes, ipa_ep_idx_tx,

		ipa_ep_idx_rx);



	return ret;

}



/**

 * ipa_disable_wdi3_pipes() - disable wdi3 pipes

 * ipa_disable_wdi_pipes() - disable wdi pipes

 */

int ipa_disable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)

int ipa_disable_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)

{

	int ret;



	IPA_API_DISPATCH_RETURN(ipa_disable_wdi3_pipes, ipa_ep_idx_tx,

	IPA_API_DISPATCH_RETURN(ipa_disable_wdi_pipes, ipa_ep_idx_tx,

		ipa_ep_idx_rx);



	return ret;

drivers/platform/msm/ipa/ipa_api.h

+6 −5
Original line number Diff line number Diff line
@@ -403,16 +403,17 @@ struct ipa_api_controller { 


	void (*ipa_ntn_uc_dereg_rdyCB)(void);



	int (*ipa_conn_wdi3_pipes)(struct ipa_wdi3_conn_in_params *in,

		struct ipa_wdi3_conn_out_params *out);

	int (*ipa_conn_wdi_pipes)(struct ipa_wdi_conn_in_params *in,

		struct ipa_wdi_conn_out_params *out,

		ipa_wdi_meter_notifier_cb wdi_notify);



	int (*ipa_disconn_wdi3_pipes)(int ipa_ep_idx_tx,

	int (*ipa_disconn_wdi_pipes)(int ipa_ep_idx_tx,

		int ipa_ep_idx_rx);



	int (*ipa_enable_wdi3_pipes)(int ipa_ep_idx_tx,

	int (*ipa_enable_wdi_pipes)(int ipa_ep_idx_tx,

		int ipa_ep_idx_rx);



	int (*ipa_disable_wdi3_pipes)(int ipa_ep_idx_tx,

	int (*ipa_disable_wdi_pipes)(int ipa_ep_idx_tx,

		int ipa_ep_idx_rx);



	int (*ipa_tz_unlock_reg)(struct ipa_tz_unlock_reg_info *reg_info,

drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c

+520 −178

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/ipa/ipa_common_i.h

+7 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, 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
@@ -419,14 +419,15 @@ int ipa_ntn_uc_reg_rdyCB(void (*ipauc_ready_cb)(void *user_data), 
			      void *user_data);

void ipa_ntn_uc_dereg_rdyCB(void);



int ipa_conn_wdi3_pipes(struct ipa_wdi3_conn_in_params *in,

	struct ipa_wdi3_conn_out_params *out);

int ipa_conn_wdi_pipes(struct ipa_wdi_conn_in_params *in,

	struct ipa_wdi_conn_out_params *out,

	ipa_wdi_meter_notifier_cb wdi_notify);



int ipa_disconn_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);

int ipa_disconn_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);



int ipa_enable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);

int ipa_enable_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);



int ipa_disable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);

int ipa_disable_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);



const char *ipa_get_version_string(enum ipa_hw_type ver);

int ipa_start_gsi_channel(u32 clnt_hdl);

drivers/platform/msm/ipa/ipa_v2/ipa.c

+1 −1
Original line number Diff line number Diff line
@@ -4358,7 +4358,7 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
	else

		IPADBG(":ipa Uc interface init ok\n");



	result = ipa_wdi_init();

	result = ipa2_wdi_init();

	if (result)

		IPAERR(":wdi init failed (%d)\n", -result);

	else