Commit 3031a86e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Add-QRTR-MHI-client-driver' 



Manivannan Sadhasivam says:

====================
Add QRTR MHI client driver

Here is the series adding MHI client driver support to Qualcomm IPC router
protocol. MHI is a newly added bus to kernel which is used to communicate to
external modems over a physical interface like PCI-E. This driver is used to
transfer the QMI messages between the host processor and external modems over
the "IPCR" channel.

For QRTR, this driver is just another driver acting as a transport layer like
SMD.

Currently this driver is needed to control the QCA6390 WLAN device from ath11k.
The ath11k MHI controller driver will take care of booting up QCA6390 and
bringing it to operating state. Later, this driver will be used to transfer QMI
messages over the MHI-IPCR channel.

The second patch of this series removes the ARCH_QCOM dependency for QRTR. This
is needed because the QRTR driver will be used with x86 machines as well to talk
to devices like QCA6390.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0932969e e4267108

net/qrtr/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


config QRTR

	tristate "Qualcomm IPC Router support"

	depends on ARCH_QCOM || COMPILE_TEST

	---help---

	  Say Y if you intend to use Qualcomm IPC router protocol.  The

	  protocol is used to communicate with services provided by other
@@ -29,4 +28,11 @@ config QRTR_TUN 
	  implement endpoints of QRTR, for purpose of tunneling data to other

	  hosts or testing purposes.



config QRTR_MHI

	tristate "MHI IPC Router channels"

	depends on MHI_BUS

	help

	  Say Y here to support MHI based ipcrouter channels. MHI is the

	  transport used for communicating to external modems.



endif # QRTR

net/qrtr/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -5,3 +5,5 @@ obj-$(CONFIG_QRTR_SMD) += qrtr-smd.o 
qrtr-smd-y	:= smd.o

obj-$(CONFIG_QRTR_TUN) += qrtr-tun.o

qrtr-tun-y	:= tun.o

obj-$(CONFIG_QRTR_MHI) += qrtr-mhi.o

qrtr-mhi-y	:= mhi.o

net/qrtr/mhi.c

0 → 100644
+127 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/mhi.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/skbuff.h>

#include <net/sock.h>



#include "qrtr.h"



struct qrtr_mhi_dev {

	struct qrtr_endpoint ep;

	struct mhi_device *mhi_dev;

	struct device *dev;

};



/* From MHI to QRTR */

static void qcom_mhi_qrtr_dl_callback(struct mhi_device *mhi_dev,

				      struct mhi_result *mhi_res)

{

	struct qrtr_mhi_dev *qdev = dev_get_drvdata(&mhi_dev->dev);

	int rc;



	if (!qdev || mhi_res->transaction_status)

		return;



	rc = qrtr_endpoint_post(&qdev->ep, mhi_res->buf_addr,

				mhi_res->bytes_xferd);

	if (rc == -EINVAL)

		dev_err(qdev->dev, "invalid ipcrouter packet\n");

}



/* From QRTR to MHI */

static void qcom_mhi_qrtr_ul_callback(struct mhi_device *mhi_dev,

				      struct mhi_result *mhi_res)

{

	struct sk_buff *skb = mhi_res->buf_addr;



	if (skb->sk)

		sock_put(skb->sk);

	consume_skb(skb);

}



/* Send data over MHI */

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 = skb_linearize(skb);

	if (rc)

		goto free_skb;



	rc = mhi_queue_skb(qdev->mhi_dev, DMA_TO_DEVICE, skb, skb->len,

			   MHI_EOT);

	if (rc)

		goto free_skb;



	if (skb->sk)

		sock_hold(skb->sk);



	return rc;



free_skb:

	kfree_skb(skb);



	return rc;

}



static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev,

			       const struct mhi_device_id *id)

{

	struct qrtr_mhi_dev *qdev;

	int 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;

	qdev->ep.xmit = qcom_mhi_qrtr_send;



	dev_set_drvdata(&mhi_dev->dev, qdev);

	rc = qrtr_endpoint_register(&qdev->ep, QRTR_EP_NID_AUTO);

	if (rc)

		return rc;



	dev_dbg(qdev->dev, "Qualcomm MHI QRTR driver probed\n");



	return 0;

}



static void qcom_mhi_qrtr_remove(struct mhi_device *mhi_dev)

{

	struct qrtr_mhi_dev *qdev = dev_get_drvdata(&mhi_dev->dev);



	qrtr_endpoint_unregister(&qdev->ep);

	dev_set_drvdata(&mhi_dev->dev, NULL);

}



static const struct mhi_device_id qcom_mhi_qrtr_id_table[] = {

	{ .chan = "IPCR" },

	{}

};

MODULE_DEVICE_TABLE(mhi, qcom_mhi_qrtr_id_table);



static struct mhi_driver qcom_mhi_qrtr_driver = {

	.probe = qcom_mhi_qrtr_probe,

	.remove = qcom_mhi_qrtr_remove,

	.dl_xfer_cb = qcom_mhi_qrtr_dl_callback,

	.ul_xfer_cb = qcom_mhi_qrtr_ul_callback,

	.id_table = qcom_mhi_qrtr_id_table,

	.driver = {

		.name = "qcom_mhi_qrtr",

	},

};



module_mhi_driver(qcom_mhi_qrtr_driver);



MODULE_AUTHOR("Chris Lew <clew@codeaurora.org>");

MODULE_AUTHOR("Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>");

MODULE_DESCRIPTION("Qualcomm IPC-Router MHI interface driver");

MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE