Commit 0092a1e3 authored by Loic Poulain's avatar Loic Poulain Committed by Greg Kroah-Hartman
Browse files

bus: mhi: Add inbound buffers allocation flag 

Currently, the MHI controller driver defines which channels should
have their inbound buffers allocated and queued. But ideally, this is
something that should be decided by the MHI device driver instead,
which actually deals with that buffers.

Add a flag parameter to mhi_prepare_for_transfer allowing to specify
if buffers have to be allocated and queued by the MHI stack.

Keep auto_queue flag for now, but should be removed at some point.

Link: https://lore.kernel.org/r/1624566520-20406-1-git-send-email-loic.poulain@linaro.org


Tested-by: default avatarBhaumik Bhatt <bbhatt@codeaurora.org>
Reviewed-by: default avatarBhaumik Bhatt <bbhatt@codeaurora.org>
Reviewed-by: default avatarHemant Kumar <hemantk@codeaurora.org>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20210802051255.5771-2-manivannan.sadhasivam@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fec29bf0

drivers/bus/mhi/core/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ void mhi_rddm_prepare(struct mhi_controller *mhi_cntrl, 
		      struct image_info *img_info);

void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl);

int mhi_prepare_channel(struct mhi_controller *mhi_cntrl,

			struct mhi_chan *mhi_chan);

			struct mhi_chan *mhi_chan, unsigned int flags);

int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl,

		       struct mhi_chan *mhi_chan);

void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl,

drivers/bus/mhi/core/main.c

+6 −3
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ static void mhi_unprepare_channel(struct mhi_controller *mhi_cntrl, 
}



int mhi_prepare_channel(struct mhi_controller *mhi_cntrl,

			struct mhi_chan *mhi_chan)

			struct mhi_chan *mhi_chan, unsigned int flags)

{

	int ret = 0;

	struct device *dev = &mhi_chan->mhi_dev->dev;
@@ -1455,6 +1455,9 @@ int mhi_prepare_channel(struct mhi_controller *mhi_cntrl, 
	if (ret)

		goto error_pm_state;



	if (mhi_chan->dir == DMA_FROM_DEVICE)

		mhi_chan->pre_alloc = !!(flags & MHI_CH_INBOUND_ALLOC_BUFS);



	/* Pre-allocate buffer for xfer ring */

	if (mhi_chan->pre_alloc) {

		int nr_el = get_nr_avail_ring_elements(mhi_cntrl,
@@ -1610,7 +1613,7 @@ void mhi_reset_chan(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan) 
}



/* Move channel to start state */

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev)

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev, unsigned int flags)

{

	int ret, dir;

	struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
@@ -1621,7 +1624,7 @@ int mhi_prepare_for_transfer(struct mhi_device *mhi_dev) 
		if (!mhi_chan)

			continue;



		ret = mhi_prepare_channel(mhi_cntrl, mhi_chan);

		ret = mhi_prepare_channel(mhi_cntrl, mhi_chan, flags);

		if (ret)

			goto error_open_chan;

	}

drivers/net/mhi/net.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static int mhi_net_newlink(void *ctxt, struct net_device *ndev, u32 if_id, 
	u64_stats_init(&mhi_netdev->stats.tx_syncp);



	/* Start MHI channels */

	err = mhi_prepare_for_transfer(mhi_dev);

	err = mhi_prepare_for_transfer(mhi_dev, 0);

	if (err)

		goto out_err;

drivers/net/wwan/mhi_wwan_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int mhi_wwan_ctrl_start(struct wwan_port *port) 
	int ret;



	/* Start mhi device's channel(s) */

	ret = mhi_prepare_for_transfer(mhiwwan->mhi_dev);

	ret = mhi_prepare_for_transfer(mhiwwan->mhi_dev, 0);

	if (ret)

		return ret;

include/linux/mhi.h

+6 −1
Original line number Diff line number Diff line
@@ -719,8 +719,13 @@ void mhi_device_put(struct mhi_device *mhi_dev); 
 *                            host and device execution environments match and

 *                            channels are in a DISABLED state.

 * @mhi_dev: Device associated with the channels

 * @flags: MHI channel flags

 */

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev);

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev,

			     unsigned int flags);



/* Automatically allocate and queue inbound buffers */

#define MHI_CH_INBOUND_ALLOC_BUFS BIT(0)



/**

 * mhi_unprepare_from_transfer - Reset UL and DL channels for data transfer.