Merge "msm: mhi_dev: Increase size of ipa_clnt_hndl array" (9f008600) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/platform/msm/mhi_dev/mhi.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -1295,6 +1295,11 @@ static int mhi_hwc_chcmd(struct mhi_dev *mhi, uint chid,
		switch (type) {
		case MHI_DEV_RING_EL_RESET:
		case MHI_DEV_RING_EL_STOP:
		if ((chid-HW_CHANNEL_BASE) > NUM_HW_CHANNELS) {
		pr_err("Invalid Channel ID = 0x%X\n", chid);
		return -EINVAL;
		}

		rc = ipa_mhi_disconnect_pipe(
		mhi->ipa_clnt_hndl[chid-HW_CHANNEL_BASE]);
		if (rc)
		@@ -1305,6 +1310,16 @@ static int mhi_hwc_chcmd(struct mhi_dev *mhi, uint chid,
		connect_params.channel_id = chid;
		connect_params.sys.skip_ep_cfg = true;

		if (chid > HW_CHANNEL_END) {
		pr_err("Channel DB for %d not enabled\n", chid);
		return -EINVAL;
		}

		if ((chid-HW_CHANNEL_BASE) > NUM_HW_CHANNELS) {
		pr_err("Invalid Channel = 0x%X\n", chid);
		return -EINVAL;
		}

		rc = ipa_mhi_connect_pipe(&connect_params,
		&mhi->ipa_clnt_hndl[chid-HW_CHANNEL_BASE]);
		if (rc)

+2 −1

Original line number	Diff line number	Diff line
		@@ -271,6 +271,7 @@ struct mhi_config {

		#define NUM_CHANNELS 128
		#define HW_CHANNEL_BASE 100
		#define NUM_HW_CHANNELS 15
		#define HW_CHANNEL_END 110
		#define MHI_ENV_VALUE 2
		#define MHI_MASK_ROWS_CH_EV_DB 4
		@@ -549,7 +550,7 @@ struct mhi_dev {
		size_t ch_ring_start;

		/* IPA Handles */
		u32 ipa_clnt_hndl[4];
		u32 ipa_clnt_hndl[NUM_HW_CHANNELS];
		struct workqueue_struct *ring_init_wq;
		struct work_struct ring_init_cb_work;
		struct work_struct re_init;