From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ED6FC433E1 for ; Wed, 29 Jul 2020 19:19:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD3C72083B for ; Wed, 29 Jul 2020 19:19:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RGTII5B4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726842AbgG2TTs (ORCPT ); Wed, 29 Jul 2020 15:19:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbgG2TTs (ORCPT ); Wed, 29 Jul 2020 15:19:48 -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 F18C7C061794 for ; Wed, 29 Jul 2020 12:19:47 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id m16so12303919pls.5 for ; Wed, 29 Jul 2020 12:19:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=hlhFgZID8Hcxxuz8Ss9VTXWXuWIn0CL7cRKdM+B0M2k=; b=RGTII5B4gf5GxIRER8xyyoLSkERNUDoIgSEZO+sRriMrr4QRIQNfRPdFO0Eo31302f bJS1SECu1u4Tw9ih+hoqgv7hj+LpayrAj+gzqn88FQw8IfZb6HiOb7zO0OaB5IaGreoQ PqZqomZs7cBBsJSaLBjprVxKXicw4h/0dxedfXJK3QzTGN2qDvOtWeOZN9EJPdiIC4m2 cjYAa3aLb+CWg6dOFABBL+UqZPxPl+zT3jNyhMS02/gnvQt2wpaHISS0YHwHYSD5Cu9F 0eepeUS41vqf/9MI/SQ3W1sXPxtdVYxDE51bMW5p9a95jT2jX2B7A9Qfr2aqI06LWmG/ OpuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=hlhFgZID8Hcxxuz8Ss9VTXWXuWIn0CL7cRKdM+B0M2k=; b=r1r8cjkyVphpTyC5LqDFmoObNQgWLLLs1Ak2t4Ddg0CERlRqnUs8uOseGJYhUKi7zv EXuHtpZhSr38+KENj4YlU/QLm9U+5OR3R1Thx+PuhHUv3oU92qO3cM/tcOkxthkbL61D XTzloqNJv8Kexbn8tFpmhGcOFm80g1RIynkiWphyz8xFfhfa4I4zW4oxtEMUj436GP9O qAfnDL7w64YA89j7/SZWLGl0Cdc3fC23x9xJqHAUQF12gLF1sGCxwqIa1TTHBY90QMac OCycU7a8rTss2STv847mTFzr38TdETfbxzAbNCNRO6SMH3fzsPH/k0ot+vMZg9h7mcdf 8Uvg== X-Gm-Message-State: AOAM530+ICoNj+ecFMueEwKxr9UZSjKglO1jMoqWlbr1Fg6mXAGbMKhI B5jm+tQRmeWmj6yaC4mE/aHFYQ== X-Google-Smtp-Source: ABdhPJylFuBcrUuRwptma/OvmVYD7qq2mtLT8OOJIKrc8+VdZwCTD18ASUhisb3y/ywYUsg4ErHYAQ== X-Received: by 2002:a17:902:5985:: with SMTP id p5mr15993827pli.73.1596050387266; Wed, 29 Jul 2020 12:19:47 -0700 (PDT) Received: from builder.lan (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id y10sm3218352pff.187.2020.07.29.12.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 12:19:46 -0700 (PDT) Date: Wed, 29 Jul 2020 12:16:17 -0700 From: Bjorn Andersson To: Siddharth Gupta Cc: agross@kernel.org, ohad@wizery.com, corbet@lwn.net, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tsoni@codeaurora.org, psodagud@codeaurora.org, rishabhb@codeaurora.org, linux-doc@vger.kernel.org Subject: Re: [PATCH v5 1/2] remoteproc: Add remoteproc character device interface Message-ID: <20200729191617.GE229995@builder.lan> References: <1596044401-22083-1-git-send-email-sidgup@codeaurora.org> <1596044401-22083-2-git-send-email-sidgup@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1596044401-22083-2-git-send-email-sidgup@codeaurora.org> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org On Wed 29 Jul 10:40 PDT 2020, Siddharth Gupta wrote: > Add the character device interface into remoteproc framework. > This interface can be used in order to boot/shutdown remote > subsystems and provides a basic ioctl based interface to implement > supplementary functionality. An ioctl call is implemented to enable > the shutdown on release feature which will allow remote processors to > be shutdown when the controlling userpsace application crashes or hangs. s/userspace/userspace/ But no need to resend just because of that. > > Signed-off-by: Rishabh Bhatnagar > Signed-off-by: Siddharth Gupta Reviewed-by: Bjorn Andersson Regards, Bjorn > --- > Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + > drivers/remoteproc/Kconfig | 9 ++ > drivers/remoteproc/Makefile | 1 + > drivers/remoteproc/remoteproc_cdev.c | 124 +++++++++++++++++++++ > drivers/remoteproc/remoteproc_internal.h | 28 +++++ > include/linux/remoteproc.h | 5 + > include/uapi/linux/remoteproc_cdev.h | 37 ++++++ > 7 files changed, 205 insertions(+) > create mode 100644 drivers/remoteproc/remoteproc_cdev.c > create mode 100644 include/uapi/linux/remoteproc_cdev.h > > diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst > index 59472cd..2a19883 100644 > --- a/Documentation/userspace-api/ioctl/ioctl-number.rst > +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst > @@ -339,6 +339,7 @@ Code Seq# Include File Comments > 0xB4 00-0F linux/gpio.h > 0xB5 00-0F uapi/linux/rpmsg.h > 0xB6 all linux/fpga-dfl.h > +0xB7 all uapi/linux/remoteproc_cdev.h > 0xC0 00-0F linux/usb/iowarrior.h > 0xCA 00-0F uapi/misc/cxl.h > 0xCA 10-2F uapi/misc/ocxl.h > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > index 48315dc..c6659dfe 100644 > --- a/drivers/remoteproc/Kconfig > +++ b/drivers/remoteproc/Kconfig > @@ -14,6 +14,15 @@ config REMOTEPROC > > if REMOTEPROC > > +config REMOTEPROC_CDEV > + bool "Remoteproc character device interface" > + help > + Say y here to have a character device interface for the remoteproc > + framework. Userspace can boot/shutdown remote processors through > + this interface. > + > + It's safe to say N if you don't want to use this interface. > + > config IMX_REMOTEPROC > tristate "IMX6/7 remoteproc support" > depends on ARCH_MXC > diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile > index 4d4307d..3dfa28e 100644 > --- a/drivers/remoteproc/Makefile > +++ b/drivers/remoteproc/Makefile > @@ -10,6 +10,7 @@ remoteproc-y += remoteproc_debugfs.o > remoteproc-y += remoteproc_sysfs.o > remoteproc-y += remoteproc_virtio.o > remoteproc-y += remoteproc_elf_loader.o > +obj-$(CONFIG_REMOTEPROC_CDEV) += remoteproc_cdev.o > obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o > obj-$(CONFIG_INGENIC_VPU_RPROC) += ingenic_rproc.o > obj-$(CONFIG_MTK_SCP) += mtk_scp.o mtk_scp_ipi.o > diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c > new file mode 100644 > index 0000000..a7ac11c > --- /dev/null > +++ b/drivers/remoteproc/remoteproc_cdev.c > @@ -0,0 +1,124 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Character device interface driver for Remoteproc framework. > + * > + * Copyright (c) 2020, The Linux Foundation. All rights reserved. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "remoteproc_internal.h" > + > +#define NUM_RPROC_DEVICES 64 > +static dev_t rproc_major; > + > +static ssize_t rproc_cdev_write(struct file *filp, const char __user *buf, size_t len, loff_t *pos) > +{ > + struct rproc *rproc = container_of(filp->f_inode->i_cdev, struct rproc, cdev); > + int ret = 0; > + char cmd[10]; > + > + if (!len || len > sizeof(cmd)) > + return -EINVAL; > + > + ret = copy_from_user(cmd, buf, len); > + if (ret) > + return -EFAULT; > + > + if (!strncmp(cmd, "start", len)) { > + if (rproc->state == RPROC_RUNNING) > + return -EBUSY; > + > + ret = rproc_boot(rproc); > + } else if (!strncmp(cmd, "stop", len)) { > + if (rproc->state != RPROC_RUNNING) > + return -EINVAL; > + > + rproc_shutdown(rproc); > + } else { > + dev_err(&rproc->dev, "Unrecognized option\n"); > + ret = -EINVAL; > + } > + > + return ret ? ret : len; > +} > + > +static long rproc_device_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) > +{ > + struct rproc *rproc = container_of(filp->f_inode->i_cdev, struct rproc, cdev); > + void __user *argp = (void __user *)arg; > + int32_t param; > + > + switch (ioctl) { > + case RPROC_SET_SHUTDOWN_ON_RELEASE: > + if (copy_from_user(¶m, argp, sizeof(int32_t))) > + return -EFAULT; > + > + rproc->cdev_put_on_release = !!param; > + break; > + case RPROC_GET_SHUTDOWN_ON_RELEASE: > + param = (int32_t)rproc->cdev_put_on_release; > + if (copy_to_user(argp, ¶m, sizeof(int32_t))) > + return -EFAULT; > + > + break; > + default: > + dev_err(&rproc->dev, "Unsupported ioctl\n"); > + return -EINVAL; > + } > + > + return 0; > +} > + > +static int rproc_cdev_release(struct inode *inode, struct file *filp) > +{ > + struct rproc *rproc = container_of(inode->i_cdev, struct rproc, cdev); > + > + if (rproc->cdev_put_on_release && rproc->state == RPROC_RUNNING) > + rproc_shutdown(rproc); > + > + return 0; > +} > + > +static const struct file_operations rproc_fops = { > + .write = rproc_cdev_write, > + .unlocked_ioctl = rproc_device_ioctl, > + .compat_ioctl = compat_ptr_ioctl, > + .release = rproc_cdev_release, > +}; > + > +int rproc_char_device_add(struct rproc *rproc) > +{ > + int ret; > + > + cdev_init(&rproc->cdev, &rproc_fops); > + rproc->cdev.owner = THIS_MODULE; > + > + rproc->dev.devt = MKDEV(MAJOR(rproc_major), rproc->index); > + cdev_set_parent(&rproc->cdev, &rproc->dev.kobj); > + ret = cdev_add(&rproc->cdev, rproc->dev.devt, 1); > + if (ret < 0) > + dev_err(&rproc->dev, "Failed to add char dev for %s\n", rproc->name); > + > + return ret; > +} > + > +void rproc_char_device_remove(struct rproc *rproc) > +{ > + __unregister_chrdev(MAJOR(rproc->dev.devt), rproc->index, 1, "remoteproc"); > +} > + > +void __init rproc_init_cdev(void) > +{ > + int ret; > + > + ret = alloc_chrdev_region(&rproc_major, 0, NUM_RPROC_DEVICES, "remoteproc"); > + if (ret < 0) > + pr_err("Failed to alloc rproc_cdev region, err %d\n", ret); > +} > diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h > index cd4176b..c340028 100644 > --- a/drivers/remoteproc/remoteproc_internal.h > +++ b/drivers/remoteproc/remoteproc_internal.h > @@ -53,6 +53,34 @@ void rproc_exit_sysfs(void); > void rproc_coredump_cleanup(struct rproc *rproc); > void rproc_coredump(struct rproc *rproc); > > +#ifdef CONFIG_REMOTEPROC_CDEV > +void rproc_init_cdev(void); > +void rproc_exit_cdev(void); > +int rproc_char_device_add(struct rproc *rproc); > +void rproc_char_device_remove(struct rproc *rproc); > +#else > +static inline void rproc_init_cdev(void) > +{ > +} > + > +static inline void rproc_exit_cdev(void) > +{ > +} > + > +/* > + * The character device interface is an optional feature, if it is not enabled > + * the function should not return an error. > + */ > +static inline int rproc_char_device_add(struct rproc *rproc) > +{ > + return 0; > +} > + > +static inline void rproc_char_device_remove(struct rproc *rproc) > +{ > +} > +#endif > + > void rproc_free_vring(struct rproc_vring *rvring); > int rproc_alloc_vring(struct rproc_vdev *rvdev, int i); > > diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h > index 0e8d2ff..2fa68bf 100644 > --- a/include/linux/remoteproc.h > +++ b/include/linux/remoteproc.h > @@ -38,6 +38,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -509,6 +510,8 @@ struct rproc_dump_segment { > * @autonomous: true if an external entity has booted the remote processor > * @dump_segments: list of segments in the firmware > * @nb_vdev: number of vdev currently handled by rproc > + * @char_dev: character device of the rproc > + * @cdev_put_on_release: flag to indicate if remoteproc should be shutdown on @char_dev release > */ > struct rproc { > struct list_head node; > @@ -546,6 +549,8 @@ struct rproc { > int nb_vdev; > u8 elf_class; > u16 elf_machine; > + struct cdev cdev; > + bool cdev_put_on_release; > }; > > /** > diff --git a/include/uapi/linux/remoteproc_cdev.h b/include/uapi/linux/remoteproc_cdev.h > new file mode 100644 > index 0000000..c43768e > --- /dev/null > +++ b/include/uapi/linux/remoteproc_cdev.h > @@ -0,0 +1,37 @@ > +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ > +/* > + * IOCTLs for Remoteproc's character device interface. > + * > + * Copyright (c) 2020, The Linux Foundation. All rights reserved. > + */ > + > +#ifndef _UAPI_REMOTEPROC_CDEV_H_ > +#define _UAPI_REMOTEPROC_CDEV_H_ > + > +#include > +#include > + > +#define RPROC_MAGIC 0xB7 > + > +/* > + * The RPROC_SET_SHUTDOWN_ON_RELEASE ioctl allows to enable/disable the shutdown of a remote > + * processor automatically when the controlling userpsace closes the char device interface. > + * > + * input parameter: integer > + * 0 : disable automatic shutdown > + * other : enable automatic shutdown > + */ > +#define RPROC_SET_SHUTDOWN_ON_RELEASE _IOW(RPROC_MAGIC, 1, __s32) > + > +/* > + * The RPROC_GET_SHUTDOWN_ON_RELEASE ioctl gets information about whether the automatic shutdown of > + * a remote processor is enabled or disabled when the controlling userspace closes the char device > + * interface. > + * > + * output parameter: integer > + * 0 : automatic shutdown disable > + * other : automatic shutdown enable > + */ > +#define RPROC_GET_SHUTDOWN_ON_RELEASE _IOR(RPROC_MAGIC, 2, __s32) > + > +#endif > -- > Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2F5CC433DF for ; Wed, 29 Jul 2020 19:21:15 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A4E5C2068F for ; Wed, 29 Jul 2020 19:21:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WxVZZNsw"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RGTII5B4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A4E5C2068F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=x2R5hsvDVXF/nYp0x+WasW+GPfQxfAtejghek1QIocU=; b=WxVZZNswvsXjlWiyk5YeJhNhS EbmY3OmdE2Cud54s2Vhy2uelg/Rvqm4svcAqbqi2QdCNx0HuNk99rZByml1GUa0i5/e61yYpcRvbm h4TKJ6/8byzHhLiOf/VMcwiYOxd9NYARjXY8ji5GrhRQ3dzmJ0z70mEHiPIEVuG5W9ACAqWkyglIA TKLVYz2FS05PJFupA7Fg9t9MQBJeryFvVq7jsGEtYgF/rSLnT48uc7IJscDLUeqsXo0pSDAfbX5Cu f99OcS+tNG1GiskA2NwguViI8eTzdTSm1nV4yM47QABdk/RWn11XObQl0RMNrvrKlbEEmx3V1PI7g 7os2n/d4g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0rcJ-00059r-3k; Wed, 29 Jul 2020 19:19:55 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0rcG-000586-8V for linux-arm-kernel@lists.infradead.org; Wed, 29 Jul 2020 19:19:53 +0000 Received: by mail-pj1-x1041.google.com with SMTP id k1so2395680pjt.5 for ; Wed, 29 Jul 2020 12:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=hlhFgZID8Hcxxuz8Ss9VTXWXuWIn0CL7cRKdM+B0M2k=; b=RGTII5B4gf5GxIRER8xyyoLSkERNUDoIgSEZO+sRriMrr4QRIQNfRPdFO0Eo31302f bJS1SECu1u4Tw9ih+hoqgv7hj+LpayrAj+gzqn88FQw8IfZb6HiOb7zO0OaB5IaGreoQ PqZqomZs7cBBsJSaLBjprVxKXicw4h/0dxedfXJK3QzTGN2qDvOtWeOZN9EJPdiIC4m2 cjYAa3aLb+CWg6dOFABBL+UqZPxPl+zT3jNyhMS02/gnvQt2wpaHISS0YHwHYSD5Cu9F 0eepeUS41vqf/9MI/SQ3W1sXPxtdVYxDE51bMW5p9a95jT2jX2B7A9Qfr2aqI06LWmG/ OpuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=hlhFgZID8Hcxxuz8Ss9VTXWXuWIn0CL7cRKdM+B0M2k=; b=frStyzfVH6H3+UNrd3D+yn9DVzwSrdH1LdKGe5w/J288H2n8/myr2rF94YFO9ROpfX afq3aPPIxE+6S/AygqsmTI9f0HL9xRR7sQNhXf4MgaCqmYYSh4wUrDtDhoQoiGzZrjW3 C1Xg3vgs4eAvKfr+5soX1b6GlZdfvPC7ZeD4N1PsFwRMjLJjWIqI315Dd7+nOdznes4Q t3X6DKvLmjiqZtDdaCk+9lAJy/DWCQvh4QqdqrCOO3BrsaWhp6Mp/uIwW2PiRy54iajG ACyYPMK+BLam4UqnE7K7wmyOGtLsuIB/n5qm7Yqk+kDkxu2FfVWhrC9L2lcwvtrlEdcY 5suw== X-Gm-Message-State: AOAM5313xTPIzfF8cPyjF90oSMxFsiOXMWQUq0svLFvyOYlsITkvM3Um IrBWWm1KBlxHnPqWOqid7d+r3g== X-Google-Smtp-Source: ABdhPJylFuBcrUuRwptma/OvmVYD7qq2mtLT8OOJIKrc8+VdZwCTD18ASUhisb3y/ywYUsg4ErHYAQ== X-Received: by 2002:a17:902:5985:: with SMTP id p5mr15993827pli.73.1596050387266; Wed, 29 Jul 2020 12:19:47 -0700 (PDT) Received: from builder.lan (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id y10sm3218352pff.187.2020.07.29.12.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 12:19:46 -0700 (PDT) Date: Wed, 29 Jul 2020 12:16:17 -0700 From: Bjorn Andersson To: Siddharth Gupta Subject: Re: [PATCH v5 1/2] remoteproc: Add remoteproc character device interface Message-ID: <20200729191617.GE229995@builder.lan> References: <1596044401-22083-1-git-send-email-sidgup@codeaurora.org> <1596044401-22083-2-git-send-email-sidgup@codeaurora.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1596044401-22083-2-git-send-email-sidgup@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200729_151952_365035_402AFA13 X-CRM114-Status: GOOD ( 39.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ohad@wizery.com, tsoni@codeaurora.org, corbet@lwn.net, linux-arm-msm@vger.kernel.org, linux-doc@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, agross@kernel.org, rishabhb@codeaurora.org, psodagud@codeaurora.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed 29 Jul 10:40 PDT 2020, Siddharth Gupta wrote: > Add the character device interface into remoteproc framework. > This interface can be used in order to boot/shutdown remote > subsystems and provides a basic ioctl based interface to implement > supplementary functionality. An ioctl call is implemented to enable > the shutdown on release feature which will allow remote processors to > be shutdown when the controlling userpsace application crashes or hangs. s/userspace/userspace/ But no need to resend just because of that. > > Signed-off-by: Rishabh Bhatnagar > Signed-off-by: Siddharth Gupta Reviewed-by: Bjorn Andersson Regards, Bjorn > --- > Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + > drivers/remoteproc/Kconfig | 9 ++ > drivers/remoteproc/Makefile | 1 + > drivers/remoteproc/remoteproc_cdev.c | 124 +++++++++++++++++++++ > drivers/remoteproc/remoteproc_internal.h | 28 +++++ > include/linux/remoteproc.h | 5 + > include/uapi/linux/remoteproc_cdev.h | 37 ++++++ > 7 files changed, 205 insertions(+) > create mode 100644 drivers/remoteproc/remoteproc_cdev.c > create mode 100644 include/uapi/linux/remoteproc_cdev.h > > diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst > index 59472cd..2a19883 100644 > --- a/Documentation/userspace-api/ioctl/ioctl-number.rst > +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst > @@ -339,6 +339,7 @@ Code Seq# Include File Comments > 0xB4 00-0F linux/gpio.h > 0xB5 00-0F uapi/linux/rpmsg.h > 0xB6 all linux/fpga-dfl.h > +0xB7 all uapi/linux/remoteproc_cdev.h > 0xC0 00-0F linux/usb/iowarrior.h > 0xCA 00-0F uapi/misc/cxl.h > 0xCA 10-2F uapi/misc/ocxl.h > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > index 48315dc..c6659dfe 100644 > --- a/drivers/remoteproc/Kconfig > +++ b/drivers/remoteproc/Kconfig > @@ -14,6 +14,15 @@ config REMOTEPROC > > if REMOTEPROC > > +config REMOTEPROC_CDEV > + bool "Remoteproc character device interface" > + help > + Say y here to have a character device interface for the remoteproc > + framework. Userspace can boot/shutdown remote processors through > + this interface. > + > + It's safe to say N if you don't want to use this interface. > + > config IMX_REMOTEPROC > tristate "IMX6/7 remoteproc support" > depends on ARCH_MXC > diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile > index 4d4307d..3dfa28e 100644 > --- a/drivers/remoteproc/Makefile > +++ b/drivers/remoteproc/Makefile > @@ -10,6 +10,7 @@ remoteproc-y += remoteproc_debugfs.o > remoteproc-y += remoteproc_sysfs.o > remoteproc-y += remoteproc_virtio.o > remoteproc-y += remoteproc_elf_loader.o > +obj-$(CONFIG_REMOTEPROC_CDEV) += remoteproc_cdev.o > obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o > obj-$(CONFIG_INGENIC_VPU_RPROC) += ingenic_rproc.o > obj-$(CONFIG_MTK_SCP) += mtk_scp.o mtk_scp_ipi.o > diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c > new file mode 100644 > index 0000000..a7ac11c > --- /dev/null > +++ b/drivers/remoteproc/remoteproc_cdev.c > @@ -0,0 +1,124 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Character device interface driver for Remoteproc framework. > + * > + * Copyright (c) 2020, The Linux Foundation. All rights reserved. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "remoteproc_internal.h" > + > +#define NUM_RPROC_DEVICES 64 > +static dev_t rproc_major; > + > +static ssize_t rproc_cdev_write(struct file *filp, const char __user *buf, size_t len, loff_t *pos) > +{ > + struct rproc *rproc = container_of(filp->f_inode->i_cdev, struct rproc, cdev); > + int ret = 0; > + char cmd[10]; > + > + if (!len || len > sizeof(cmd)) > + return -EINVAL; > + > + ret = copy_from_user(cmd, buf, len); > + if (ret) > + return -EFAULT; > + > + if (!strncmp(cmd, "start", len)) { > + if (rproc->state == RPROC_RUNNING) > + return -EBUSY; > + > + ret = rproc_boot(rproc); > + } else if (!strncmp(cmd, "stop", len)) { > + if (rproc->state != RPROC_RUNNING) > + return -EINVAL; > + > + rproc_shutdown(rproc); > + } else { > + dev_err(&rproc->dev, "Unrecognized option\n"); > + ret = -EINVAL; > + } > + > + return ret ? ret : len; > +} > + > +static long rproc_device_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) > +{ > + struct rproc *rproc = container_of(filp->f_inode->i_cdev, struct rproc, cdev); > + void __user *argp = (void __user *)arg; > + int32_t param; > + > + switch (ioctl) { > + case RPROC_SET_SHUTDOWN_ON_RELEASE: > + if (copy_from_user(¶m, argp, sizeof(int32_t))) > + return -EFAULT; > + > + rproc->cdev_put_on_release = !!param; > + break; > + case RPROC_GET_SHUTDOWN_ON_RELEASE: > + param = (int32_t)rproc->cdev_put_on_release; > + if (copy_to_user(argp, ¶m, sizeof(int32_t))) > + return -EFAULT; > + > + break; > + default: > + dev_err(&rproc->dev, "Unsupported ioctl\n"); > + return -EINVAL; > + } > + > + return 0; > +} > + > +static int rproc_cdev_release(struct inode *inode, struct file *filp) > +{ > + struct rproc *rproc = container_of(inode->i_cdev, struct rproc, cdev); > + > + if (rproc->cdev_put_on_release && rproc->state == RPROC_RUNNING) > + rproc_shutdown(rproc); > + > + return 0; > +} > + > +static const struct file_operations rproc_fops = { > + .write = rproc_cdev_write, > + .unlocked_ioctl = rproc_device_ioctl, > + .compat_ioctl = compat_ptr_ioctl, > + .release = rproc_cdev_release, > +}; > + > +int rproc_char_device_add(struct rproc *rproc) > +{ > + int ret; > + > + cdev_init(&rproc->cdev, &rproc_fops); > + rproc->cdev.owner = THIS_MODULE; > + > + rproc->dev.devt = MKDEV(MAJOR(rproc_major), rproc->index); > + cdev_set_parent(&rproc->cdev, &rproc->dev.kobj); > + ret = cdev_add(&rproc->cdev, rproc->dev.devt, 1); > + if (ret < 0) > + dev_err(&rproc->dev, "Failed to add char dev for %s\n", rproc->name); > + > + return ret; > +} > + > +void rproc_char_device_remove(struct rproc *rproc) > +{ > + __unregister_chrdev(MAJOR(rproc->dev.devt), rproc->index, 1, "remoteproc"); > +} > + > +void __init rproc_init_cdev(void) > +{ > + int ret; > + > + ret = alloc_chrdev_region(&rproc_major, 0, NUM_RPROC_DEVICES, "remoteproc"); > + if (ret < 0) > + pr_err("Failed to alloc rproc_cdev region, err %d\n", ret); > +} > diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h > index cd4176b..c340028 100644 > --- a/drivers/remoteproc/remoteproc_internal.h > +++ b/drivers/remoteproc/remoteproc_internal.h > @@ -53,6 +53,34 @@ void rproc_exit_sysfs(void); > void rproc_coredump_cleanup(struct rproc *rproc); > void rproc_coredump(struct rproc *rproc); > > +#ifdef CONFIG_REMOTEPROC_CDEV > +void rproc_init_cdev(void); > +void rproc_exit_cdev(void); > +int rproc_char_device_add(struct rproc *rproc); > +void rproc_char_device_remove(struct rproc *rproc); > +#else > +static inline void rproc_init_cdev(void) > +{ > +} > + > +static inline void rproc_exit_cdev(void) > +{ > +} > + > +/* > + * The character device interface is an optional feature, if it is not enabled > + * the function should not return an error. > + */ > +static inline int rproc_char_device_add(struct rproc *rproc) > +{ > + return 0; > +} > + > +static inline void rproc_char_device_remove(struct rproc *rproc) > +{ > +} > +#endif > + > void rproc_free_vring(struct rproc_vring *rvring); > int rproc_alloc_vring(struct rproc_vdev *rvdev, int i); > > diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h > index 0e8d2ff..2fa68bf 100644 > --- a/include/linux/remoteproc.h > +++ b/include/linux/remoteproc.h > @@ -38,6 +38,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -509,6 +510,8 @@ struct rproc_dump_segment { > * @autonomous: true if an external entity has booted the remote processor > * @dump_segments: list of segments in the firmware > * @nb_vdev: number of vdev currently handled by rproc > + * @char_dev: character device of the rproc > + * @cdev_put_on_release: flag to indicate if remoteproc should be shutdown on @char_dev release > */ > struct rproc { > struct list_head node; > @@ -546,6 +549,8 @@ struct rproc { > int nb_vdev; > u8 elf_class; > u16 elf_machine; > + struct cdev cdev; > + bool cdev_put_on_release; > }; > > /** > diff --git a/include/uapi/linux/remoteproc_cdev.h b/include/uapi/linux/remoteproc_cdev.h > new file mode 100644 > index 0000000..c43768e > --- /dev/null > +++ b/include/uapi/linux/remoteproc_cdev.h > @@ -0,0 +1,37 @@ > +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ > +/* > + * IOCTLs for Remoteproc's character device interface. > + * > + * Copyright (c) 2020, The Linux Foundation. All rights reserved. > + */ > + > +#ifndef _UAPI_REMOTEPROC_CDEV_H_ > +#define _UAPI_REMOTEPROC_CDEV_H_ > + > +#include > +#include > + > +#define RPROC_MAGIC 0xB7 > + > +/* > + * The RPROC_SET_SHUTDOWN_ON_RELEASE ioctl allows to enable/disable the shutdown of a remote > + * processor automatically when the controlling userpsace closes the char device interface. > + * > + * input parameter: integer > + * 0 : disable automatic shutdown > + * other : enable automatic shutdown > + */ > +#define RPROC_SET_SHUTDOWN_ON_RELEASE _IOW(RPROC_MAGIC, 1, __s32) > + > +/* > + * The RPROC_GET_SHUTDOWN_ON_RELEASE ioctl gets information about whether the automatic shutdown of > + * a remote processor is enabled or disabled when the controlling userspace closes the char device > + * interface. > + * > + * output parameter: integer > + * 0 : automatic shutdown disable > + * other : automatic shutdown enable > + */ > +#define RPROC_GET_SHUTDOWN_ON_RELEASE _IOR(RPROC_MAGIC, 2, __s32) > + > +#endif > -- > Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel