Received: by 2002:a05:6358:53a8:b0:117:f937:c515 with SMTP id z40csp5098372rwe; Tue, 18 Apr 2023 01:55:16 -0700 (PDT) X-Google-Smtp-Source: AKy350Zrd+zoXxc2mT3Ae59MjZjwTl8F2Z+v2tPLZ4g4HSx7o60L+Q4HZwC5/zqBIK6Cr189Ypbx X-Received: by 2002:a05:6a20:8e1a:b0:ef:d626:754a with SMTP id y26-20020a056a208e1a00b000efd626754amr7412416pzj.23.1681808116310; Tue, 18 Apr 2023 01:55:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681808116; cv=none; d=google.com; s=arc-20160816; b=e7e9YvWUYdE7Sn+t5TlmmSbL/HLhE0LaBPCPRkG/lashtd93dYkld5xS3CMCydQ4gB KyYj883uZDgpOXZj4+o/whXykeXp/+GsdavsKtMtww3FWcEQptvATXxNtnScSbPvQM7k flGKuPm/wLTR8HX1xR88d1b+N6kMsLgcGOaY2mDRq4yl0Orrz431x1hpIHWJ6Zv5yZ/p McVJ1EErwNCjtGlDCZtjQGjsgQmAfYgRb7pU5ZUF0k7x/EbewvpL4DPezhyFtFdXYh5Y W4PVKo3mzumOriXgMKalSLMizEMM6EvIy8cvb17eUeDUfKxVhL+6RAt0pYOD0Jd4GePN uGTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=3w6JXwBbVqi9zZS7sydLSxu1zUiujeIr47v0XhW6Nmk=; b=L7s3Cu6E5Yqt/+KXaBCYTf290EHYwyBTk84ZQkcYFcJosR6rMbQ/uCg1i0J2ByMyuC Qy8vjMmnrgXiTMRTDQGyHoc7kolgiUKYgrNuIuE3Aj2P8oxYXJ8B8g/y5CDIGguMyz5j KN1UIH5hFY2QOzbz45rFU7FIM+mW+rqTFXxpLmoSupNlaUm10k/5N96GhfQL6f53Vw+y Hc4EEM5YHPzXrfHjPMYspZNSjMCDRZPIHcAykhDxDHtjy3FUh9/NqyeXx6Rekc3J35SZ n8fASEqaKPoVCLc0nzLRHwVZWDFHtZp1KORZSe7o1rZ7vyInpbeFmHsoYGuUQQ5M1OtX QVLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=na0zBwvi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v190-20020a6389c7000000b0051b685209d5si12186496pgd.460.2023.04.18.01.55.04; Tue, 18 Apr 2023 01:55:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=na0zBwvi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230029AbjDRIv6 (ORCPT + 99 others); Tue, 18 Apr 2023 04:51:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230385AbjDRIvz (ORCPT ); Tue, 18 Apr 2023 04:51:55 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 210904ED0; Tue, 18 Apr 2023 01:51:54 -0700 (PDT) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33I6w16i017455; Tue, 18 Apr 2023 08:50:21 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=3w6JXwBbVqi9zZS7sydLSxu1zUiujeIr47v0XhW6Nmk=; b=na0zBwvigzoEWiwga+Uga08GVr3e+FwcpjT1XYny8OiuGCzS5cTZiM7lMvVTLXEPwFWo 0+zpw3eC0PNrtrbb3OgWDO9/w1F0mz+OmcTowvJd0k/+Ga0Q8VT37OCSwAHO5ngw6Kxc jK9UBDnY+H2afzw9SZ4CCZ2fJ7IU4js6amwT+xmyAsgibKKNs3ZcZo1zm99UEzxL7xvn msx0yMX/4iwYkXyJh5Sc9BfVF7bhRFunbwqz7I+z95yKvG+r6wk0DUY3LRvcUu3W0XR8 ykA+ZB4Oxg5XVYdYZLp01wvlMe6QjbMxbOMhU+pDaU7DnlX5F9guV2Dh/4hCF0/m51JZ tg== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3q1h0cgun1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Apr 2023 08:50:21 +0000 Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 33I8oKwl008563 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Apr 2023 08:50:20 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.42; Tue, 18 Apr 2023 01:50:16 -0700 From: Sarannya S To: , , , , CC: , , , Deepak Kumar Singh , Sarannya S , "Bjorn Andersson" Subject: [PATCH V5 3/3] rpmsg: char: Add RPMSG GET/SET SIGNAL IOCTL support Date: Tue, 18 Apr 2023 14:18:41 +0530 Message-ID: <1681807721-32343-4-git-send-email-quic_sarannya@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1681807721-32343-1-git-send-email-quic_sarannya@quicinc.com> References: <1681807721-32343-1-git-send-email-quic_sarannya@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) 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: XIrBHsoxM0bQalJhdoNEM0bQtwHTgfch X-Proofpoint-GUID: XIrBHsoxM0bQalJhdoNEM0bQtwHTgfch X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-18_04,2023-04-17_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 clxscore=1015 suspectscore=0 impostorscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304180075 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Lew Add RPMSG_GET_SIGNAL_IOCTL and RPMSG_SET_SIGNAL_IOCTL 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 | 58 ++++++++++++++++++++++++++++++++++++++++------ include/linux/rpmsg.h | 15 ++++++++++++ include/uapi/linux/rpmsg.h | 12 +++++++++- 3 files changed, 77 insertions(+), 8 deletions(-) diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index a271fce..efe14f8 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) @@ -110,7 +113,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; @@ -152,6 +170,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); @@ -172,6 +191,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); @@ -285,6 +305,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; + mutex_lock(&eptdev->ept_lock); mask |= rpmsg_poll(eptdev->ept, filp, wait); mutex_unlock(&eptdev->ept_lock); @@ -297,14 +320,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; + bool set; + u32 val; + int ret; - /* Don't allow to destroy a default endpoint. */ - if (eptdev->default_ept) - return -EINVAL; + 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/linux/rpmsg.h b/include/linux/rpmsg.h index 523c98b..cc7a917 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h @@ -64,12 +64,14 @@ struct rpmsg_device { }; typedef int (*rpmsg_rx_cb_t)(struct rpmsg_device *, void *, int, void *, u32); +typedef int (*rpmsg_flowcontrol_cb_t)(struct rpmsg_device *, void *, bool); /** * struct rpmsg_endpoint - binds a local rpmsg address to its user * @rpdev: rpmsg channel device * @refcount: when this drops to zero, the ept is deallocated * @cb: rx callback handler + * @flow_cb: remote flow control callback handler * @cb_lock: must be taken before accessing/changing @cb * @addr: local rpmsg address * @priv: private data for the driver's use @@ -92,6 +94,7 @@ struct rpmsg_endpoint { struct rpmsg_device *rpdev; struct kref refcount; rpmsg_rx_cb_t cb; + rpmsg_flowcontrol_cb_t flow_cb; struct mutex cb_lock; u32 addr; void *priv; @@ -106,6 +109,7 @@ struct rpmsg_endpoint { * @probe: invoked when a matching rpmsg channel (i.e. device) is found * @remove: invoked when the rpmsg channel is removed * @callback: invoked when an inbound message is received on the channel + * @flowcontrol: invoked when remote side flow control status is received */ struct rpmsg_driver { struct device_driver drv; @@ -113,6 +117,7 @@ struct rpmsg_driver { int (*probe)(struct rpmsg_device *dev); void (*remove)(struct rpmsg_device *dev); int (*callback)(struct rpmsg_device *, void *, int, void *, u32); + int (*flowcontrol)(struct rpmsg_device *, void *, bool); }; static inline u16 rpmsg16_to_cpu(struct rpmsg_device *rpdev, __rpmsg16 val) @@ -192,6 +197,8 @@ __poll_t rpmsg_poll(struct rpmsg_endpoint *ept, struct file *filp, ssize_t rpmsg_get_mtu(struct rpmsg_endpoint *ept); +int rpmsg_set_flow_control(struct rpmsg_endpoint *ept, bool enable); + #else static inline int rpmsg_register_device_override(struct rpmsg_device *rpdev, @@ -316,6 +323,14 @@ static inline ssize_t rpmsg_get_mtu(struct rpmsg_endpoint *ept) return -ENXIO; } +static inline int rpmsg_set_flow_control(struct rpmsg_endpoint *ept, bool enable) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return -ENXIO; +} + #endif /* IS_ENABLED(CONFIG_RPMSG) */ /* use a macro to avoid include chaining to get THIS_MODULE */ diff --git a/include/uapi/linux/rpmsg.h b/include/uapi/linux/rpmsg.h index 1637e68..c549649 100644 --- a/include/uapi/linux/rpmsg.h +++ b/include/uapi/linux/rpmsg.h @@ -10,7 +10,7 @@ #include #define RPMSG_ADDR_ANY 0xFFFFFFFF - +#define RPMSG_FLOW_CONTROL_ON 0x001 /** * struct rpmsg_endpoint_info - endpoint info representation * @name: name of service @@ -43,4 +43,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 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project