f79a917e69
* Change SMD callback parameters * Use writecombine mapping for SMEM -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXFvdZAAoJEFKiBbHx2RXVxPQQAJnEp1+5CDN7ziQ/zJ3juSxb b7rOr5Z0qMDhh0H9BFdmhGzFctbY0AOqerfh138pXa6KN7maXT/enUE4vvtWUp1B HCr9xt13waoa8e6umj/D1qU5mMLUX+JraVkIo6Dyd1g6pVmdrbwzP+Z0tW0x7CvW n5r9eDYts66vGbQ6xzK40rTi22sEN32AY4mezKj40L8o0NvfZCCwb3dfw2RQzLHK 0KnSQ0PKqU1ZWrDc2YuvRsyh5KGv+t8vvnpMVVUi4TRx3qzoGpHpH3fE3evvMGKY ya6nmFNFPZ+ZlzsGDx10RqLu58NmjS8LXY6O+yCGy9NPuonKpwHgYD2wxut2NR/W TTtMhvJWKNIwhXR8ZRDaVBWQJBwoLvpNQT1zOIUuUKf+SZ2DbfgVpte7NZvrgEka aY4nnZMbI0MvpaAHUtllWbC4xqMQJXY+4wrahKQgKF/l5H/0XQ99fHHz86DS9LCO y+dfmU98dv/1X8qmxNfsULtJwbxi2Xwzt3MMMZb5v138STyMWeqWOLm+KGzgs1hu Pc/RLQALdJpQEcg74s5xt2yxSqRuzDig7FtRT1a2SX33vi9YohQEgXCDe+IOJC5l sm1Ppi3oO/yUcocUDFTBz/g6zD4SWywu2gmBcZIh/JVy8Sd053WwlaKs1Nld6ta7 QPx6rga7lgrYW409RS2A =Jzqj -----END PGP SIGNATURE----- Merge tag 'qcom-soc-for-4.7-2' into net-next This merges the Qualcomm SOC tree with the net-next, solving the merge conflict in the SMD API between the two. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
121 lines
2.7 KiB
C
121 lines
2.7 KiB
C
/*
|
|
* Copyright (c) 2015, Sony Mobile Communications Inc.
|
|
* Copyright (c) 2013, The Linux Foundation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 and
|
|
* only version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/soc/qcom/smd.h>
|
|
|
|
#include "qrtr.h"
|
|
|
|
struct qrtr_smd_dev {
|
|
struct qrtr_endpoint ep;
|
|
struct qcom_smd_channel *channel;
|
|
struct device *dev;
|
|
};
|
|
|
|
/* from smd to qrtr */
|
|
static int qcom_smd_qrtr_callback(struct qcom_smd_channel *channel,
|
|
const void *data, size_t len)
|
|
{
|
|
struct qrtr_smd_dev *qdev = qcom_smd_get_drvdata(channel);
|
|
int rc;
|
|
|
|
if (!qdev)
|
|
return -EAGAIN;
|
|
|
|
rc = qrtr_endpoint_post(&qdev->ep, data, len);
|
|
if (rc == -EINVAL) {
|
|
dev_err(qdev->dev, "invalid ipcrouter packet\n");
|
|
/* return 0 to let smd drop the packet */
|
|
rc = 0;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
/* from qrtr to smd */
|
|
static int qcom_smd_qrtr_send(struct qrtr_endpoint *ep, struct sk_buff *skb)
|
|
{
|
|
struct qrtr_smd_dev *qdev = container_of(ep, struct qrtr_smd_dev, ep);
|
|
int rc;
|
|
|
|
rc = skb_linearize(skb);
|
|
if (rc)
|
|
goto out;
|
|
|
|
rc = qcom_smd_send(qdev->channel, skb->data, skb->len);
|
|
|
|
out:
|
|
if (rc)
|
|
kfree_skb(skb);
|
|
else
|
|
consume_skb(skb);
|
|
return rc;
|
|
}
|
|
|
|
static int qcom_smd_qrtr_probe(struct qcom_smd_device *sdev)
|
|
{
|
|
struct qrtr_smd_dev *qdev;
|
|
int rc;
|
|
|
|
qdev = devm_kzalloc(&sdev->dev, sizeof(*qdev), GFP_KERNEL);
|
|
if (!qdev)
|
|
return -ENOMEM;
|
|
|
|
qdev->channel = sdev->channel;
|
|
qdev->dev = &sdev->dev;
|
|
qdev->ep.xmit = qcom_smd_qrtr_send;
|
|
|
|
rc = qrtr_endpoint_register(&qdev->ep, QRTR_EP_NID_AUTO);
|
|
if (rc)
|
|
return rc;
|
|
|
|
qcom_smd_set_drvdata(sdev->channel, qdev);
|
|
dev_set_drvdata(&sdev->dev, qdev);
|
|
|
|
dev_dbg(&sdev->dev, "Qualcomm SMD QRTR driver probed\n");
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void qcom_smd_qrtr_remove(struct qcom_smd_device *sdev)
|
|
{
|
|
struct qrtr_smd_dev *qdev = dev_get_drvdata(&sdev->dev);
|
|
|
|
qrtr_endpoint_unregister(&qdev->ep);
|
|
|
|
dev_set_drvdata(&sdev->dev, NULL);
|
|
}
|
|
|
|
static const struct qcom_smd_id qcom_smd_qrtr_smd_match[] = {
|
|
{ "IPCRTR" },
|
|
{}
|
|
};
|
|
|
|
static struct qcom_smd_driver qcom_smd_qrtr_driver = {
|
|
.probe = qcom_smd_qrtr_probe,
|
|
.remove = qcom_smd_qrtr_remove,
|
|
.callback = qcom_smd_qrtr_callback,
|
|
.smd_match_table = qcom_smd_qrtr_smd_match,
|
|
.driver = {
|
|
.name = "qcom_smd_qrtr",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
module_qcom_smd_driver(qcom_smd_qrtr_driver);
|
|
|
|
MODULE_DESCRIPTION("Qualcomm IPC-Router SMD interface driver");
|
|
MODULE_LICENSE("GPL v2");
|