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

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

Merge "USB: gadget: Pass updated src/dest_pipe_index to USB2 controller"

parents 20670e95 694ae56f

drivers/usb/gadget/function/u_bam.c

+8 −0
Original line number Diff line number Diff line
@@ -1416,11 +1416,19 @@ static void gbam2bam_connect_work(struct work_struct *w) 


	} else {

		/* Configure for RX */

		get_bam2bam_connection_info(d->usb_bam_type,

				d->src_connection_idx,

				&d->src_pipe_idx,

				NULL, NULL, NULL);

		sps_params = (MSM_SPS_MODE | d->src_pipe_idx |

				MSM_VENDOR_ID) & ~MSM_IS_FINITE_TRANSFER;

		d->rx_req->udc_priv = sps_params;



		/* Configure for TX */

		get_bam2bam_connection_info(d->usb_bam_type,

				d->dst_connection_idx,

				&d->dst_pipe_idx,

				NULL, NULL, NULL);

		sps_params = (MSM_SPS_MODE | d->dst_pipe_idx |

				MSM_VENDOR_ID) & ~MSM_IS_FINITE_TRANSFER;

		d->tx_req->udc_priv = sps_params;

drivers/usb/gadget/function/u_bam_data.c

+8 −0
Original line number Diff line number Diff line
@@ -951,11 +951,19 @@ static void bam2bam_data_connect_work(struct work_struct *w) 


	} else {

		/* Configure RX */

		get_bam2bam_connection_info(d->usb_bam_type,

				d->src_connection_idx,

				&d->src_pipe_idx,

				NULL, NULL, NULL);

		sps_params = (SPS_PARAMS_SPS_MODE | d->src_pipe_idx |

			MSM_VENDOR_ID) & ~SPS_PARAMS_TBE;

		d->rx_req->udc_priv = sps_params;



		/* Configure TX */

		get_bam2bam_connection_info(d->usb_bam_type,

				d->dst_connection_idx,

				&d->dst_pipe_idx,

				NULL, NULL, NULL);

		sps_params = (SPS_PARAMS_SPS_MODE | d->dst_pipe_idx |

			MSM_VENDOR_ID) & ~SPS_PARAMS_TBE;

		d->tx_req->udc_priv = sps_params;

drivers/usb/gadget/function/u_data_ipa.c

+8 −0
Original line number Diff line number Diff line
@@ -370,6 +370,10 @@ static void ipa_data_connect_work(struct work_struct *w) 
				goto free_rx_tx_req;

			}

		} else {

			get_bam2bam_connection_info(port->usb_bam_type,

					port->src_connection_idx,

					&port->src_pipe_idx,

					NULL, NULL, NULL);

			sps_params = (MSM_SPS_MODE | port->src_pipe_idx |

				       MSM_VENDOR_ID) & ~MSM_IS_FINITE_TRANSFER;

			port->rx_req->udc_priv = sps_params;
@@ -392,6 +396,10 @@ static void ipa_data_connect_work(struct work_struct *w) 
				goto unconfig_msm_ep_out;

			}

		} else {

			get_bam2bam_connection_info(port->usb_bam_type,

					port->dst_connection_idx,

					&port->dst_pipe_idx,

					NULL, NULL, NULL);

			sps_params = (MSM_SPS_MODE | port->dst_pipe_idx |

				       MSM_VENDOR_ID) & ~MSM_IS_FINITE_TRANSFER;

			port->tx_req->udc_priv = sps_params;