From patchwork Tue Feb 21 15:56:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarannya S X-Patchwork-Id: 13148148 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAB4BC61DA3 for ; Tue, 21 Feb 2023 15:57:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233461AbjBUP5S (ORCPT ); Tue, 21 Feb 2023 10:57:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233939AbjBUP5R (ORCPT ); Tue, 21 Feb 2023 10:57:17 -0500 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4EA52BEC8; Tue, 21 Feb 2023 07:57:05 -0800 (PST) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31LEddpv005603; Tue, 21 Feb 2023 15:56:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=II7QEe3Jghj7espYx8lU9xmpQ9Y227R7oAzE/Y6HPWM=; b=LHsroleG4NiqedryaM2L7/4DqPecg6mBpchh0dWFECqu18vlNCnG1kpOvnPKE8ztgg8k To+JWlQw81e4v0c7C1w33EVT6II29MSbaDgdKdwyo8eKMC6xoSlxbGKzy1DTwU9jtbmy J7N9gDJ0Y5t7Ixly9PB7ZY7uDonqoyJGgn4nCdY/SFpXr2cgyaEfOMdC086bCc550tGq P+WOOoIG5RCx2fsEgx8FniyJ88U3J2SQoNdZlV/B0AsrQswo6fJ8gLjo2hD696qwMOSH jSEtA0UED4CC97/G0NGQy9smL4g1phSuF2Yr+L7vZ6DtlIHuE4rOZLjDKSqyx9wC/iWY mQ== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3ntpw9qwwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Feb 2023 15:56:59 +0000 Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 31LFuwDS020833 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Feb 2023 15:56:58 GMT Received: from sarannya-linux.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 21 Feb 2023 07:56:54 -0800 From: Sarannya S To: , , , , CC: , , , Sarannya S , Deepak Kumar Singh , Bjorn Andersson Subject: [PATCH V5 3/3] rpmsg: char: Add TIOCMGET/TIOCMSET ioctl support Date: Tue, 21 Feb 2023 21:26:02 +0530 Message-ID: <1676994962-18206-4-git-send-email-quic_sarannya@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1676994962-18206-1-git-send-email-quic_sarannya@quicinc.com> References: <1676994962-18206-1-git-send-email-quic_sarannya@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: 4RazZ8fbVFC4BXzYBgMriv2cacV9YZ0W X-Proofpoint-GUID: 4RazZ8fbVFC4BXzYBgMriv2cacV9YZ0W X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-21_08,2023-02-20_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=931 clxscore=1015 spamscore=0 adultscore=0 impostorscore=0 phishscore=0 mlxscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302210132 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Add TICOMGET and TIOCMSET ioctl support for rpmsg char device nodes to get/set the low level transport signals. Signed-off-by: Chris Lew Signed-off-by: Deepak Kumar Singh Signed-off-by: Sarannya S --- drivers/rpmsg/rpmsg_char.c | 60 +++++++++++++++++++++++++++++++++++++++------- include/uapi/linux/rpmsg.h | 11 +++++++++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index 3e0b8f3..fdcb4ff 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -68,6 +69,8 @@ struct rpmsg_eptdev { struct sk_buff_head queue; wait_queue_head_t readq; + u32 remote_signals; + bool flow_control; }; int rpmsg_chrdev_eptdev_destroy(struct device *dev, void *data) @@ -109,7 +112,22 @@ static int rpmsg_ept_cb(struct rpmsg_device *rpdev, void *buf, int len, skb_queue_tail(&eptdev->queue, skb); spin_unlock(&eptdev->queue_lock); - /* wake up any blocking processes, waiting for new data */ + wake_up_interruptible(&eptdev->readq); + + return 0; +} + +static int rpmsg_ept_flow_cb(struct rpmsg_device *rpdev, void *priv, bool enable) +{ + struct rpmsg_eptdev *eptdev = priv; + + if (enable) + eptdev->remote_signals = RPMSG_FLOW_CONTROL_ON; + else + eptdev->remote_signals = 0; + + eptdev->flow_control = true; + wake_up_interruptible(&eptdev->readq); return 0; @@ -146,6 +164,7 @@ static int rpmsg_eptdev_open(struct inode *inode, struct file *filp) return -EINVAL; } + ept->flow_cb = rpmsg_ept_flow_cb; eptdev->ept = ept; filp->private_data = eptdev; mutex_unlock(&eptdev->ept_lock); @@ -166,6 +185,7 @@ static int rpmsg_eptdev_release(struct inode *inode, struct file *filp) eptdev->ept = NULL; } mutex_unlock(&eptdev->ept_lock); + eptdev->flow_control = false; /* Discard all SKBs */ skb_queue_purge(&eptdev->queue); @@ -279,6 +299,9 @@ static __poll_t rpmsg_eptdev_poll(struct file *filp, poll_table *wait) if (!skb_queue_empty(&eptdev->queue)) mask |= EPOLLIN | EPOLLRDNORM; + if (eptdev->flow_control) + mask |= EPOLLPRI; + mask |= rpmsg_poll(eptdev->ept, filp, wait); return mask; @@ -289,14 +312,35 @@ static long rpmsg_eptdev_ioctl(struct file *fp, unsigned int cmd, { struct rpmsg_eptdev *eptdev = fp->private_data; - if (cmd != RPMSG_DESTROY_EPT_IOCTL) - return -EINVAL; - - /* Don't allow to destroy a default endpoint. */ - if (eptdev->default_ept) - return -EINVAL; + bool set; + u32 val; + int ret; + + switch (cmd) { + case RPMSG_GET_SIGNAL_IOCTL: + eptdev->flow_control = false; + ret = put_user(eptdev->remote_signals, (int __user *)arg); + break; + case RPMSG_SET_SIGNAL_IOCTL: + ret = get_user(val, (int __user *)arg); + if (ret) + break; + set = (val & RPMSG_FLOW_CONTROL_ON) ? true : false; + ret = rpmsg_set_flow_control(eptdev->ept, set); + break; + case RPMSG_DESTROY_EPT_IOCTL: + /* Don't allow to destroy a default endpoint. */ + if (eptdev->default_ept) { + ret = -EINVAL; + break; + } + ret = rpmsg_chrdev_eptdev_destroy(&eptdev->dev, NULL); + break; + default: + ret = -EINVAL; + } - return rpmsg_chrdev_eptdev_destroy(&eptdev->dev, NULL); + return ret; } static const struct file_operations rpmsg_eptdev_fops = { diff --git a/include/uapi/linux/rpmsg.h b/include/uapi/linux/rpmsg.h index 1637e68..e9aa6b9 100644 --- a/include/uapi/linux/rpmsg.h +++ b/include/uapi/linux/rpmsg.h @@ -10,6 +10,7 @@ #include #define RPMSG_ADDR_ANY 0xFFFFFFFF +#define RPMSG_FLOW_CONTROL_ON 0x001 /** * struct rpmsg_endpoint_info - endpoint info representation @@ -43,4 +44,14 @@ struct rpmsg_endpoint_info { */ #define RPMSG_RELEASE_DEV_IOCTL _IOW(0xb5, 0x4, struct rpmsg_endpoint_info) +/** + * Get the remote rpmsg char device's flow control signal. + */ +#define RPMSG_GET_SIGNAL_IOCTL _IOW(0xb5, 0x5, struct rpmsg_endpoint_info) + +/** + * Set the flow control for the local rpmsg char device. + */ +#define RPMSG_SET_SIGNAL_IOCTL _IOW(0xb5, 0x6, struct rpmsg_endpoint_info) + #endif