From patchwork Wed Mar 11 10:54:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 11431355 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 BE9B014BC for ; Wed, 11 Mar 2020 10:54:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CE7321655 for ; Wed, 11 Mar 2020 10:54:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="VZldWqjd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729056AbgCKKyu (ORCPT ); Wed, 11 Mar 2020 06:54:50 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:38714 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726713AbgCKKyr (ORCPT ); Wed, 11 Mar 2020 06:54:47 -0400 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02BAmlmO007361; Wed, 11 Mar 2020 11:54:43 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=68gVoIOTswhoH9BzUdkH5JXWP+gK2iB9fVzO3ctGbkg=; b=VZldWqjd/M5NEwmJVC5vMLbr9ueqSyHbRsfKQdSB9cqbE3swERLeKjcDNUXhgVwCYvAm 5YMvTPtKGPbiVZvn4qec7e4o77nLY4drf+PHtlmLxqAJaZu3IhidJiB1OUNB0VIHQkuC rBlGE+qEmKIyZbHDXF6MbVryrprBodxRLhrs4oqwWiZRh/KXkE3mdvc9ytA3uWlXfBws RQvK0dRzLHwS2HwljkZmALmflzzCxTcVe9xvACaHUGNRNmGfaDm3tnEOy1pId7CuO/H6 WN1XkQ17AsJyPA1ZnRY003XQ+eXfWspKJouyQmdH89NyM+9jZQuLOGt30LsJ/HTW54yF Ug== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2ynecdgshm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Mar 2020 11:54:43 +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 6B27E10002A; Wed, 11 Mar 2020 11:54:38 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag7node2.st.com [10.75.127.20]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 5C96E2A543D; Wed, 11 Mar 2020 11:54:38 +0100 (CET) Received: from localhost (10.75.127.46) by SFHDAG7NODE2.st.com (10.75.127.20) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 11 Mar 2020 11:54:37 +0100 From: Loic Pallardy To: , , CC: , , , , , , Loic Pallardy Subject: [RFC 1/2] remoteproc: sysfs: authorize rproc shutdown when rproc is crashed Date: Wed, 11 Mar 2020 11:54:31 +0100 Message-ID: <1583924072-20648-2-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583924072-20648-1-git-send-email-loic.pallardy@st.com> References: <1583924072-20648-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.46] X-ClientProxiedBy: SFHDAG7NODE3.st.com (10.75.127.21) To SFHDAG7NODE2.st.com (10.75.127.20) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-03-11_04:2020-03-11,2020-03-11 signatures=0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org When remoteproc recovery is disabled and rproc crashed, user space client has no way to reboot co-processor except by a complete platform reboot. Indeed rproc_shutdown() is called by sysfs state_store() only is rproc state is RPROC_RUNNING. This patch offers the possibility to shutdown the co-processor if it is in RPROC_CRASHED state and so to restart properly co-processor from sysfs interface. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/remoteproc/remoteproc_sysfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 097f33e4f1f3..7ac87a75cd1b 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1812,7 +1812,7 @@ void rproc_shutdown(struct rproc *rproc) if (!atomic_dec_and_test(&rproc->power)) goto out; - ret = rproc_stop(rproc, false); + ret = rproc_stop(rproc, rproc->state == RPROC_CRASHED); if (ret) { atomic_inc(&rproc->power); goto out; diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c index 7f8536b73295..1029458a4678 100644 --- a/drivers/remoteproc/remoteproc_sysfs.c +++ b/drivers/remoteproc/remoteproc_sysfs.c @@ -101,7 +101,7 @@ 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_CRASHED) return -EINVAL; rproc_shutdown(rproc); From patchwork Wed Mar 11 10:54:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 11431357 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 E8F8617D5 for ; Wed, 11 Mar 2020 10:54:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7B6221655 for ; Wed, 11 Mar 2020 10:54:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="oeNThnRe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726672AbgCKKyr (ORCPT ); Wed, 11 Mar 2020 06:54:47 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:10342 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729056AbgCKKyr (ORCPT ); Wed, 11 Mar 2020 06:54:47 -0400 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02BAmM0s020922; Wed, 11 Mar 2020 11:54:43 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=3cvGCt8bpqbB/LxrpYqHti3FK8Z4pnOI3/BaTMIW+tU=; b=oeNThnReaSNTfbbFhxUuGXeiiVjbv1FeEB/UdRUcWBiu7l6L2zGuLvG4icO8IiJUlGP/ G4oBk4lznjcYQQtIWjkWHKr4da51Iiu70YfUkKstYgNElnKfXV/hoqGWY2pDWgV4XmVD J7e7eIjVA7suRAnsm/7dDt4vdIagTm4mOaXCaTaIpbaEoh4qC5wj1slnWZlp5hVW5KVe orzBQBILuOujZp2jt9Jvf1awJYNOEyGHBBvBRPTF11TUAcnqwOBORsEMDoTE2v3XEyOs /+wizsNZ5CJ3A3/4bMWeIC74kkrDIW8pRk+uOWi/M+zA33DgjnQRsKIWiLGNtfGdRqXU vA== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2ym1mh29p6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Mar 2020 11:54:43 +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 302C110003D; Wed, 11 Mar 2020 11:54:39 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag7node2.st.com [10.75.127.20]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 25EDB2A543D; Wed, 11 Mar 2020 11:54:39 +0100 (CET) Received: from localhost (10.75.127.48) by SFHDAG7NODE2.st.com (10.75.127.20) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 11 Mar 2020 11:54:38 +0100 From: Loic Pallardy To: , , CC: , , , , , , Loic Pallardy Subject: [RFC 2/2] remoteproc: core: keep rproc in crash state in case of recovery failure Date: Wed, 11 Mar 2020 11:54:32 +0100 Message-ID: <1583924072-20648-3-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583924072-20648-1-git-send-email-loic.pallardy@st.com> References: <1583924072-20648-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.48] X-ClientProxiedBy: SFHDAG6NODE1.st.com (10.75.127.16) To SFHDAG7NODE2.st.com (10.75.127.20) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-03-11_04:2020-03-11,2020-03-11 signatures=0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org When an error occurs during recovery procedure, internal rproc variables may be unaligned: - state is set to RPROC_OFFLINE - power atomic not equal to 0 which is normal as only rproc_stop() has been executed and not rproc_shutdown() In such case, rproc_boot() can be re-executed by client to reboot co-processor. This patch proposes to keep rproc in RPROC_CRASHED state in case of recovery failure to be coherent with recovery disabled mode. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 7ac87a75cd1b..def4f9fc881d 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1679,6 +1679,12 @@ int rproc_trigger_recovery(struct rproc *rproc) release_firmware(firmware_p); unlock_mutex: + /* + * In case of error during recovery sequence restore rproc + * state in CRASHED + */ + if (ret) + rproc->state = RPROC_CRASHED; mutex_unlock(&rproc->lock); return ret; }