From patchwork Fri Dec 18 17:32:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 345473 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp2335630jai; Fri, 18 Dec 2020 09:35:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJwE6kMZC0uo9xXeVUmPSm2a+GkUgFe99EmiBOlzElSpN+i/WwwX4/OOtn1GkdCvGBm8UJPK X-Received: by 2002:a17:907:210b:: with SMTP id qn11mr5157112ejb.41.1608312915317; Fri, 18 Dec 2020 09:35:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608312915; cv=none; d=google.com; s=arc-20160816; b=keATTMsRVAn39g+mvz7rqDYGkDIfFbFMlSC/Bk9K+n4rXwX/vB3SOiN4aWD6W78yZk 2x1GjCWcP6qfnEDXII9KEILMUAcsYmEfJAiS07rkDs7ZrAaD2r4Px6TdKeBu3qDS2fT2 f7Ufw725zdOMWTTFNeZTw93mGbi+RpYH9a/bLCA0682y+RojhKJIloL6RDGIIVfGxOw2 us8HVGxVUHb+rgJcKn8kfWiZ6lDzDUtfRX0XOJPIaZJm4Se51OYKnCBjmlzJ2XcGAnyF VJu0j1IeFMOiAyOC5wSIl1aAeOJnYz3f/2nxSJdqYjJJtfsHygzxa0Vo1K4BVEOaE0eV BzNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mdgob6jb0rUl30rfuLBWyS6H4rN7qpxnzyGATQ2xIt0=; b=KhURj5AisCeFrXsEfMG4GFlfXK5bn1LfWv3kNJiwbP3v0IR69rD28lxUz+bBg6ax64 iK9O1wZ7QRfY+nc7W+Avh/S0RYjPwVNsuSd2fAXJBMSmvlBYlTFS8Bhy6SGytsRhMMIW YHlEEUHpPGLIcIZ/ZNQSrpxakYvlmkKIxV63fmylw0xvfxReLs4RRXn2oGjsJmmOBHtO odM6HmxVxYAq9ukYijZrGvrZ6XghjLSmCY4RAkUsRDCLYZnpP/RajPMtMJ85uK5wl9eg ddbyj0HKL01rMvElmmWGBV5tkHZ463ISpLaJLWutJNrDye5g28MwvsmHBEsPe4uVCiSt 5FKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Z/bCGb66"; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t20si4902939ejd.719.2020.12.18.09.35.15; Fri, 18 Dec 2020 09:35:15 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Z/bCGb66"; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732839AbgLRReY (ORCPT + 7 others); Fri, 18 Dec 2020 12:34:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732837AbgLRReW (ORCPT ); Fri, 18 Dec 2020 12:34:22 -0500 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEB70C061A4A for ; Fri, 18 Dec 2020 09:32:46 -0800 (PST) Received: by mail-pg1-x52e.google.com with SMTP id 15so1745272pgx.7 for ; Fri, 18 Dec 2020 09:32:46 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=mdgob6jb0rUl30rfuLBWyS6H4rN7qpxnzyGATQ2xIt0=; b=Z/bCGb665F1fxnTF+3LEJAjTLAyRytVrF5nB84gRSWFkw9pBOTDRyaetGJaVASDVf6 +nCf5Bzq1+bCfC0ZehUxmqVXTSEF7Ox4nPgslBlQKHFo2pX4hZzlnMxfuMhnTpEIy2t3 QX1JabKmP8D2ajzElTIJHWwsg0XxZf+Sdj4mOaaDI0x1Zf6hS/8e4LAS3GjSgbVQsycU uXtaDQOOvuGn6B9+d41ZrH+ckbZzv5tgX7LMEi7WxfusAahQEnVXcCvdEODCIMX6ulCo P3yNhh4uYuuNmDcUhd8xzicCX0lfgBiSzor5WZTOjIfdU4Pf4pHUCtMsPZ0nMFbppxC9 2IOQ== 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:mime-version:content-transfer-encoding; bh=mdgob6jb0rUl30rfuLBWyS6H4rN7qpxnzyGATQ2xIt0=; b=CIH2hU7Y8qjM5eNmAhyXWT8VRslkH16V6X7fIgSWtB1Fl79r/pQEc3YzXUwJ7v9st8 Kfb9VtlxIU1Y35vj5Tu/+VM2y8/VYNR63eZkCpWnZ9eL/gcMekr7l+1SXELXQEnvS0dh cHtn7G3DlDt/EehFywlyvEb71xwI+HKohvFT9n5h4687ryEp4//mnpYUV+/+9XiTtSe4 lFBYsx6Qd5weXWsz7j+WxfGMnqaw+OVLk/2Wh+AzzZxVB0IouuLcwVsKKRvsLvTdpA1v /D0mvkaX5xSmvvBlF0cwSqf/MAeIp0n5zvrinjx1ypW6Egs1VEmQYTF/j+b4JRTEkVwG f/xA== X-Gm-Message-State: AOAM530xwKXfU+v4z1jK3goix/ZNN28cojFCKWSE85GtbySS9+bbt04d 5xb4YXOA2dSTHC8TRPmHPuJRCg== X-Received: by 2002:a63:2fc5:: with SMTP id v188mr4987089pgv.243.1608312766353; Fri, 18 Dec 2020 09:32:46 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id l11sm9892957pgt.79.2020.12.18.09.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 09:32:45 -0800 (PST) From: Mathieu Poirier To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org Cc: arnaud.pouliquen@st.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 14/17] remoteproc: Properly deal with a stop request when attached Date: Fri, 18 Dec 2020 10:32:25 -0700 Message-Id: <20201218173228.2277032-15-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201218173228.2277032-1-mathieu.poirier@linaro.org> References: <20201218173228.2277032-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch introduces the capability to stop a remote processor that has been attached to by the remoteproc core. For that to happen a rproc::ops::stop() operation need to be available. Signed-off-by: Mathieu Poirier Reviewed-by: Peng Fan Reviewed-by: Arnaud Pouliquen --- drivers/remoteproc/remoteproc_cdev.c | 5 +++-- drivers/remoteproc/remoteproc_core.c | 6 +++++- drivers/remoteproc/remoteproc_sysfs.c | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) -- 2.25.1 diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c index b19ea3057bde..d06f8d4919c7 100644 --- a/drivers/remoteproc/remoteproc_cdev.c +++ b/drivers/remoteproc/remoteproc_cdev.c @@ -37,10 +37,11 @@ static ssize_t rproc_cdev_write(struct file *filp, const char __user *buf, size_ ret = rproc_boot(rproc); } else if (!strncmp(cmd, "stop", len)) { - if (rproc->state != RPROC_RUNNING) + if (rproc->state != RPROC_RUNNING && + rproc->state != RPROC_ATTACHED) return -EINVAL; - rproc_shutdown(rproc); + ret = rproc_shutdown(rproc); } else { dev_err(&rproc->dev, "Unrecognized option\n"); ret = -EINVAL; diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 90057ad1bb6c..2fe42ac7ca89 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1648,6 +1648,10 @@ static int rproc_stop(struct rproc *rproc, bool crashed) struct device *dev = &rproc->dev; int ret; + /* No need to continue if a stop() operation has not been provided */ + if (!rproc->ops->stop) + return -EINVAL; + /* Stop any subdevices for the remote processor */ rproc_stop_subdevices(rproc, crashed); @@ -1897,7 +1901,7 @@ int rproc_shutdown(struct rproc *rproc) return ret; } - if (rproc->state != RPROC_RUNNING) { + if (rproc->state != RPROC_RUNNING && rproc->state != RPROC_ATTACHED) { ret = -EPERM; goto out; } diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c index 99ff51fd9707..96751c087585 100644 --- a/drivers/remoteproc/remoteproc_sysfs.c +++ b/drivers/remoteproc/remoteproc_sysfs.c @@ -230,10 +230,11 @@ static ssize_t state_store(struct device *dev, if (ret) dev_err(&rproc->dev, "Boot failed: %d\n", ret); } else if (sysfs_streq(buf, "stop")) { - if (rproc->state != RPROC_RUNNING) + if (rproc->state != RPROC_RUNNING && + rproc->state != RPROC_ATTACHED) return -EINVAL; - rproc_shutdown(rproc); + ret = rproc_shutdown(rproc); } else { dev_err(&rproc->dev, "Unrecognised option: %s\n", buf); ret = -EINVAL;