Revert "net: really fix the build..."
Subsystems (7)
PATCH 1/1 Revert "net: really fix the build..."
This reverts commit ce78ffa3ef1681065ba451cfd545da6126f5ca88.
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 ce78ffa3ef16 ("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.
--- drivers/bus/mhi/core/internal.h | 2 +- drivers/bus/mhi/core/main.c | 9 +++------ drivers/net/mhi/net.c | 2 +- drivers/net/wwan/mhi_wwan_ctrl.c | 2 +- include/linux/mhi.h | 7 +------ net/qrtr/mhi.c | 16 +--------------- 6 files changed, 8 insertions(+), 30 deletions(-)
drivers/bus/mhi/core/internal.h +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
net/qrtr/mhi.c +1 -15
@@ -15,7 +15,6 @@ struct qrtr_mhi_dev {struct qrtr_endpoint ep;struct mhi_device *mhi_dev;struct device *dev; -struct completion ready; };/* From MHI to QRTR */
@@ -51,10 +50,6 @@ static int qcom_mhi_qrtr_send(struct qrtr_endpoint *ep, struct sk_buff *skb) struct qrtr_mhi_dev *qdev = container_of(ep, struct qrtr_mhi_dev, ep);int rc; - rc =wait_for_completion_interruptible (&qdev->ready); -if (rc) - goto free_skb; -if (skb->sk)sock_hold (skb->sk);
@@ -84,7 +79,7 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev,int rc;/* start channels */ - rc =mhi_prepare_for_transfer (mhi_dev,0 ); + rc =mhi_prepare_for_transfer (mhi_dev);if (rc)return rc;
@@ -101,15 +96,6 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev,if (rc)return rc; -/* start channels */ - rc =mhi_prepare_for_transfer (mhi_dev,MHI_CH_INBOUND_ALLOC_BUFS ); -if (rc) { -qrtr_endpoint_unregister (&qdev->ep); -dev_set_drvdata (&mhi_dev->dev,NULL ); -return rc; - } - -complete_all (&qdev->ready);dev_dbg (qdev->dev,"Qualcomm MHI QRTR driver probed\n" );return 0 ;
Signature · 1 line
2.20.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Thu, 26 Aug 2021 20:28:16 +0300 you wrote:
This reverts commit
ce78ffa3ef1681065ba451cfd545da6126f5ca88.Wren and Nicolas reported that ath11k was failing to initialise QCA6390 Wi-Fi 6 device with error:
qcom_mhi_qrtr: probe ofmhi0_IPCRfailed with error -22[...]
Here is the summary with links:
- Revert "net: really fix the build..."
https://git.kernel.org/netdev/net/c/9ebc2758d0bb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html