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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 779DAC433EF for ; Tue, 18 Jan 2022 18:44:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237544AbiARSo6 (ORCPT ); Tue, 18 Jan 2022 13:44:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234059AbiARSo5 (ORCPT ); Tue, 18 Jan 2022 13:44:57 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DAD9C06161C for ; Tue, 18 Jan 2022 10:44:57 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id pf13so193265pjb.0 for ; Tue, 18 Jan 2022 10:44:57 -0800 (PST) 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=CFAGt0ERR1Sk6nuaQG2sLvBNcFGlpdl228B5ZY5KMow=; b=kZmt7JdvOF1OPX5p/UrhTGMxIsooM/o0xchNaDvgnWMOc7CNXok+0cSEDWJfj4czu4 Lv4X8jfIxEssR+o5At+z7Klo3W3lHPKYEwbhDzDb2XeT5ClvrRy2W+Ypli8ZI+WksCmU Gp+gVRr/pwpeoXv/UtXFJviBVo8HxUeE7N3UsiV0RYFostNnx1PIVedak6NysECiCGBH TUZJ6It+e+r/iR5Jww1ALITHon3eMit82XIvewozx20hFUun67Da/+mx69FPwEhf+Z/n pWXS8pdWn5tNyfzDOAnFFb46m7cR/+scow6Y0PZQE9kqtw/uYw+4ULZewnhFTOJ214E9 m+zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=CFAGt0ERR1Sk6nuaQG2sLvBNcFGlpdl228B5ZY5KMow=; b=tv3DI8uL3m3e9hZPM+iSRUTmuCac1Yhe14z/r65AIE+zNt6KiSibVM670nIfe7DSE7 HfNvljEfiRkcI5i3Sq6VhF+K6FnaN37JAeTy6f8OX1kq2NVfAZ51J3QzS3W+a9pD57pb 3yExvNc2QOUP+4sSLzvyqGaY8v4v9gDA9GFmWLnwuHvzogkeLgR+RbL/U6jHUkTZ70ue DAvG2Mj0WWxaVOyOM+lS++Ht2bzIdKZ34uKLv/vFQQVtBZ3DUlsDQQGyi/qp/2WLZ5QG 9qt4JQKP7D3Sp1qQtJwAhZPwsf1vHBR1mDnI8HVVw4mwX8Z35MtgtKu7i0JOMfbObbBg zhwg== X-Gm-Message-State: AOAM531mIevJF6HkSiFXMSZOE9AogXYwiBR3YLh7kE/TwzvsiUPSHlUP AYBBzQeaSe4Jchb00jZa/sz+jw== X-Google-Smtp-Source: ABdhPJyrYs0lWDrmhcEKD5qUemt3E88iynSRMIa+6rd90dKiwB9AuRND3goyKzc3uoNLasFPdMmluQ== X-Received: by 2002:a17:90b:4a45:: with SMTP id lb5mr23096488pjb.67.1642531496991; Tue, 18 Jan 2022 10:44:56 -0800 (PST) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id i13sm15563936pgl.81.2022.01.18.10.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 10:44:55 -0800 (PST) Date: Tue, 18 Jan 2022 11:44:53 -0700 From: Mathieu Poirier To: "Peng Fan (OSS)" Cc: bjorn.andersson@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: Re: [PATCH 3/9] remoteproc: support self recovery after rproc crash Message-ID: <20220118184453.GE1119324@p14s> References: <20220111033333.403448-1-peng.fan@oss.nxp.com> <20220111033333.403448-6-peng.fan@oss.nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220111033333.403448-6-peng.fan@oss.nxp.com> Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org On Tue, Jan 11, 2022 at 11:33:27AM +0800, Peng Fan (OSS) wrote: > From: Peng Fan > > Current logic only support main processor to stop/start the remote > processor after rproc crash. However to SoC, such as i.MX8QM/QXP, the > remote processor could do self recovery after crash and trigger watchdog > reboot. It does not need main processor to load image, stop/start M4 > core. > > This patch add a new flag to indicate whether the SoC has self recovery > capability. And introduce two functions: rproc_self_recovery, > rproc_assisted_recovery for the two cases. Assisted recovery is as > before, let main processor to help recovery, while self recovery is > recover itself withou help. To self recovery, we only do detach and > attach. > > Signed-off-by: Peng Fan > --- > drivers/remoteproc/remoteproc_core.c | 66 ++++++++++++++++++++-------- > include/linux/remoteproc.h | 2 + > 2 files changed, 49 insertions(+), 19 deletions(-) > > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 69f51acf235e..4bd5544dab8f 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -1887,6 +1887,49 @@ static int __rproc_detach(struct rproc *rproc) > return 0; > } > > +static int rproc_self_recovery(struct rproc *rproc) > +{ > + int ret; > + > + mutex_unlock(&rproc->lock); > + ret = rproc_detach(rproc); > + mutex_lock(&rproc->lock); > + if (ret) > + return ret; > + > + if (atomic_inc_return(&rproc->power) > 1) > + return 0; > + return rproc_attach(rproc); > +} > + > +static int rproc_assisted_recovery(struct rproc *rproc) > +{ > + const struct firmware *firmware_p; > + struct device *dev = &rproc->dev; > + int ret; > + > + ret = rproc_stop(rproc, true); > + if (ret) > + return ret; > + > + /* generate coredump */ > + rproc->ops->coredump(rproc); > + > + /* load firmware */ > + ret = request_firmware(&firmware_p, rproc->firmware, dev); > + if (ret < 0) { > + dev_err(dev, "request_firmware failed: %d\n", ret); > + return ret; > + } > + > + /* boot the remote processor up again */ > + ret = rproc_start(rproc, firmware_p); > + > + release_firmware(firmware_p); > + > + return ret; > +} > + > /** > * rproc_trigger_recovery() - recover a remoteproc > * @rproc: the remote processor > @@ -1901,7 +1944,6 @@ static int __rproc_detach(struct rproc *rproc) > */ > int rproc_trigger_recovery(struct rproc *rproc) > { > - const struct firmware *firmware_p; > struct device *dev = &rproc->dev; > int ret; > > @@ -1915,24 +1957,10 @@ int rproc_trigger_recovery(struct rproc *rproc) > > dev_err(dev, "recovering %s\n", rproc->name); > > - ret = rproc_stop(rproc, true); > - if (ret) > - goto unlock_mutex; > - > - /* generate coredump */ > - rproc->ops->coredump(rproc); > - > - /* load firmware */ > - ret = request_firmware(&firmware_p, rproc->firmware, dev); > - if (ret < 0) { > - dev_err(dev, "request_firmware failed: %d\n", ret); > - goto unlock_mutex; > - } > - > - /* boot the remote processor up again */ > - ret = rproc_start(rproc, firmware_p); > - > - release_firmware(firmware_p); > + if (rproc->self_recovery) > + ret = rproc_self_recovery(rproc); > + else > + ret = rproc_assisted_recovery(rproc); The problem of how to handle crash recoveries for processors that have been attached to is difficult. Finding a solution for that should be on a patchset of its own so that people can provide input. > > unlock_mutex: > mutex_unlock(&rproc->lock); > diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h > index e0600e1e5c17..b32ef46f8aa4 100644 > --- a/include/linux/remoteproc.h > +++ b/include/linux/remoteproc.h > @@ -529,6 +529,7 @@ struct rproc_dump_segment { > * @elf_machine: firmware ELF machine > * @cdev: character device of the rproc > * @cdev_put_on_release: flag to indicate if remoteproc should be shutdown on @char_dev release > + * @self_recovery: flag to indicate if remoteproc support self recovery > */ > struct rproc { > struct list_head node; > @@ -568,6 +569,7 @@ struct rproc { > u16 elf_machine; > struct cdev cdev; > bool cdev_put_on_release; > + bool self_recovery; > }; > > /** > -- > 2.25.1 > 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32232C433F5 for ; Tue, 18 Jan 2022 18:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=Rfp0VEKjj3kABlwHtNCYtxjwKnjieUxgcSmezUgBrFQ=; b=zlwQXtjBz482EY H5Q5du6Y+fPJVRwFCCvLaAQ8RTQ3BQ+MvlICTuJD1jZbEymhuNMtzrikG49RuKn9l6mnmblFoFAm0 GCohOIj12Jf8aS4iGh18jYCEogkEJOjL2VcbLIyP6xLprSLUScyyVA1Svl+TObKu6kqcMgBOMqHjJ hoRYksVCUS/WJnTp53BZXGZNKZQtlVuhxU+Kcc+HtGNoeQTDoJGMlQ6oXJV0QLtV1JhjF/vLJ83K+ ZzMj/x6QCHjAytuSBBTVnwsqd2+em/jjnLFk3jI5Q7uNZGNHlOzHmO7w84AqREC87J7xnrXkBZMch J9LfH6JeMvOcssHpA/GQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9tTZ-002cXT-Mx; Tue, 18 Jan 2022 18:45:01 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9tTW-002cWP-2P for linux-arm-kernel@lists.infradead.org; Tue, 18 Jan 2022 18:44:59 +0000 Received: by mail-pj1-x102e.google.com with SMTP id hv15so137561pjb.5 for ; Tue, 18 Jan 2022 10:44:57 -0800 (PST) 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=CFAGt0ERR1Sk6nuaQG2sLvBNcFGlpdl228B5ZY5KMow=; b=kZmt7JdvOF1OPX5p/UrhTGMxIsooM/o0xchNaDvgnWMOc7CNXok+0cSEDWJfj4czu4 Lv4X8jfIxEssR+o5At+z7Klo3W3lHPKYEwbhDzDb2XeT5ClvrRy2W+Ypli8ZI+WksCmU Gp+gVRr/pwpeoXv/UtXFJviBVo8HxUeE7N3UsiV0RYFostNnx1PIVedak6NysECiCGBH TUZJ6It+e+r/iR5Jww1ALITHon3eMit82XIvewozx20hFUun67Da/+mx69FPwEhf+Z/n pWXS8pdWn5tNyfzDOAnFFb46m7cR/+scow6Y0PZQE9kqtw/uYw+4ULZewnhFTOJ214E9 m+zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=CFAGt0ERR1Sk6nuaQG2sLvBNcFGlpdl228B5ZY5KMow=; b=ra83Q9rKA/1GelyIH1SerrFxvOo4XnesVtLOa+O1iYV4RujrPvFKk1STpo56fQIOWT cibuYIjWlpIG+ZH9dduCb67MbbpnXxjydHc3VqIeeaqMDh+QHgrnEVnqtxJT6NXOnj8B BJukmSfQegYwRnUtvhCiiCQzPYxH55i79EpahY0oGQB1HxpzQd0x4szdEt8y2EnC35Hp de/EXahRhqY+ucdFJirPt58CJOLAQ9bQeZZ0aJ4qo45oNhZeDg6whmqvHIy8In0ETw4Q oeQuBK0llaaW0c34dzQN5jJmCWoz5wW4BZMpXxkILBinamuoExlxrccAT9za6zh5B+ln 4fYQ== X-Gm-Message-State: AOAM531TOe5vju7cINXKCw43UuwrCJKHoX6oL6EhMoxbOS6CiKGlwtXL 2cb8qu5iaQqDv30hgO/TyQAf+A== X-Google-Smtp-Source: ABdhPJyrYs0lWDrmhcEKD5qUemt3E88iynSRMIa+6rd90dKiwB9AuRND3goyKzc3uoNLasFPdMmluQ== X-Received: by 2002:a17:90b:4a45:: with SMTP id lb5mr23096488pjb.67.1642531496991; Tue, 18 Jan 2022 10:44:56 -0800 (PST) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id i13sm15563936pgl.81.2022.01.18.10.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 10:44:55 -0800 (PST) Date: Tue, 18 Jan 2022 11:44:53 -0700 From: Mathieu Poirier To: "Peng Fan (OSS)" Cc: bjorn.andersson@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: Re: [PATCH 3/9] remoteproc: support self recovery after rproc crash Message-ID: <20220118184453.GE1119324@p14s> References: <20220111033333.403448-1-peng.fan@oss.nxp.com> <20220111033333.403448-6-peng.fan@oss.nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220111033333.403448-6-peng.fan@oss.nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220118_104458_191243_D3951CBD X-CRM114-Status: GOOD ( 29.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Tue, Jan 11, 2022 at 11:33:27AM +0800, Peng Fan (OSS) wrote: > From: Peng Fan > > Current logic only support main processor to stop/start the remote > processor after rproc crash. However to SoC, such as i.MX8QM/QXP, the > remote processor could do self recovery after crash and trigger watchdog > reboot. It does not need main processor to load image, stop/start M4 > core. > > This patch add a new flag to indicate whether the SoC has self recovery > capability. And introduce two functions: rproc_self_recovery, > rproc_assisted_recovery for the two cases. Assisted recovery is as > before, let main processor to help recovery, while self recovery is > recover itself withou help. To self recovery, we only do detach and > attach. > > Signed-off-by: Peng Fan > --- > drivers/remoteproc/remoteproc_core.c | 66 ++++++++++++++++++++-------- > include/linux/remoteproc.h | 2 + > 2 files changed, 49 insertions(+), 19 deletions(-) > > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 69f51acf235e..4bd5544dab8f 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -1887,6 +1887,49 @@ static int __rproc_detach(struct rproc *rproc) > return 0; > } > > +static int rproc_self_recovery(struct rproc *rproc) > +{ > + int ret; > + > + mutex_unlock(&rproc->lock); > + ret = rproc_detach(rproc); > + mutex_lock(&rproc->lock); > + if (ret) > + return ret; > + > + if (atomic_inc_return(&rproc->power) > 1) > + return 0; > + return rproc_attach(rproc); > +} > + > +static int rproc_assisted_recovery(struct rproc *rproc) > +{ > + const struct firmware *firmware_p; > + struct device *dev = &rproc->dev; > + int ret; > + > + ret = rproc_stop(rproc, true); > + if (ret) > + return ret; > + > + /* generate coredump */ > + rproc->ops->coredump(rproc); > + > + /* load firmware */ > + ret = request_firmware(&firmware_p, rproc->firmware, dev); > + if (ret < 0) { > + dev_err(dev, "request_firmware failed: %d\n", ret); > + return ret; > + } > + > + /* boot the remote processor up again */ > + ret = rproc_start(rproc, firmware_p); > + > + release_firmware(firmware_p); > + > + return ret; > +} > + > /** > * rproc_trigger_recovery() - recover a remoteproc > * @rproc: the remote processor > @@ -1901,7 +1944,6 @@ static int __rproc_detach(struct rproc *rproc) > */ > int rproc_trigger_recovery(struct rproc *rproc) > { > - const struct firmware *firmware_p; > struct device *dev = &rproc->dev; > int ret; > > @@ -1915,24 +1957,10 @@ int rproc_trigger_recovery(struct rproc *rproc) > > dev_err(dev, "recovering %s\n", rproc->name); > > - ret = rproc_stop(rproc, true); > - if (ret) > - goto unlock_mutex; > - > - /* generate coredump */ > - rproc->ops->coredump(rproc); > - > - /* load firmware */ > - ret = request_firmware(&firmware_p, rproc->firmware, dev); > - if (ret < 0) { > - dev_err(dev, "request_firmware failed: %d\n", ret); > - goto unlock_mutex; > - } > - > - /* boot the remote processor up again */ > - ret = rproc_start(rproc, firmware_p); > - > - release_firmware(firmware_p); > + if (rproc->self_recovery) > + ret = rproc_self_recovery(rproc); > + else > + ret = rproc_assisted_recovery(rproc); The problem of how to handle crash recoveries for processors that have been attached to is difficult. Finding a solution for that should be on a patchset of its own so that people can provide input. > > unlock_mutex: > mutex_unlock(&rproc->lock); > diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h > index e0600e1e5c17..b32ef46f8aa4 100644 > --- a/include/linux/remoteproc.h > +++ b/include/linux/remoteproc.h > @@ -529,6 +529,7 @@ struct rproc_dump_segment { > * @elf_machine: firmware ELF machine > * @cdev: character device of the rproc > * @cdev_put_on_release: flag to indicate if remoteproc should be shutdown on @char_dev release > + * @self_recovery: flag to indicate if remoteproc support self recovery > */ > struct rproc { > struct list_head node; > @@ -568,6 +569,7 @@ struct rproc { > u16 elf_machine; > struct cdev cdev; > bool cdev_put_on_release; > + bool self_recovery; > }; > > /** > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel