openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This reverts commit ce78ffa3ef.

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 ce78ffa3ef ("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: Wren Turkal <wt@penguintechs.org>
Reported-by: Nicolas Schichan <nschichan@freebox.fr>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210826172816.24478-1-kvalo@codeaurora.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Kalle Valo 2021-08-26 20:28:16 +03:00 committed by Jakub Kicinski
parent 75da63b7a1
commit 9ebc2758d0
6 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bus/mhi/core/internal.h
View File

@ -682,7 +682,7 @@ void mhi_rddm_prepare(struct mhi_controller *mhi_cntrl,
struct image_info *img_info); struct image_info *img_info);
void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl); void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl);
int mhi_prepare_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 mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl, int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl,
struct mhi_chan *mhi_chan); struct mhi_chan *mhi_chan);
void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl, void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl,

9
drivers/bus/mhi/core/main.c
View File

@ -1430,7 +1430,7 @@ static void mhi_unprepare_channel(struct mhi_controller *mhi_cntrl,
} }
int mhi_prepare_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; int ret = 0;
struct device *dev = &mhi_chan->mhi_dev->dev; struct device *dev = &mhi_chan->mhi_dev->dev;
@ -1455,9 +1455,6 @@ int mhi_prepare_channel(struct mhi_controller *mhi_cntrl,
if (ret) if (ret)
goto error_pm_state; 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 */ /* Pre-allocate buffer for xfer ring */
if (mhi_chan->pre_alloc) { if (mhi_chan->pre_alloc) {
int nr_el = get_nr_avail_ring_elements(mhi_cntrl, 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 */ /* 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; int ret, dir;
struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl; 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) if (!mhi_chan)
continue; continue;
ret = mhi_prepare_channel(mhi_cntrl, mhi_chan, flags); ret = mhi_prepare_channel(mhi_cntrl, mhi_chan);
if (ret) if (ret)
goto error_open_chan; goto error_open_chan;
} }

2
drivers/net/mhi/net.c
View File

@ -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); u64_stats_init(&mhi_netdev->stats.tx_syncp);
/* Start MHI channels */ /* Start MHI channels */
err = mhi_prepare_for_transfer(mhi_dev, 0); err = mhi_prepare_for_transfer(mhi_dev);
if (err) if (err)
goto out_err; goto out_err;

2
drivers/net/wwan/mhi_wwan_ctrl.c
View File

@ -110,7 +110,7 @@ static int mhi_wwan_ctrl_start(struct wwan_port *port)
int ret; int ret;
/* Start mhi device's channel(s) */ /* 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) if (ret)
return ret; return ret;

7
include/linux/mhi.h
View File

@ -719,13 +719,8 @@ void mhi_device_put(struct mhi_device *mhi_dev);
* host and device execution environments match and * host and device execution environments match and
* channels are in a DISABLED state. * channels are in a DISABLED state.
* @mhi_dev: Device associated with the channels * @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. * mhi_unprepare_from_transfer - Reset UL and DL channels for data transfer.

16
net/qrtr/mhi.c
View File

@ -15,7 +15,6 @@ struct qrtr_mhi_dev {
struct qrtr_endpoint ep; struct qrtr_endpoint ep;
struct mhi_device *mhi_dev; struct mhi_device *mhi_dev;
struct device *dev; struct device *dev;
struct completion ready;
}; };
/* From MHI to QRTR */ /* 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); struct qrtr_mhi_dev *qdev = container_of(ep, struct qrtr_mhi_dev, ep);
int rc; int rc;
rc = wait_for_completion_interruptible(&qdev->ready);
if (rc)
goto free_skb;
if (skb->sk) if (skb->sk)
sock_hold(skb->sk); sock_hold(skb->sk);
@ -84,7 +79,7 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev,
int rc; int rc;
/* start channels */ /* start channels */
rc = mhi_prepare_for_transfer(mhi_dev, 0); rc = mhi_prepare_for_transfer(mhi_dev);
if (rc) if (rc)
return rc; return rc;
@ -101,15 +96,6 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev,
if (rc) if (rc)
return 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"); dev_dbg(qdev->dev, "Qualcomm MHI QRTR driver probed\n");
return 0; return 0;