Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Peng Fan <peng.fan@nxp.com>
To:     "Peng Fan (OSS)" <peng.fan@oss.nxp.com>,
        "bjorn.andersson@linaro.org" <bjorn.andersson@linaro.org>,
        "mathieu.poirier@linaro.org" <mathieu.poirier@linaro.org>,
        "linux-remoteproc@vger.kernel.org" <linux-remoteproc@vger.kernel.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH V2] remoteproc: support self recovery after rproc crash
Thread-Topic: [PATCH V2] remoteproc: support self recovery after rproc crash
Thread-Index: AQHYEpIEHEs++qV8cUuKksCGalsIFKyHX5gw
Date:   Mon, 7 Feb 2022 01:31:07 +0000
Message-ID: <DU0PR04MB94176981E1D8F54557317513882C9@DU0PR04MB9417.eurprd04.prod.outlook.com>
References: <20220126085120.3397450-1-peng.fan@oss.nxp.com>
In-Reply-To: <20220126085120.3397450-1-peng.fan@oss.nxp.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?EOn8BucDp42ra5qhTdFhni12cRP4opPdoYt4/gW8frm4Lc4iH2i46JE3LESG?=
 =?us-ascii?Q?JVOkAZot6P43GVn6a3TeUKKS5ViqO4+6Y+l4XHalK7cD7DmdWuVmgAbNenn8?=
 =?us-ascii?Q?atzRj0gOpNgnnuGwIX22WNZIPLJDpWwzqFvbuS28vb0dDDVWIM1Qu4pumStm?=
 =?us-ascii?Q?Fcgch6px570T5kpdzRG9gMsFuzFon/VCMtwDMn1HGBDLU62onCH5NiacTDdK?=
 =?us-ascii?Q?2KKzBl1RSelMZzw6GE86EKMQNO5zjPkEPHPu11lYCw+rUpL2idbEyweI+lya?=
 =?us-ascii?Q?zpm6AR8CV1WLWKYZZXycbwLOZlSl3LulKY1X7L6d/wS1NFnpgsftfI+OMQ06?=
 =?us-ascii?Q?M2jLlxWa1enMdMghJzU/kBj9XqHKA2J3OR7hkZIda37Am55J9OutRGEmz/Dd?=
 =?us-ascii?Q?u96aVXbvwTk0GAVS5VoK4NmA9jXGhDSi0q6WOomCtxPOS637ROV5JuTNnN7Q?=
 =?us-ascii?Q?wki+hZFUgcpzZ43rARSzunEyoxhFm7CKQDNp+Xe7Zbxl3IlYZgH3l5/NDIuP?=
 =?us-ascii?Q?6WiooiZUeqdsPUjo9fQsZ9rVfjZkJeLE+J/qqFZ4O4N8vJMC5USfp1UL7a5g?=
 =?us-ascii?Q?dt4tQWTCayoSqYpHysZyPKSoXEExTMPU+wd0nvkQ1zxvaH4/RtWIGtEfDdxR?=
 =?us-ascii?Q?O8B4VlS7xyeGnMsDYP9cIsqFFfNeXRm0ASNXyySZtmoctNYULkoJdcjSxwTI?=
 =?us-ascii?Q?FpmgsbBD/eAOIJrzfJ/b+ZrJCf9h1uTUKs7wMh0/LSBRvlpJ13+GLpZwvZ7d?=
 =?us-ascii?Q?rhEFNcm37FSEvFtNADmrfeSa72L3uKOKAMDCGyquj3IGYJYQ/tSMZV7RcoQQ?=
 =?us-ascii?Q?M2xNwhd1z6rr4ZRuHHXKxt7rtnhO5s5PnI4vUI+Anbi4SYiK8SADeHJsC4Py?=
 =?us-ascii?Q?wzKprE+jwsN55HkEAslZ5MNOA7Utp1YmxMgGqIb+1zKwtPt/loDVKTAqsen0?=
 =?us-ascii?Q?1FPya9h6cBGj2n2FekY9FFRwe1ceO1sZYcXkXiMDqZkfuexxrEFIztYH2c6H?=
 =?us-ascii?Q?WP8jDmlk3grSUuUK6rAGFVYgO33mC7F7Pl0vKLWASyNMZChcz63LD+xU5DJt?=
 =?us-ascii?Q?aS1le00hS0TA2o21SzEem3iBHehxrQ/y+WXfOl+7uyAqjfKrIMnpnKfduSYO?=
 =?us-ascii?Q?MVKEeEfPEWYj57GdMvMzLFLWw2TXxD3YRhMzG6rjiTrS9xu1R9RJ+wTNgemZ?=
 =?us-ascii?Q?5K7ilHNEG6AmoqpyyXs7xtbHdeE0mTo97GOJoRsZeGhDWn3D1sjy17YqMQpT?=
 =?us-ascii?Q?MgQ2/T6VOJtl87ZFZzVKwUIDUlUX9vLiDBdXSobFH05KTjE4nMKBLITt9PPZ?=
 =?us-ascii?Q?AtFR2ckfpKiMn0wDncZQYJsCLgX+OitT/kYdZbnFi1jcMqG3XjSQTfj0oqTR?=
 =?us-ascii?Q?DcU6nk7gK2Dvln09Imr9d4nYIgiqJmxyaL88vsZ21cVNok2mZ9pb3c51oNDR?=
 =?us-ascii?Q?xbqdgQhCyJjUwHe/Mq7p6NOtmf0NbYbjxKxKs0yPgrKGqLst7zFeGRu7SquM?=
 =?us-ascii?Q?9XJO/Lc5LqzRO6r2MzC9xt1ebpTatv0BUy7/FriNTdK5idvK1ajuX64G8d6+?=
 =?us-ascii?Q?kCPp6d0/tgqd4hvXK6fO34TGGnG1/k1oQM6KEnD5tJSvxX0v5eLvOJ5rFAxD?=
 =?us-ascii?Q?9A=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 60acae19-6675-4489-42fe-08d9e9d9838a
X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2022 01:31:07.2438
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: NZLrWHUAFUZc+HWqAFYtmVprQqpkjXtQuhQj8ePOzaBpT/F6xgIM5jI15iip7TcLcVOyNIjzbF4rNNqRxQsTvQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9495
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> Subject: [PATCH V2] remoteproc: support self recovery after rproc crash

Any comments?

Thanks,
Peng.

>=20
> From: Peng Fan <peng.fan@nxp.com>
>=20
> Current logic only support main processor to stop/start the remote proces=
sor
> 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.
>=20
> 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 wi=
thou
> help. To self recovery, we only do detach and attach.
>=20
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>=20
> V2:
>  Nothing change in V2.
>  Only move this patch out from
>  https://patchwork.kernel.org/project/linux-remoteproc/list/?series=3D604=
364
>=20
>  drivers/remoteproc/remoteproc_core.c | 66 ++++++++++++++++++++--------
>  include/linux/remoteproc.h           |  2 +
>  2 files changed, 49 insertions(+), 19 deletions(-)
>=20
> 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;
>  }
>=20
> +static int rproc_self_recovery(struct rproc *rproc) {
> +	int ret;
> +
> +	mutex_unlock(&rproc->lock);
> +	ret =3D 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 =3D &rproc->dev;
> +	int ret;
> +
> +	ret =3D rproc_stop(rproc, true);
> +	if (ret)
> +		return ret;
> +
> +	/* generate coredump */
> +	rproc->ops->coredump(rproc);
> +
> +	/* load firmware */
> +	ret =3D 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 =3D 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 =3D &rproc->dev;
>  	int ret;
>=20
> @@ -1915,24 +1957,10 @@ int rproc_trigger_recovery(struct rproc *rproc)
>=20
>  	dev_err(dev, "recovering %s\n", rproc->name);
>=20
> -	ret =3D rproc_stop(rproc, true);
> -	if (ret)
> -		goto unlock_mutex;
> -
> -	/* generate coredump */
> -	rproc->ops->coredump(rproc);
> -
> -	/* load firmware */
> -	ret =3D 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 =3D rproc_start(rproc, firmware_p);
> -
> -	release_firmware(firmware_p);
> +	if (rproc->self_recovery)
> +		ret =3D rproc_self_recovery(rproc);
> +	else
> +		ret =3D rproc_assisted_recovery(rproc);
>=20
>  unlock_mutex:
>  	mutex_unlock(&rproc->lock);
> diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h inde=
x
> 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;
>  };
>=20
>  /**
> --
> 2.25.1