From patchwork Wed Aug 26 16:45:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11739157 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A6B914E5 for ; Wed, 26 Aug 2020 16:48:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 120AE2078B for ; Wed, 26 Aug 2020 16:48:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UdinP/Yb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727877AbgHZQsR (ORCPT ); Wed, 26 Aug 2020 12:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728103AbgHZQps (ORCPT ); Wed, 26 Aug 2020 12:45:48 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F107C0617A5 for ; Wed, 26 Aug 2020 09:45:42 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id h2so1154611plr.0 for ; Wed, 26 Aug 2020 09:45:42 -0700 (PDT) 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=wk7DlN4RR6k6lg+nX/WYTS8+aJhqAF/kFILSCMp8TGw=; b=UdinP/YbA0u1t4KDbjuAf+r71DAWjgY3RPz9ZScLNzkB7tPAhMeHX9QmzC9malvaJF hoj9Qwbdr4GuV/WOxVpVYRdSZi46IYmQXewQvgP6oA1/VfZ6BFNX6Bd9YHSeErmBJqv8 yiP3pd4ykmjYYOi/+0ds2XovLu2/QdPHghSjYtKuw5i8xKHp5waepuCI/l2+9IciBIJd 3wI5yo+0meEJJg5WPfOX/Zx/4R4WNhVfcFKPW7GQ6fVFsmsvcXUjO16zSVY7TJph+RUC WPwsHa7jskkpIjIuBp1MnDdy9KRecBHrpp8IBOMggvj7+3+aTWG/1gSXa5fistCF+sx7 Kg1A== 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=wk7DlN4RR6k6lg+nX/WYTS8+aJhqAF/kFILSCMp8TGw=; b=X5Doh4usYNPX7jRXsX2HD5V2xQK3+Kf8QuXD5FrINo7TBIuot5yQPxPtedtNqE9nu+ hjK2Lpz/vRXz/Or2+q3ijytgbFT9rKzUwM5skz57OvTE65lBGOQphpPrapcug0tlfvXu n/Qs/+jInNDTgvn7oWUQIfnHJRlWJZoq6w3MLR/UZj05pD4Ak4y6vLllM2lWLM4Y5O2o ots9NupM9aIM5n+G5iYCWMn3u6heBSHsBewrMQaY2kEEocuAr9m/5TsFpiaF7owk+qyD mU8TBaTpC90pHflDxfMo1o2IhAnJ7HHraElH89nAEYNoo2K+4iQvVZCF64hgfZQwLApI TGqw== X-Gm-Message-State: AOAM532euA3TbRqOUIl7Q8RhlTh+IxWgDelO+6948HClA1NeQX++isDE SvOI1bUjg1PYdWs1KmQjD6IOAw== X-Google-Smtp-Source: ABdhPJwFq1VHZ9E5J6KXkMZQVDNWMO5HD2gW4DuTbXKm53qunGivmzlikr0J4TcdsZaxi16+X87t0w== X-Received: by 2002:a17:90a:d908:: with SMTP id c8mr1106186pjv.4.1598460341768; Wed, 26 Aug 2020 09:45:41 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id u3sm2548878pjn.29.2020.08.26.09.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 09:45:41 -0700 (PDT) From: Mathieu Poirier To: bjorn.andersson@linaro.org, ohad@wizery.com Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/13] remoteproc: Properly deal with a stop request when attached Date: Wed, 26 Aug 2020 10:45:26 -0600 Message-Id: <20200826164529.224476-11-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200826164529.224476-1-mathieu.poirier@linaro.org> References: <20200826164529.224476-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@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 --- 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(-) 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 c6c6aba66098..95bb40b4ebb3 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1619,6 +1619,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); @@ -1857,7 +1861,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 c152d11a4d3c..6134d2f083ce 100644 --- a/drivers/remoteproc/remoteproc_sysfs.c +++ b/drivers/remoteproc/remoteproc_sysfs.c @@ -113,10 +113,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;