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=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 31012C433E9 for ; Fri, 26 Feb 2021 16:25:05 +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 C556364EF6 for ; Fri, 26 Feb 2021 16:25:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C556364EF6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=foss.st.com 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:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JT0qp9hg+euA230NmixjX06gZzEKMqaseff7A+wEXDg=; b=bo9GgN4V/n7cjJvbT6FoODgSA UMkT+rpFplD4bz9iDz3lqzOGm5JFdED98OGUV8a0SEOb4h10X+3Ud7VX8rmNF+glh33H23DDm4mny lc05FXcXamjdoPqN3p26vUp3/afivj0YuvHz3KpTLSkj//w0uFG7+mV5UXOai2UQUFtpd8Es/FPR9 qLg0MbwmIfIBIbFZqjZ3kkMGAapRCi+t+CNnMCZC4xdCGXeWCgzQzlnfKMT7eDNBPX0vUrQQ5ESKl CMtKr3c0Yl5S9nGruEmaw7xXnGnwPwEPiQHBM9SC3TnJGlLF9HMEkyKjjlwBCgoPBhardnUaZaXD0 829Ldf31Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFfuD-0002tJ-JX; Fri, 26 Feb 2021 16:23:53 +0000 Received: from mx08-00178001.pphosted.com ([91.207.212.93] helo=mx07-00178001.pphosted.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFfuB-0002sH-6A for linux-arm-kernel@lists.infradead.org; Fri, 26 Feb 2021 16:23:52 +0000 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 11QGCg7t030124; Fri, 26 Feb 2021 17:23:48 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=sAC/fKyohJhsaMN0N9CSZbklAqAE2gwlIAJ+apwQbQU=; b=vQ6wdWdsNesM9qKO5jp7d9WC6StRlgCjTyqVasc7ACGT+r4sZq124IlKziiOL1nQ8qtO 1Mxb6d4JvLbDCNJEwJisXs/YkYeNATWsQx0DQbVMtqtlW5lwes4Bb9P493jYjZT92HOn CDexLUiam2mgkgbRLeHsQnv8LphRbBCZJmCX5VLqNxZ9qVqHrNa5imRoUw4X/X6RVkv8 NsWqCezVU9zO0jOraI+fkkzNMcYdDr2u0s2SXQW8wBzjRe65G+vNxLAzLz9mM2xUrdl7 kQiVH+iKvkdzCO15ehNWbWY2UayK4+mjVFkzB8XdGoO19hqeelV+jdUnN0LJW2UYOFTR 9A== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 36w66vxrqp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 Feb 2021 17:23:48 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id DCE3410002A; Fri, 26 Feb 2021 17:23:46 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id CEA562BA2DB; Fri, 26 Feb 2021 17:23:46 +0100 (CET) Received: from lmecxl0889.lme.st.com (10.75.127.50) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 26 Feb 2021 17:23:45 +0100 Subject: Re: [PATCH v6 16/16] remoteproc: Refactor rproc delete and cdev release path To: Mathieu Poirier , , , References: <20210223233515.3468677-1-mathieu.poirier@linaro.org> <20210223233515.3468677-17-mathieu.poirier@linaro.org> From: Arnaud POULIQUEN Message-ID: <80abdd3b-ffb0-1019-2a1f-fea4f7b51349@foss.st.com> Date: Fri, 26 Feb 2021 17:23:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210223233515.3468677-17-mathieu.poirier@linaro.org> Content-Language: en-US X-Originating-IP: [10.75.127.50] X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-02-26_05:2021-02-26, 2021-02-26 signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210226_112351_443162_7777A723 X-CRM114-Status: GOOD ( 28.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: linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, alexandre.torgue@st.com, mcoquelin.stm32@gmail.com, linux-kernel@vger.kernel.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 2/24/21 12:35 AM, Mathieu Poirier wrote: > Refactor function rproc_del() and rproc_cdev_release() to take > into account the current state of the remote processor when choosing > the state to transition to. > > Signed-off-by: Mathieu Poirier > --- > New for V6: > - The RPROC_RUNNING -> RPROC_DETACHED transition is no longer permitted. > to avoid dealing with complex resource table management problems. > - Transition to the next state is no longer dictated by a DT binding for > the same reason as above. > - Removed Peng and Arnaud's RB tags because of the above. > --- > > drivers/remoteproc/remoteproc_cdev.c | 10 ++++++++-- > drivers/remoteproc/remoteproc_core.c | 9 +++++++-- > 2 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c > index 2db494816d5f..0b8a84c04f76 100644 > --- a/drivers/remoteproc/remoteproc_cdev.c > +++ b/drivers/remoteproc/remoteproc_cdev.c > @@ -86,11 +86,17 @@ static long rproc_device_ioctl(struct file *filp, unsigned int ioctl, unsigned l > static int rproc_cdev_release(struct inode *inode, struct file *filp) > { > struct rproc *rproc = container_of(inode->i_cdev, struct rproc, cdev); > + int ret = 0; > + > + if (!rproc->cdev_put_on_release) > + return 0; > > - if (rproc->cdev_put_on_release && rproc->state == RPROC_RUNNING) > + if (rproc->state == RPROC_RUNNING) > rproc_shutdown(rproc); > + else if (rproc->state == RPROC_ATTACHED) > + ret = rproc_detach(rproc); > > - return 0; > + return ret; > } > > static const struct file_operations rproc_fops = { > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 00452da25fba..a05d5fec43b1 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -2542,11 +2542,16 @@ EXPORT_SYMBOL(rproc_put); > */ > int rproc_del(struct rproc *rproc) > { > + int ret = 0; > + > if (!rproc) > return -EINVAL; > > /* TODO: make sure this works with rproc->power > 1 */ > - rproc_shutdown(rproc); > + if (rproc->state == RPROC_RUNNING) > + rproc_shutdown(rproc); > + else if (rproc->state == RPROC_ATTACHED) > + ret = rproc_detach(rproc); Here i would not update the code to not change the existing behavior of an attached firmware. The decision between a detach or a shutdown probably depends on platform. We could (as a next step) reintroduce the "autonomous-on-core-reboot" DT property for the decision. Regards Arnaud > > mutex_lock(&rproc->lock); > rproc->state = RPROC_DELETED; > @@ -2565,7 +2570,7 @@ int rproc_del(struct rproc *rproc) > > device_del(&rproc->dev); > > - return 0; > + return ret; > } > EXPORT_SYMBOL(rproc_del); > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel