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

Commit 1e13091f 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: add support for sending packet status"

parents fcaf1122 1323f7a3

drivers/platform/msm/ipa/ipa_api.c

+2 −2
Original line number Diff line number Diff line
@@ -1189,13 +1189,13 @@ EXPORT_SYMBOL(ipa_teardown_sys_pipe); 


int ipa_sys_setup(struct ipa_sys_connect_params *sys_in,

	unsigned long *ipa_bam_hdl,

	u32 *ipa_pipe_num, u32 *clnt_hdl)

	u32 *ipa_pipe_num, u32 *clnt_hdl, bool en_status)



{

	int ret;



	IPA_API_DISPATCH_RETURN(ipa_sys_setup, sys_in, ipa_bam_hdl,

			ipa_pipe_num, clnt_hdl);

			ipa_pipe_num, clnt_hdl, en_status);



	return ret;

}

drivers/platform/msm/ipa/ipa_api.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct ipa_api_controller { 


	int (*ipa_sys_setup)(struct ipa_sys_connect_params *sys_in,

		unsigned long *ipa_bam_hdl,

		u32 *ipa_pipe_num, u32 *clnt_hdl);

		u32 *ipa_pipe_num, u32 *clnt_hdl, bool en_status);



	int (*ipa_sys_teardown)(u32 clnt_hdl);

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

+1 −1
Original line number Diff line number Diff line
@@ -2985,7 +2985,7 @@ void ipa2_free_skb(struct ipa_rx_data *data) 


int ipa2_sys_setup(struct ipa_sys_connect_params *sys_in,

			unsigned long *ipa_bam_hdl,

			u32 *ipa_pipe_num, u32 *clnt_hdl)

			u32 *ipa_pipe_num, u32 *clnt_hdl, bool en_status)

{

	struct ipa_ep_context *ep;

	int ipa_ep_idx;

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

+1 −1
Original line number Diff line number Diff line
@@ -1566,7 +1566,7 @@ int ipa2_teardown_sys_pipe(u32 clnt_hdl); 


int ipa2_sys_setup(struct ipa_sys_connect_params *sys_in,

	unsigned long *ipa_bam_hdl,

	u32 *ipa_pipe_num, u32 *clnt_hdl);

	u32 *ipa_pipe_num, u32 *clnt_hdl, bool en_status);



int ipa2_sys_teardown(u32 clnt_hdl);

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

+5 −1
Original line number Diff line number Diff line
@@ -2769,7 +2769,7 @@ void ipa3_free_skb(struct ipa_rx_data *data) 


int ipa3_sys_setup(struct ipa_sys_connect_params *sys_in,

			unsigned long *ipa_bam_hdl,

			u32 *ipa_pipe_num, u32 *clnt_hdl)

			u32 *ipa_pipe_num, u32 *clnt_hdl, bool en_status)

{

	struct ipa3_ep_context *ep;

	int ipa_ep_idx;
@@ -2837,6 +2837,10 @@ int ipa3_sys_setup(struct ipa_sys_connect_params *sys_in, 
	ep->client_notify = sys_in->notify;

	ep->priv = sys_in->priv;

	ep->keep_ipa_awake = true;

	if (en_status) {

		ep->status.status_en = true;

		ep->status.status_ep = ipa_ep_idx;

	}



	result = ipa3_enable_data_path(ipa_ep_idx);

	if (result) {