net: qrtr: mhi: synchronize qrtr and mhi preparation
Subsystems (4)
PATCH RESEND 1/1 net: qrtr: mhi: synchronize qrtr and mhi preparation
A dl callback can be received anytime after mhi_prepare_for_transfer has been called. There is a window where the callback may happen before the probe initializes the qrtr_mhi_dev state. Move the mhi_prepare_for_transfer call after the registering the endpoint.
Once moved, the reverse can happen where qrtr will try to send a packet before the channels are prepared. Add a wait in the sending path to ensure the channels are prepared before trying to do a ul transfer.
Fixes a2e2cc0dbb11 ("net: qrtr: Start MHI channels during init")
Signed-off-by Bhaumik Bhatt <[email protected]>
Reviewed-by Hemant Kumar <[email protected]>
---
Tested-on: X86_64 architecture
net/qrtr/mhi.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
net/qrtr/mhi.c +15 -5
@@ -15,6 +15,7 @@ struct qrtr_mhi_dev {struct qrtr_endpoint ep;struct mhi_device *mhi_dev;struct device *dev; +struct completion ready; };/* From MHI to QRTR */
@@ -50,6 +51,10 @@ 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);
@@ -78,17 +83,13 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev,struct qrtr_mhi_dev *qdev;int rc; -/* start channels */ - rc =mhi_prepare_for_transfer (mhi_dev,MHI_CH_INBOUND_ALLOC_BUFS ); -if (rc) -return rc; - qdev =devm_kzalloc (&mhi_dev->dev,sizeof (*qdev),GFP_KERNEL );if (!qdev)return -ENOMEM ; qdev->mhi_dev = mhi_dev; qdev->dev = &mhi_dev->dev; +init_completion (&qdev->ready); qdev->ep.xmit = qcom_mhi_qrtr_send;dev_set_drvdata (&mhi_dev->dev, qdev);
@@ -96,6 +97,15 @@ 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 · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project