Commit 9ebc2758 authored by Kalle Valo's avatar Kalle Valo Committed by Jakub Kicinski
Browse files

Revert "net: really fix the build..." 



This reverts commit ce78ffa3.

Wren and Nicolas reported that ath11k was failing to initialise QCA6390
Wi-Fi 6 device with error:

qcom_mhi_qrtr: probe of mhi0_IPCR failed with error -22

Commit ce78ffa3 ("net: really fix the build..."), introduced in
v5.14-rc5, caused this regression in qrtr. Most likely all ath11k
devices are broken, but I only tested QCA6390. Let's revert the broken
commit so that ath11k works again.

Reported-by: default avatarWren Turkal <wt@penguintechs.org>
Reported-by: default avatarNicolas Schichan <nschichan@freebox.fr>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210826172816.24478-1-kvalo@codeaurora.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 75da63b7

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, unsigned int flags);

			struct mhi_chan *mhi_chan);

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

+3 −6
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, unsigned int flags)

			struct mhi_chan *mhi_chan)

{

	int ret = 0;

	struct device *dev = &mhi_chan->mhi_dev->dev;
@@ -1455,9 +1455,6 @@ 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,
@@ -1613,7 +1610,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, unsigned int flags)

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev)

{

	int ret, dir;

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

			continue;



		ret = mhi_prepare_channel(mhi_cntrl, mhi_chan, flags);

		ret = mhi_prepare_channel(mhi_cntrl, mhi_chan);

		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, 0);

	err = mhi_prepare_for_transfer(mhi_dev);

	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, 0);

	ret = mhi_prepare_for_transfer(mhiwwan->mhi_dev);

	if (ret)

		return ret;

include/linux/mhi.h

+1 −6
Original line number Diff line number Diff line
@@ -719,13 +719,8 @@ 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,

			     unsigned int flags);



/* Automatically allocate and queue inbound buffers */

#define MHI_CH_INBOUND_ALLOC_BUFS BIT(0)

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev);



/**

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