Unverified Commit ed5298c7 authored by Loic Poulain's avatar Loic Poulain Committed by Manivannan Sadhasivam
Browse files

bus: mhi: Remove auto-start option 



There is really no point having an auto-start for channels.
This is confusing for the device drivers, some have to enable the
channels, others don't have... and waste resources (e.g. pre allocated
buffers) that may never be used.

This is really up to the MHI device(channel) driver to manage the state
of its channels.

While at it, let's also remove the auto-start option from ath11k mhi
controller.

Signed-off-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Acked-by: default avatarKalle Valo <kvalo@codeaurora.org>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
[mani: clubbed ath11k change]
Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
parent 3650b228

drivers/bus/mhi/core/init.c

+0 −9
Original line number Diff line number Diff line
@@ -758,7 +758,6 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl, 
		mhi_chan->offload_ch = ch_cfg->offload_channel;

		mhi_chan->db_cfg.reset_req = ch_cfg->doorbell_mode_switch;

		mhi_chan->pre_alloc = ch_cfg->auto_queue;

		mhi_chan->auto_start = ch_cfg->auto_start;



		/*

		 * If MHI host allocates buffers, then the channel direction
@@ -1160,11 +1159,6 @@ static int mhi_driver_probe(struct device *dev) 
			goto exit_probe;



		ul_chan->xfer_cb = mhi_drv->ul_xfer_cb;

		if (ul_chan->auto_start) {

			ret = mhi_prepare_channel(mhi_cntrl, ul_chan);

			if (ret)

				goto exit_probe;

		}

	}



	ret = -EINVAL;
@@ -1198,9 +1192,6 @@ static int mhi_driver_probe(struct device *dev) 
	if (ret)

		goto exit_probe;



	if (dl_chan && dl_chan->auto_start)

		mhi_prepare_channel(mhi_cntrl, dl_chan);



	mhi_device_put(mhi_dev);



	return ret;

drivers/bus/mhi/core/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -563,7 +563,6 @@ struct mhi_chan { 
	bool configured;

	bool offload_ch;

	bool pre_alloc;

	bool auto_start;

	bool wake_capable;

};

drivers/net/wireless/ath/ath11k/mhi.c

+0 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { 
		.offload_channel = false,

		.doorbell_mode_switch = false,

		.auto_queue = false,

		.auto_start = false,

	},

	{

		.num = 1,
@@ -39,7 +38,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { 
		.offload_channel = false,

		.doorbell_mode_switch = false,

		.auto_queue = false,

		.auto_start = false,

	},

	{

		.num = 20,
@@ -54,7 +52,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { 
		.offload_channel = false,

		.doorbell_mode_switch = false,

		.auto_queue = false,

		.auto_start = true,

	},

	{

		.num = 21,
@@ -69,7 +66,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { 
		.offload_channel = false,

		.doorbell_mode_switch = false,

		.auto_queue = true,

		.auto_start = true,

	},

};

include/linux/mhi.h

+0 −2
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ enum mhi_db_brst_mode { 
 * @offload_channel: The client manages the channel completely

 * @doorbell_mode_switch: Channel switches to doorbell mode on M0 transition

 * @auto_queue: Framework will automatically queue buffers for DL traffic

 * @auto_start: Automatically start (open) this channel

 * @wake-capable: Channel capable of waking up the system

 */

struct mhi_channel_config {
@@ -232,7 +231,6 @@ struct mhi_channel_config { 
	bool offload_channel;

	bool doorbell_mode_switch;

	bool auto_queue;

	bool auto_start;

	bool wake_capable;

};