Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp3667578ybb; Mon, 23 Mar 2020 05:32:28 -0700 (PDT) X-Google-Smtp-Source: ADFU+vujAQC5ExK/EjAioppa0t9t8r5bhgmRgbphr4TTkI8lKEiRjDw4W0NGCvh0Oh8+0zjunwhN X-Received: by 2002:a05:6830:22db:: with SMTP id q27mr9471650otc.347.1584966748809; Mon, 23 Mar 2020 05:32:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584966748; cv=none; d=google.com; s=arc-20160816; b=zM+qoXT9RPe6BowoiswC1GEgYHmSKVu7FHyXSE/sZnwc4TOxdm7/l/HhcyDSIG504a +oKVv0ZCK4mQnkskjkQo/rJnHwGL1D99V12sGK44VwV2SCq5jIrmEx2zrJVrqz640DRO W7Ur0av4rKk03bXUcgYerBa6gSoemfLzW3OJPW8gNf/7cLr9U9lXBq7UeloXg6OuRm6n H0gmbaHdKFnBvxmfK1IZh126jv+u2aMI3ekMaaUWmon8DwKnfC2BMUAWLx1T/cihrJpZ siWE+hIIxqXOTrqlysQhbdsJOmFKjg/k5X6hgyjf0A64YC9vrSYnstnXvn/hf+OjQ781 VYWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=ze2ItdsI6wPt5v1O8KEFX204MaoLii8v3eVvbrQAdcg=; b=cZjwoMJ+VNEJiPw9XnS+bnPqV5aRKzfJbQb40hexBFll0G7qIvHPsFY+RvrkTnNwZr lyMixngiXt8DWiQI5wTqMhmuSo+O62Wo/gqabZB/sz2bu0MUa9P6jPn4zE2XxU8j+uUu vl8gpCyAxxrcshjCN9jIu6ATNM1hyIJrH7XVqxbiaV/i3t1CnmBRZi78zpi7tNjwvT6e D20gfttkY+AFS3P+GUOGykFrMcKY3JaGUhyy2I6TDBJehr4Wti8b6K4jb5U0Llfw8z4q acX/mpAwqOeaQD1sMB3cdzBVbUaizXxi3X1QELbyXx6WXod6mO9Dn/YFhTHdrxlLPXwp LNpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MCgGtUpA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p125si710199oig.264.2020.03.23.05.32.16; Mon, 23 Mar 2020 05:32:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MCgGtUpA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728292AbgCWMbh (ORCPT + 99 others); Mon, 23 Mar 2020 08:31:37 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33716 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728269AbgCWMbg (ORCPT ); Mon, 23 Mar 2020 08:31:36 -0400 Received: by mail-pg1-f194.google.com with SMTP id d17so6557434pgo.0 for ; Mon, 23 Mar 2020 05:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ze2ItdsI6wPt5v1O8KEFX204MaoLii8v3eVvbrQAdcg=; b=MCgGtUpAROkqV2KhJ5MkLpbTrkma9zEQLOixv+V3jZd5LmArDHXACzLD2Z23aynMCo e8I9jS+pjqfIus3gLiag+hGO0WNK1k9Vo6jKoBr6jPlyHgGWzz6uZAG2j3JQd/NOwccB gUUFqbGvSmy3opf+8kIgllPjNKIovAg6ajVZzZYU85SqOQhizW+iQ5QklcMOvNhyt+lq MZxsB34O8NQZsz3dg7ts/Gvbxp8NS0+6o5Q9PXdTX0WNr5tA+nIXxqwj9JRg8bMwbZyU Llr5VqHtWgKsskZHfALQPhWIZo8mtCl6bodAZURDoM3IoL8V8iiccy0w6V4OkoiJipVQ D6GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ze2ItdsI6wPt5v1O8KEFX204MaoLii8v3eVvbrQAdcg=; b=rKoS/XwYwvDr1McuPkXACg7gQCUGvL5B2YijLqnn5s8Bhea2Kj/2sUi7oRjue0kpnW BRa/RgudHRCQsV/I9bRUn3imP+vnB52pLrmNfVsy4M0d5KkW+29u4hu+f100XYMjcQab Y3WVRyMroFt5jLWVyYTdK/7JY1SZnCcOFQJvWl0Z279Uip34SWotEtVg77Rne9McJ7oD 1tfIQKemo5Rspssy27DbRB3uYH7F47rZjtzuMLkhQwtHGoh4rolEHQNneTLTziaDBlFF JjH2MTxzTMCqTkX/iCKNZxHAUCvRJPrURZx9RYjcMtdJKHDdVPWFC9kAMzYB0rTI1Ery vYSw== X-Gm-Message-State: ANhLgQ2c8urKAkPg+1MHd5AAdBcMlSNoQqngPzYVYeHEImQlX5NfI+Tp FRsBytUaVihjM56Zlpcn9L2zMH4FoEoj X-Received: by 2002:aa7:848b:: with SMTP id u11mr23558941pfn.76.1584966694093; Mon, 23 Mar 2020 05:31:34 -0700 (PDT) Received: from localhost.localdomain ([103.59.133.81]) by smtp.googlemail.com with ESMTPSA id 144sm3590131pgd.29.2020.03.23.05.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 05:31:33 -0700 (PDT) From: Manivannan Sadhasivam To: gregkh@linuxfoundation.org, davem@davemloft.net Cc: smohanad@codeaurora.org, jhugo@codeaurora.org, kvalo@codeaurora.org, bjorn.andersson@linaro.org, hemantk@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam , netdev@vger.kernel.org Subject: [PATCH v2 6/7] net: qrtr: Add MHI transport layer Date: Mon, 23 Mar 2020 18:01:01 +0530 Message-Id: <20200323123102.13992-7-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200323123102.13992-1-manivannan.sadhasivam@linaro.org> References: <20200323123102.13992-1-manivannan.sadhasivam@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org MHI is the transport layer used for communicating to the external modems. Hence, this commit adds MHI transport layer support to QRTR for transferring the QMI messages over IPC Router. Cc: "David S. Miller" Cc: netdev@vger.kernel.org Signed-off-by: Manivannan Sadhasivam --- net/qrtr/Kconfig | 7 ++ net/qrtr/Makefile | 2 + net/qrtr/mhi.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+) create mode 100644 net/qrtr/mhi.c diff --git a/net/qrtr/Kconfig b/net/qrtr/Kconfig index 63f89cc6e82c..8eb876471564 100644 --- a/net/qrtr/Kconfig +++ b/net/qrtr/Kconfig @@ -29,4 +29,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 diff --git a/net/qrtr/Makefile b/net/qrtr/Makefile index 1c6d6c120fb7..3dc0a7c9d455 100644 --- a/net/qrtr/Makefile +++ b/net/qrtr/Makefile @@ -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 diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c new file mode 100644 index 000000000000..90af208f34c1 --- /dev/null +++ b/net/qrtr/mhi.c @@ -0,0 +1,208 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. + */ + +#include +#include +#include +#include +#include + +#include "qrtr.h" + +struct qrtr_mhi_dev { + struct qrtr_endpoint ep; + struct mhi_device *mhi_dev; + struct device *dev; + spinlock_t ul_lock; /* lock to protect ul_pkts */ + struct list_head ul_pkts; + atomic_t in_reset; +}; + +struct qrtr_mhi_pkt { + struct list_head node; + struct sk_buff *skb; + struct kref refcount; + struct completion done; +}; + +static void qrtr_mhi_pkt_release(struct kref *ref) +{ + struct qrtr_mhi_pkt *pkt = container_of(ref, struct qrtr_mhi_pkt, + refcount); + struct sock *sk = pkt->skb->sk; + + consume_skb(pkt->skb); + if (sk) + sock_put(sk); + + kfree(pkt); +} + +/* 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 qrtr_mhi_dev *qdev = dev_get_drvdata(&mhi_dev->dev); + struct qrtr_mhi_pkt *pkt; + unsigned long flags; + + spin_lock_irqsave(&qdev->ul_lock, flags); + pkt = list_first_entry(&qdev->ul_pkts, struct qrtr_mhi_pkt, node); + list_del(&pkt->node); + complete_all(&pkt->done); + + kref_put(&pkt->refcount, qrtr_mhi_pkt_release); + spin_unlock_irqrestore(&qdev->ul_lock, flags); +} + +static void qcom_mhi_qrtr_status_callback(struct mhi_device *mhi_dev, + enum mhi_callback mhi_cb) +{ + struct qrtr_mhi_dev *qdev = dev_get_drvdata(&mhi_dev->dev); + struct qrtr_mhi_pkt *pkt; + unsigned long flags; + + if (mhi_cb != MHI_CB_FATAL_ERROR) + return; + + atomic_inc(&qdev->in_reset); + spin_lock_irqsave(&qdev->ul_lock, flags); + list_for_each_entry(pkt, &qdev->ul_pkts, node) + complete_all(&pkt->done); + spin_unlock_irqrestore(&qdev->ul_lock, flags); +} + +/* 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); + struct qrtr_mhi_pkt *pkt; + int rc; + + rc = skb_linearize(skb); + if (rc) { + kfree_skb(skb); + return rc; + } + + pkt = kzalloc(sizeof(*pkt), GFP_KERNEL); + if (!pkt) { + kfree_skb(skb); + return -ENOMEM; + } + + init_completion(&pkt->done); + kref_init(&pkt->refcount); + kref_get(&pkt->refcount); + pkt->skb = skb; + + spin_lock_bh(&qdev->ul_lock); + list_add_tail(&pkt->node, &qdev->ul_pkts); + rc = mhi_queue_skb(qdev->mhi_dev, DMA_TO_DEVICE, skb, skb->len, + MHI_EOT); + if (rc) { + list_del(&pkt->node); + /* Reference count needs to be dropped 2 times */ + kref_put(&pkt->refcount, qrtr_mhi_pkt_release); + kref_put(&pkt->refcount, qrtr_mhi_pkt_release); + kfree_skb(skb); + spin_unlock_bh(&qdev->ul_lock); + return rc; + } + + spin_unlock_bh(&qdev->ul_lock); + if (skb->sk) + sock_hold(skb->sk); + + rc = wait_for_completion_interruptible_timeout(&pkt->done, HZ * 5); + if (atomic_read(&qdev->in_reset)) + rc = -ECONNRESET; + else if (rc == 0) + rc = -ETIMEDOUT; + else if (rc > 0) + rc = 0; + + kref_put(&pkt->refcount, qrtr_mhi_pkt_release); + + return rc; +} + +static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev, + const struct mhi_device_id *id) +{ + struct qrtr_mhi_dev *qdev; + u32 net_id; + 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; + atomic_set(&qdev->in_reset, 0); + + net_id = QRTR_EP_NID_AUTO; + + INIT_LIST_HEAD(&qdev->ul_pkts); + spin_lock_init(&qdev->ul_lock); + + dev_set_drvdata(&mhi_dev->dev, qdev); + rc = qrtr_endpoint_register(&qdev->ep, net_id); + 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, + .status_cb = qcom_mhi_qrtr_status_callback, + .id_table = qcom_mhi_qrtr_id_table, + .driver = { + .name = "qcom_mhi_qrtr", + }, +}; + +module_mhi_driver(qcom_mhi_qrtr_driver); + +MODULE_DESCRIPTION("Qualcomm IPC-Router MHI interface driver"); +MODULE_LICENSE("GPL v2"); -- 2.17.1