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

Commit 3baecc61 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 22816619 b5cd7410

drivers/platform/msm/ipa/ipa_api.c

+14 −13
Original line number Diff line number Diff line
@@ -3127,52 +3127,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
@@ -398,16 +398,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

+529 −177

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/ipa/ipa_common_i.h

+6 −5
Original line number Diff line number Diff line
@@ -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_v3/ipa_i.h

+17 −2
Original line number Diff line number Diff line
@@ -200,6 +200,16 @@ enum { 
	NUM_SMEM_SUBSYSTEMS,

};



#define IPA_WDI_RX_RING_RES			0

#define IPA_WDI_RX_RING_RP_RES		1

#define IPA_WDI_RX_COMP_RING_RES	2

#define IPA_WDI_RX_COMP_RING_WP_RES	3

#define IPA_WDI_TX_RING_RES			4

#define IPA_WDI_CE_RING_RES			5

#define IPA_WDI_CE_DB_RES			6

#define IPA_WDI_TX_DB_RES			7

#define IPA_WDI_MAX_RES				8



struct ipa3_active_client_htable_entry {

	struct hlist_node list;

	char id_string[IPA3_ACTIVE_CLIENTS_LOG_NAME_LEN];
@@ -1913,8 +1923,9 @@ int ipa3_setup_uc_ntn_pipes(struct ipa_ntn_conn_in_params *in, 
int ipa3_tear_down_uc_offload_pipes(int ipa_ep_idx_ul, int ipa_ep_idx_dl);

int ipa3_ntn_uc_reg_rdyCB(void (*ipauc_ready_cb)(void *), void *priv);

void ipa3_ntn_uc_dereg_rdyCB(void);

int ipa3_conn_wdi3_pipes(struct ipa_wdi3_conn_in_params *in,

	struct ipa_wdi3_conn_out_params *out);

int ipa3_conn_wdi3_pipes(struct ipa_wdi_conn_in_params *in,

	struct ipa_wdi_conn_out_params *out,

	ipa_wdi_meter_notifier_cb wdi_notify);

int ipa3_disconn_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);

int ipa3_enable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);

int ipa3_disable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx);
@@ -1936,6 +1947,10 @@ int ipa3_uc_reg_rdyCB(struct ipa_wdi_uc_ready_params *param); 
 */

int ipa3_uc_dereg_rdyCB(void);



int ipa_create_uc_smmu_mapping(int res_idx, bool wlan_smmu_en,

		phys_addr_t pa, struct sg_table *sgt, size_t len, bool device,

		unsigned long *iova);



/*

 * Tethering bridge (Rmnet / MBIM)

 */