From patchwork Mon Apr 27 07:58:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 11511395 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A612292A for ; Mon, 27 Apr 2020 07:58:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8903D2098B for ; Mon, 27 Apr 2020 07:58:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="yXhjLF63" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726718AbgD0H6w (ORCPT ); Mon, 27 Apr 2020 03:58:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726507AbgD0H6v (ORCPT ); Mon, 27 Apr 2020 03:58:51 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B1A8C061A10 for ; Mon, 27 Apr 2020 00:58:51 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id t7so781445plr.0 for ; Mon, 27 Apr 2020 00:58:51 -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=/86LCZpkdCCI2aQCkzyWwEuy6AbVAj1IJKzL58DHDfQ=; b=yXhjLF63xzunAobd/XvUojuDkxfYHrIxbF0Jm4orkjBrwAw36qjEQVMfCvnQCOdkei AAn7G/mKCudsL5FhWaoqvf4tlBdxeWHIaFIasQA7rOVNVjbA3AJbfblEIN5IAR89nILF aPDRfLVY47Il9oiRJvM0X+p95Wb5xW51KZvuBIN3L/aikcbSuiMfCF8qrvaWyLDtl0jg t2u+1XVhPrBlflpve+cfAZ7Z2rYnEt5Gy7ofk+/ydKoP1DbASVYUKu9ZiZQdxYH4W1fE zvH9ZBVRIixLamt+C8sl4qExv3BXC1UbyVfPG6MSyUpEvKDZAM6VfF5mBrd2iPV3sg3b iSrQ== 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=/86LCZpkdCCI2aQCkzyWwEuy6AbVAj1IJKzL58DHDfQ=; b=b8lxlpQreBEm/bFcLNzJbgALvLjsRwtdaDm0gCkwamiGgIaT2HU7DMvPrNFqTTA0fK JmeUwoVHdveZvwxwDOzxx7qy0iujlkRfkBHmOFnuqfUxR2z2LVDx7NT/Curt1DXrNj3k DmI3FK9OC369EqXxu9NmNiR2/+lrrqffH5AkCRGwMRCpQqDAhsP+RR6Ai+3hEytzQ0Or BL4HDSU440LfVqDgZARGoXAC13H84ebRDxWHmYbnVQsTU1R7kLBG6lAXE6s1WbH5gkhe V1u40gjWCxInVgouC1QIbh42o81fORLf8+Y5WjydlCs6L3+TReno+mF4KDjaRfLVKjEz gF/w== X-Gm-Message-State: AGi0Pub5D76lsvllbYgm6eHvaFtp/PNSgT4MwXW9is9XkBj6H4VNyY8g 82z+uEOXxUYrC3YhQpPD/cGd X-Google-Smtp-Source: APiQypLM262f7ZIbLqNkWXm5Lqjv+SMpPIU6Cw8zioTr7QgWZp/l4Q8sx14fEBQo0ESZ5NOWyzHWpg== X-Received: by 2002:a17:90a:17ed:: with SMTP id q100mr23094930pja.80.1587974330931; Mon, 27 Apr 2020 00:58:50 -0700 (PDT) Received: from localhost.localdomain ([2409:4072:996:8534:f925:aed4:6e41:e1dd]) by smtp.gmail.com with ESMTPSA id a12sm11621190pfr.28.2020.04.27.00.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 00:58:50 -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, clew@codeaurora.org, Manivannan Sadhasivam Subject: [PATCH v3 1/3] bus: mhi: core: Add support for MHI suspend and resume Date: Mon, 27 Apr 2020 13:28:27 +0530 Message-Id: <20200427075829.9304-2-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200427075829.9304-1-manivannan.sadhasivam@linaro.org> References: <20200427075829.9304-1-manivannan.sadhasivam@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for MHI suspend and resume states. While at it, the mhi_notify() function needs to be exported as well. Signed-off-by: Manivannan Sadhasivam --- drivers/bus/mhi/core/main.c | 3 +- drivers/bus/mhi/core/pm.c | 143 ++++++++++++++++++++++++++++++++++++ include/linux/mhi.h | 19 +++++ 3 files changed, 164 insertions(+), 1 deletion(-) diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c index eb4256b81406..3e9aa3b2da77 100644 --- a/drivers/bus/mhi/core/main.c +++ b/drivers/bus/mhi/core/main.c @@ -267,7 +267,7 @@ int mhi_destroy_device(struct device *dev, void *data) return 0; } -static void mhi_notify(struct mhi_device *mhi_dev, enum mhi_callback cb_reason) +void mhi_notify(struct mhi_device *mhi_dev, enum mhi_callback cb_reason) { struct mhi_driver *mhi_drv; @@ -279,6 +279,7 @@ static void mhi_notify(struct mhi_device *mhi_dev, enum mhi_callback cb_reason) if (mhi_drv->status_cb) mhi_drv->status_cb(mhi_dev, cb_reason); } +EXPORT_SYMBOL_GPL(mhi_notify); /* Bind MHI channels to MHI devices */ void mhi_create_devices(struct mhi_controller *mhi_cntrl) diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c index 52690cb5c89c..3529419d076b 100644 --- a/drivers/bus/mhi/core/pm.c +++ b/drivers/bus/mhi/core/pm.c @@ -669,6 +669,149 @@ void mhi_pm_st_worker(struct work_struct *work) } } +int mhi_pm_suspend(struct mhi_controller *mhi_cntrl) +{ + struct mhi_chan *itr, *tmp; + struct device *dev = &mhi_cntrl->mhi_dev->dev; + enum mhi_pm_state new_state; + int ret; + + if (mhi_cntrl->pm_state == MHI_PM_DISABLE) + return -EINVAL; + + if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) + return -EIO; + + /* Return busy if there are any pending resources */ + if (atomic_read(&mhi_cntrl->dev_wake)) + return -EBUSY; + + /* Take MHI out of M2 state */ + read_lock_bh(&mhi_cntrl->pm_lock); + mhi_cntrl->wake_get(mhi_cntrl, false); + read_unlock_bh(&mhi_cntrl->pm_lock); + + ret = wait_event_timeout(mhi_cntrl->state_event, + mhi_cntrl->dev_state == MHI_STATE_M0 || + mhi_cntrl->dev_state == MHI_STATE_M1 || + MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state), + msecs_to_jiffies(mhi_cntrl->timeout_ms)); + + read_lock_bh(&mhi_cntrl->pm_lock); + mhi_cntrl->wake_put(mhi_cntrl, false); + read_unlock_bh(&mhi_cntrl->pm_lock); + + if (!ret || MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) { + dev_err(dev, + "Could not enter M0/M1 state"); + return -EIO; + } + + write_lock_irq(&mhi_cntrl->pm_lock); + + if (atomic_read(&mhi_cntrl->dev_wake)) { + write_unlock_irq(&mhi_cntrl->pm_lock); + return -EBUSY; + } + + dev_info(dev, "Allowing M3 transition\n"); + new_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_M3_ENTER); + if (new_state != MHI_PM_M3_ENTER) { + write_unlock_irq(&mhi_cntrl->pm_lock); + dev_err(dev, + "Error setting to PM state: %s from: %s\n", + to_mhi_pm_state_str(MHI_PM_M3_ENTER), + to_mhi_pm_state_str(mhi_cntrl->pm_state)); + return -EIO; + } + + /* Set MHI to M3 and wait for completion */ + mhi_set_mhi_state(mhi_cntrl, MHI_STATE_M3); + write_unlock_irq(&mhi_cntrl->pm_lock); + dev_info(dev, "Wait for M3 completion\n"); + + ret = wait_event_timeout(mhi_cntrl->state_event, + mhi_cntrl->dev_state == MHI_STATE_M3 || + MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state), + msecs_to_jiffies(mhi_cntrl->timeout_ms)); + + if (!ret || MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) { + dev_err(dev, + "Did not enter M3 state, MHI state: %s, PM state: %s\n", + TO_MHI_STATE_STR(mhi_cntrl->dev_state), + to_mhi_pm_state_str(mhi_cntrl->pm_state)); + return -EIO; + } + + /* Notify clients about entering LPM */ + list_for_each_entry_safe(itr, tmp, &mhi_cntrl->lpm_chans, node) { + mutex_lock(&itr->mutex); + if (itr->mhi_dev) + mhi_notify(itr->mhi_dev, MHI_CB_LPM_ENTER); + mutex_unlock(&itr->mutex); + } + + return 0; +} +EXPORT_SYMBOL_GPL(mhi_pm_suspend); + +int mhi_pm_resume(struct mhi_controller *mhi_cntrl) +{ + struct mhi_chan *itr, *tmp; + struct device *dev = &mhi_cntrl->mhi_dev->dev; + enum mhi_pm_state cur_state; + int ret; + + dev_info(dev, "Entered with PM state: %s, MHI state: %s\n", + to_mhi_pm_state_str(mhi_cntrl->pm_state), + TO_MHI_STATE_STR(mhi_cntrl->dev_state)); + + if (mhi_cntrl->pm_state == MHI_PM_DISABLE) + return 0; + + if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) + return -EIO; + + /* Notify clients about exiting LPM */ + list_for_each_entry_safe(itr, tmp, &mhi_cntrl->lpm_chans, node) { + mutex_lock(&itr->mutex); + if (itr->mhi_dev) + mhi_notify(itr->mhi_dev, MHI_CB_LPM_EXIT); + mutex_unlock(&itr->mutex); + } + + write_lock_irq(&mhi_cntrl->pm_lock); + cur_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_M3_EXIT); + if (cur_state != MHI_PM_M3_EXIT) { + write_unlock_irq(&mhi_cntrl->pm_lock); + dev_info(dev, + "Error setting to PM state: %s from: %s\n", + to_mhi_pm_state_str(MHI_PM_M3_EXIT), + to_mhi_pm_state_str(mhi_cntrl->pm_state)); + return -EIO; + } + + /* Set MHI to M0 and wait for completion */ + mhi_set_mhi_state(mhi_cntrl, MHI_STATE_M0); + write_unlock_irq(&mhi_cntrl->pm_lock); + + ret = wait_event_timeout(mhi_cntrl->state_event, + mhi_cntrl->dev_state == MHI_STATE_M0 || + MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state), + msecs_to_jiffies(mhi_cntrl->timeout_ms)); + + if (!ret || MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) { + dev_err(dev, + "Did not enter M0 state, MHI state: %s, PM state: %s\n", + TO_MHI_STATE_STR(mhi_cntrl->dev_state), + to_mhi_pm_state_str(mhi_cntrl->pm_state)); + return -EIO; + } + + return 0; +} +EXPORT_SYMBOL_GPL(mhi_pm_resume); + int __mhi_device_get_sync(struct mhi_controller *mhi_cntrl) { int ret; diff --git a/include/linux/mhi.h b/include/linux/mhi.h index ad1996001965..a4288f4d656f 100644 --- a/include/linux/mhi.h +++ b/include/linux/mhi.h @@ -568,6 +568,13 @@ void mhi_driver_unregister(struct mhi_driver *mhi_drv); void mhi_set_mhi_state(struct mhi_controller *mhi_cntrl, enum mhi_state state); +/** + * mhi_notify - Notify the MHI client driver about client device status + * @mhi_dev: MHI device instance + * @cb_reason: MHI callback reason + */ +void mhi_notify(struct mhi_device *mhi_dev, enum mhi_callback cb_reason); + /** * mhi_prepare_for_power_up - Do pre-initialization before power up. * This is optional, call this before power up if @@ -604,6 +611,18 @@ void mhi_power_down(struct mhi_controller *mhi_cntrl, bool graceful); */ void mhi_unprepare_after_power_down(struct mhi_controller *mhi_cntrl); +/** + * mhi_pm_suspend - Move MHI into a suspended state + * @mhi_cntrl: MHI controller + */ +int mhi_pm_suspend(struct mhi_controller *mhi_cntrl); + +/** + * mhi_pm_resume - Resume MHI from suspended state + * @mhi_cntrl: MHI controller + */ +int mhi_pm_resume(struct mhi_controller *mhi_cntrl); + /** * mhi_download_rddm_img - Download ramdump image from device for * debugging purpose. From patchwork Mon Apr 27 07:58:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 11511397 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C7D181 for ; Mon, 27 Apr 2020 07:58:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73E2A2098B for ; Mon, 27 Apr 2020 07:58:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BjPxdclP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726747AbgD0H65 (ORCPT ); Mon, 27 Apr 2020 03:58:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726496AbgD0H65 (ORCPT ); Mon, 27 Apr 2020 03:58:57 -0400 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EFD8C061A41 for ; Mon, 27 Apr 2020 00:58:57 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id w65so8605012pfc.12 for ; Mon, 27 Apr 2020 00:58:57 -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=xcHdaCmrLhIw6aB1Czu9xlgxKSjDdjAffSsptJ+4kko=; b=BjPxdclPE5yBD+AFDV6AI+v74mtjg/VzYHIM5gWxe+flvC4LiGEN7ib06Tis1/HOgA s8gjoFOf8vuRpghoU6CdhYp0VtzztLoBkF8qV/rRX7oDOmKzveuRNvS4TCqR1Nn0luSO wyZEDCLcIkSUtX9Dwun5kvsZYLJoAHPgKBKqGCj7LKdaxNBuGyFeU6m7w2uikEjqdZga fgOgwXRzJu/KRwpKgnvH0hB9XUQc3q60hhpNFmT25j7QIa1bNJzjGqf8OWji10XWLJWz Qj0p7PmkOnA2F2krV3GKhkTmvyzbV6Gks1HoH/2J8A9mX5bdBLSgKFoD9ov4ERFGt/kD oPeQ== 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=xcHdaCmrLhIw6aB1Czu9xlgxKSjDdjAffSsptJ+4kko=; b=XHRTc0Y4IuzhLe2Im2Ffy9EEAQrZYtqSiytxoFRW9mOJg7zBJRTkRG2C8Lpfy7IIVt gdyrKZoR9/GojDJQLa9LvwnLRQFK+ta6FZV19wcOaLrchxhklPHdc51HcbYzLY8MzbTr Y1S1mEzL1YEhFrFzpVhdkznY+EpR6roAB0UMjWbpLuM817N8l8T5xW080cAe7nHapzHx MfRCabNfk9Sx6dNi9jhc3LqGU4uHYPXm/yL0t5FZNVjSwGb5a6W0vrFytRQYe5xnhRTH L5fhwjFuCNK6AbFBkE1RK3xWhm34Qw9ddqfLG4bJ2/gns968u+IAUrbf9ehA5BtrFR3k esiQ== X-Gm-Message-State: AGi0Pua8uJ+HvBcssT6eCONS+u6HDqEwUtLF3A+sdig6kGB5vqDjwQLz LXm1k/StV5WCa1gvSoDdeC9c X-Google-Smtp-Source: APiQypLiZQmwCZ6NFUkwm8npi3INfcKC8BTlsG0+R8JkRdM+HmiZ6Y21b8zebwdPLbJakdqMWp0Ayw== X-Received: by 2002:aa7:9093:: with SMTP id i19mr21982682pfa.152.1587974336734; Mon, 27 Apr 2020 00:58:56 -0700 (PDT) Received: from localhost.localdomain ([2409:4072:996:8534:f925:aed4:6e41:e1dd]) by smtp.gmail.com with ESMTPSA id a12sm11621190pfr.28.2020.04.27.00.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 00:58:56 -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, clew@codeaurora.org, Manivannan Sadhasivam , netdev@vger.kernel.org Subject: [PATCH v3 2/3] net: qrtr: Add MHI transport layer Date: Mon, 27 Apr 2020 13:28:28 +0530 Message-Id: <20200427075829.9304-3-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200427075829.9304-1-manivannan.sadhasivam@linaro.org> References: <20200427075829.9304-1-manivannan.sadhasivam@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 Reviewed-by: Bjorn Andersson Signed-off-by: Manivannan Sadhasivam --- net/qrtr/Kconfig | 7 +++ net/qrtr/Makefile | 2 + net/qrtr/mhi.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 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 32d4e923925d..1b1411d158a7 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..2a2abf5b070d --- /dev/null +++ b/net/qrtr/mhi.c @@ -0,0 +1,127 @@ +// 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; +}; + +/* 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 = (struct sk_buff *)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 "); +MODULE_AUTHOR("Manivannan Sadhasivam "); +MODULE_DESCRIPTION("Qualcomm IPC-Router MHI interface driver"); +MODULE_LICENSE("GPL v2"); From patchwork Mon Apr 27 07:58:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 11511399 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6BC4492A for ; Mon, 27 Apr 2020 07:59:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 533DE2098B for ; Mon, 27 Apr 2020 07:59:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="j1MoGpGO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726780AbgD0H7E (ORCPT ); Mon, 27 Apr 2020 03:59:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726589AbgD0H7D (ORCPT ); Mon, 27 Apr 2020 03:59:03 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C41A8C061A0F for ; Mon, 27 Apr 2020 00:59:03 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id d184so8631372pfd.4 for ; Mon, 27 Apr 2020 00:59:03 -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=jPuAXHpqrNAT+U03Z2D0D9d6MExECUerQyolxFR+Rtk=; b=j1MoGpGODY0G+y0YAjbilr/Dm5aQfXd9MCiY/FcdZcdVBByNPe2LcKMDjoZJQdqpJC eEodDfBogAmd+rBU/dgf3nJ5zdJrMNuTJqhBtS/iSgl4HpvmMJzFaQO4rB71uw+HMlA4 uqSWAKRcw0tNlQezUH2GxNshYDP1eORsMQgJFQoznbI54J+owrXIE3h3wxvfxFL03l+o vb832Zd/4KmQdiSf8i9drvrBK2/4dA1yTi6T6oMOuvxvlwIbmr/whiz1BBs9VfuHT9fW jBGBUJ4aRvv+AS1iu6e4rxDRNFuIcAz58C746IMS8TRtDLRbt2D3Ta8b+VuPbVZS6LDT DKYQ== 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=jPuAXHpqrNAT+U03Z2D0D9d6MExECUerQyolxFR+Rtk=; b=RVhpvNEWtH/cBnfOBjbzaEZBkkWxfdvWeoYrFivAKcnErIdbVVVuG6FRBhttSe+jRj n1LcoS04r8xZh0alaN+zhAawoui8MRY3J29Du5MlHuBK2rpgeD3f1QHYe6IrkV2sgZ+7 8uTr7uLGvhh6z48w5XG4jODDGndklFhtWJypgtgK7a983iL8qex8JhyrK4axNrq1KdVg Cp/Tx3/IM4rWTSMzWyI6+csF2o7+rGxkGWArjyXFBdWBOWexMpqlH1xkIaBLH4TY6ieD TljVSkeL+qLA2PPEgzy6K7swOsmoVDmgqho13YeU6+aTzLU7bewgwU86gyZXIleYXKx4 a+0g== X-Gm-Message-State: AGi0PubS9t1YbmTAEMhfaExI9CNlVW1vS79bzqrS43rILkNuGu5S4LS6 ca5Sesp6Aj4pKozYKcwQBZ8L X-Google-Smtp-Source: APiQypLZpxltxsTka+7sS/LyifM/nE79AgNzoR4gAcDIxipkFRxh/hIm6cR1gUqyoxtd8NkbZ/xIjQ== X-Received: by 2002:a63:ec0b:: with SMTP id j11mr21238091pgh.376.1587974343260; Mon, 27 Apr 2020 00:59:03 -0700 (PDT) Received: from localhost.localdomain ([2409:4072:996:8534:f925:aed4:6e41:e1dd]) by smtp.gmail.com with ESMTPSA id a12sm11621190pfr.28.2020.04.27.00.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 00:59:02 -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, clew@codeaurora.org, Manivannan Sadhasivam , netdev@vger.kernel.org Subject: [PATCH v3 3/3] net: qrtr: Do not depend on ARCH_QCOM Date: Mon, 27 Apr 2020 13:28:29 +0530 Message-Id: <20200427075829.9304-4-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200427075829.9304-1-manivannan.sadhasivam@linaro.org> References: <20200427075829.9304-1-manivannan.sadhasivam@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org IPC Router protocol is also used by external modems for exchanging the QMI messages. Hence, it doesn't always depend on Qualcomm platforms. One such instance is the QCA6390 WLAN device connected to x86 machine. Cc: "David S. Miller" Cc: netdev@vger.kernel.org Reviewed-by: Bjorn Andersson Signed-off-by: Manivannan Sadhasivam --- net/qrtr/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/net/qrtr/Kconfig b/net/qrtr/Kconfig index 8eb876471564..f362ca316015 100644 --- a/net/qrtr/Kconfig +++ b/net/qrtr/Kconfig @@ -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