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

Commit d235c1c3 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: teth_bridge: remove support for IPA 1.1"

parents 6dcf9d5c 5b385cf3

arch/arm/mach-msm/include/mach/ipa.h

+3 −10
Original line number Diff line number Diff line
@@ -978,9 +978,9 @@ int teth_bridge_disconnect(enum ipa_client_type client); 


int teth_bridge_connect(struct teth_bridge_connect_params *connect_params);



int teth_bridge_set_mbim_aggr_params(struct teth_aggr_params *aggr_params,

		enum ipa_client_type client);



/*

 * Misc.

 */

void ipa_bam_reg_dump(void);

bool ipa_emb_ul_pipes_empty(void);
@@ -1485,13 +1485,6 @@ static inline int teth_bridge_connect(struct teth_bridge_connect_params 
	return -EPERM;

}



static inline int teth_bridge_set_mbim_aggr_params(

				struct teth_aggr_params *aggr_params,

				enum ipa_client_type client)

{

	return -EPERM;

}



static inline void ipa_bam_reg_dump(void)

{

	return;

drivers/platform/msm/ipa/ipa.c

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


	if (ipa_ctx->use_ipa_teth_bridge) {

		/* Initialize the tethering bridge driver */

		result = teth_bridge_driver_init(ipa_ctx->ipa_hw_type);

		result = teth_bridge_driver_init();

		if (result) {

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

			result = -ENODEV;

drivers/platform/msm/ipa/ipa_i.h

+1 −3
Original line number Diff line number Diff line
@@ -849,8 +849,6 @@ int ipa_get_a2_mux_pipe_info(enum a2_mux_pipe_direction pipe_dir, 
				struct a2_mux_pipe_connection *pipe_connect);

int ipa_get_a2_mux_bam_info(u32 *a2_bam_mem_base, u32 *a2_bam_mem_size,

			    u32 *a2_bam_irq);

void teth_bridge_get_client_handles(u32 *producer_handle,

		u32 *consumer_handle);

int ipa_send_one(struct ipa_sys_context *sys, struct ipa_desc *desc,

		bool in_atomic);

int ipa_send(struct ipa_sys_context *sys, u32 num_desc, struct ipa_desc *desc,
@@ -944,7 +942,7 @@ int a2_mux_exit(void); 


void wwan_cleanup(void);



int teth_bridge_driver_init(enum ipa_hw_type ipa_hw_type);

int teth_bridge_driver_init(void);

void ipa_lan_rx_cb(void *priv, enum ipa_dp_evt_type evt, unsigned long data);



int __ipa_commit_flt_v1(enum ipa_ip_type ip);

drivers/platform/msm/ipa/teth_bridge.c

+90 −3411

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/gadget/f_mbim.c

+0 −23
Original line number Diff line number Diff line
@@ -692,29 +692,6 @@ static int mbim_bam_setup(int no_ports) 
	return 0;

}



int mbim_configure_params(void)

{

	struct teth_aggr_params aggr_params;

	int ret = 0;



	aggr_params.dl.aggr_prot = TETH_AGGR_PROTOCOL_MBIM;

	aggr_params.dl.max_datagrams = mbim_ntb_parameters.wNtbOutMaxDatagrams;

	aggr_params.dl.max_transfer_size_byte =

			mbim_ntb_parameters.dwNtbInMaxSize;



	aggr_params.ul.aggr_prot = TETH_AGGR_PROTOCOL_MBIM;

	aggr_params.ul.max_datagrams = mbim_ntb_parameters.wNtbOutMaxDatagrams;

	aggr_params.ul.max_transfer_size_byte =

			mbim_ntb_parameters.dwNtbOutMaxSize;



	ret = teth_bridge_set_mbim_aggr_params(&aggr_params,

							IPA_CLIENT_USB_PROD);

	if (ret)

		pr_err("%s: teth_bridge_set_aggr_params failed\n", __func__);



	return ret;

}



static int mbim_bam_connect(struct f_mbim *dev)

{

	int ret;