Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Peng Fan <peng.fan@nxp.com>
To:     Mathieu Poirier <mathieu.poirier@linaro.org>,
        "bjorn.andersson@linaro.org" <bjorn.andersson@linaro.org>,
        "ohad@wizery.com" <ohad@wizery.com>
CC:     "linux-remoteproc@vger.kernel.org" <linux-remoteproc@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 12/13] remoteproc: Refactor rproc delete and cdev release
 path
Thread-Topic: [PATCH 12/13] remoteproc: Refactor rproc delete and cdev release
 path
Thread-Index: AQHWe8ifBTo7u9IA2UasNKAco1Rai6mYPt/Q
Date:   Thu, 15 Oct 2020 02:31:21 +0000
Message-ID: <DB6PR0402MB276062C22F68E533AD9BAC7488020@DB6PR0402MB2760.eurprd04.prod.outlook.com>
References: <20200826164529.224476-1-mathieu.poirier@linaro.org>
 <20200826164529.224476-13-mathieu.poirier@linaro.org>
In-Reply-To: <20200826164529.224476-13-mathieu.poirier@linaro.org>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 22b01616-7059-4256-a3c3-08d870b2674a
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Oct 2020 02:31:21.1470
 (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: WTXMDz5QZK8ySJV1pSTOk5cM8wS3rhd/8jgwbAFnWeF6RJVuKJgVCCOnQiqSYKXQGZObiJFcRQaCqV1U13EHQQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6618
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> Subject: [PATCH 12/13] remoteproc: Refactor rproc delete and cdev release
> path
>=20
> Refactor function rproc_del() and rproc_cdev_release() to take into accou=
nt
> scenarios where the remote processor has been attached to.  If the remote
> processor has been started by the remoteproc core then switch it off, and=
 if it
> was attached to detach from it. This heuristic is simple and can be enhan=
ced
> easily if there is a need to.
>=20
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
>  drivers/remoteproc/remoteproc_cdev.c | 7 ++++++-
> drivers/remoteproc/remoteproc_core.c | 5 ++++-
>  2 files changed, 10 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/remoteproc/remoteproc_cdev.c
> b/drivers/remoteproc/remoteproc_cdev.c
> index 3a3830e27050..18cffbe588c1 100644
> --- a/drivers/remoteproc/remoteproc_cdev.c
> +++ b/drivers/remoteproc/remoteproc_cdev.c
> @@ -87,8 +87,13 @@ static int rproc_cdev_release(struct inode *inode,
> struct file *filp)  {
>  	struct rproc *rproc =3D container_of(inode->i_cdev, struct rproc, cdev)=
;
>=20
> -	if (rproc->cdev_put_on_release && rproc->state =3D=3D RPROC_RUNNING)
> +	if (!rproc->cdev_put_on_release)
> +		return 0;
> +
> +	if (rproc->state =3D=3D RPROC_RUNNING)
>  		rproc_shutdown(rproc);
> +	else if (rproc->state =3D=3D RPROC_ATTACHED)
> +		rproc_detach(rproc);
>=20
>  	return 0;
>  }
> diff --git a/drivers/remoteproc/remoteproc_core.c
> b/drivers/remoteproc/remoteproc_core.c
> index 95bb40b4ebb3..5586582f54c5 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -2346,7 +2346,10 @@ int rproc_del(struct rproc *rproc)
>  		return -EINVAL;
>=20
>  	/* TODO: make sure this works with rproc->power > 1 */
> -	rproc_shutdown(rproc);
> +	if (rproc->state =3D=3D RPROC_RUNNING)
> +		rproc_shutdown(rproc);
> +	else if (rproc->state =3D=3D RPROC_ATTACHED)
> +		rproc_detach(rproc);
>=20
>  	mutex_lock(&rproc->lock);
>  	rproc->state =3D RPROC_DELETED;
> --
Reviewed-by: Peng Fan <peng.fan@nxp.com>