From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 985E926F45F for ; Tue, 1 Jul 2025 14:27:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751380035; cv=none; b=F8zACVk+kevaGezaOuxxKbJNRuu/FSnZwFAntzOnF0ZHt+4JL4RsVE6Un2Wsp3jHr4R7LfyAKGd2ol+evpG3diDcZQx5gH4VQsRfcAEjZzxowbz6vmakJS5FxZyOfydD7qoa90n/S4Vh6psuui8iN6P7dp5Vw85Y5AmJYO68KiE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751380035; c=relaxed/simple; bh=9XcgClbbwQjBFqj9Pb6TKTEF7hl9jxfi0SkLdentSys=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=QkzOYbb2p1dIlQQr03W8UAWhnyPfdEIbou1dq22Duocw9U8l4oy7BnsVBpSQgkvOL1SXW+jK664cO+ReM4xcyT+JCvLHL6kopfs/SA0GYzC2mvin2uJMrOoAkhkBQ7giTJUrT4h79nT+OWxOpjVAdglR1xDSWBEH+I+O1P+1gkI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=qvj7kjYz; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="qvj7kjYz" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-749068b9b63so4211425b3a.0 for ; Tue, 01 Jul 2025 07:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1751380033; x=1751984833; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=D/LzDFUd08uVqn1UnqBLix0fV11YVLJxk07IbCif910=; b=qvj7kjYziKr3bm4UaVXxHTwoXwEC/Lw6sBbzmjEywp8iXF2bUwP40Ol26fO13ftPAV ltAOei6RoNYKd5N1r5wdRw6X4+IZc9X6IjNlEpKUaXz4Nz5eYkL/p+hsUJn9kvMFkyNI l+o5CMbA4QCjrpwBQWpcSlWZ6JdvS/wBkxhkPV3gdQm0nKoIXxRKRxurC9hpEZVibQip NWDiHKJFxmS/dXhQq4U3Pj5A3gM+CkXiVZB2WuCwJA0SYO8XbiJv5jQOHKzowpYuvVTH TwyTE5/e9EBV6qTztvJYITQPzP5fJ/4XjTHi8AguDLPEdMs2gqVidpIwGVT/TQYg+xx2 qJQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751380033; x=1751984833; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D/LzDFUd08uVqn1UnqBLix0fV11YVLJxk07IbCif910=; b=EqEcWG6CxbIKB1lG0t0zVF/Hutr+r6cu2regzrxf8GBxnekeQ32Yf3wOhpsUF5m7TY 2fa4STSUTbQVT8AubCNHYblDmrl5FIMrBMr2fzuKDzhH4eTL5RqkrVr/JpnJC0lB+3i0 HXx2pCKUavyHEJJHFxF4i0Q41qjTcG9tgZ1rNBEyOFyAJ004d7ZnVUXGBl8dIfmz13GO YspnIPQO+ueZBwKmxhDi0UvTYao2TAOiXft5uCEvU5GWBpuyJkp+p+VX4M7dypgpWzfm KNjCdEoiIvXLhfC5IN0oTnr1sxDJb1ktQxadPjg+iRfSVrAS1YmZi+C9M8jQaXkjm3sO yLoQ== X-Forwarded-Encrypted: i=1; AJvYcCXwnty0nwNneN194MkfEBMtqytcAlthZ5At31mARjFw2NJmjc3HJd2dv3vTJVBlD0B4HDzNSXBUNSgF704=@vger.kernel.org X-Gm-Message-State: AOJu0YxUoAbcYX7q6nkP613bUHmFTD/WMk1omxBEMVvF+1J6iaz2qaZZ pk3kPq6Uo0aGBKVtz7Ymspka41ULb9hYKeHW7ebkkItwAOrzKjxtOk6s9Eke0z4+h+E= X-Gm-Gg: ASbGnctbfDnjpRoAqo/MZg1PFEZ4cNiqrKRWrLsjneuz3uFwH+jOommnwRsX0ALDWlU 2TFGVT/KzRM6f5mws8+9iIi35cOu4dojsve00CZo4Q76ihhAcNbpJg6pArYkpUIvmhBUiCOg8Wi dW5Py8w8PdsqerzW0YS2dBhnju/mm+saT4hGhnOhvIczQy0ROVxPH6kMJ4+ngla4H8nVu1XTwE9 dsqRoiKVkpHEtQgfSLhLsVwo2VbAhziOu843CkH5pj75vH3NiIsN731BH569zjheHTqe1QMHZ83 jRsDalgXJJ2lj4mSdALZCwCf9SOUx5hoheiw4y+pC4HxXC63D9kFN0x5hDIjslBssInJB1l9PaX w X-Google-Smtp-Source: AGHT+IHWDplP+mSvwBbgNyXECwNqolDcVKxeCipzxq0AEnaLJRzr3NaK42vQj7ZRYIVHVNCBCyQvdA== X-Received: by 2002:a05:6a00:3a0f:b0:748:f3b0:4db6 with SMTP id d2e1a72fcca58-74af6f4a507mr24062703b3a.11.1751380032554; Tue, 01 Jul 2025 07:27:12 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:94b9:2bc2:7ead:7a72]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af5580fb6sm11294397b3a.89.2025.07.01.07.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jul 2025 07:27:12 -0700 (PDT) Date: Tue, 1 Jul 2025 08:27:09 -0600 From: Mathieu Poirier To: Shengjiu Wang Cc: Shengjiu Wang , andersson@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] remoteproc: imx_dsp_rproc: Add support of recovery process Message-ID: References: <20250618062644.3895785-1-shengjiu.wang@nxp.com> <20250618062644.3895785-2-shengjiu.wang@nxp.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Tue, Jul 01, 2025 at 10:16:21AM +0800, Shengjiu Wang wrote: > On Tue, Jul 1, 2025 at 12:49 AM Mathieu Poirier > wrote: > > > > On Thu, Jun 26, 2025 at 09:32:06AM +0800, Shengjiu Wang wrote: > > > On Wed, Jun 25, 2025 at 10:39 PM Mathieu Poirier > > > wrote: > > > > > > > > On Tue, 24 Jun 2025 at 21:25, Shengjiu Wang wrote: > > > > > > > > > > On Mon, Jun 23, 2025 at 11:11 PM Mathieu Poirier > > > > > wrote: > > > > > > > > > > > > Good day, > > > > > > > > > > > > On Wed, Jun 18, 2025 at 02:26:43PM +0800, Shengjiu Wang wrote: > > > > > > > when recovery is triggered, rproc_stop() is called first then > > > > > > > rproc_start(), but there is no rproc_unprepare_device() and > > > > > > > rproc_prepare_device() in the flow. > > > > > > > > > > > > > > So power enablement needs to be moved from prepare callback to start > > > > > > > callback, power disablement needs to be moved from unprepare callback > > > > > > > to stop callback, loading elf function also needs to be moved to start > > > > > > > callback, the load callback only store the firmware handler. > > > > > > > > > > > > > > Signed-off-by: Shengjiu Wang > > > > > > > --- > > > > > > > drivers/remoteproc/imx_dsp_rproc.c | 58 ++++++++++++++++++------------ > > > > > > > 1 file changed, 36 insertions(+), 22 deletions(-) > > > > > > > > > > > > > > diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c > > > > > > > index 5ee622bf5352..9b9cddb224b0 100644 > > > > > > > --- a/drivers/remoteproc/imx_dsp_rproc.c > > > > > > > +++ b/drivers/remoteproc/imx_dsp_rproc.c > > > > > > > @@ -122,6 +122,7 @@ enum imx_dsp_rp_mbox_messages { > > > > > > > * @ipc_handle: System Control Unit ipc handle > > > > > > > * @rproc_work: work for processing virtio interrupts > > > > > > > * @pm_comp: completion primitive to sync for suspend response > > > > > > > + * @firmware: firmware handler > > > > > > > * @flags: control flags > > > > > > > */ > > > > > > > struct imx_dsp_rproc { > > > > > > > @@ -139,6 +140,7 @@ struct imx_dsp_rproc { > > > > > > > struct imx_sc_ipc *ipc_handle; > > > > > > > struct work_struct rproc_work; > > > > > > > struct completion pm_comp; > > > > > > > + const struct firmware *firmware; > > > > > > > u32 flags; > > > > > > > }; > > > > > > > > > > > > > > @@ -211,6 +213,7 @@ static const struct imx_rproc_att imx_dsp_rproc_att_imx8ulp[] = { > > > > > > > > > > > > > > /* Initialize the mailboxes between cores, if exists */ > > > > > > > static int (*imx_dsp_rproc_mbox_init)(struct imx_dsp_rproc *priv); > > > > > > > +static int imx_dsp_rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw); > > > > > > > > > > > > > > /* Reset function for DSP on i.MX8MP */ > > > > > > > static int imx8mp_dsp_reset(struct imx_dsp_rproc *priv) > > > > > > > @@ -402,8 +405,24 @@ static int imx_dsp_rproc_start(struct rproc *rproc) > > > > > > > const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg; > > > > > > > const struct imx_rproc_dcfg *dcfg = dsp_dcfg->dcfg; > > > > > > > struct device *dev = rproc->dev.parent; > > > > > > > + struct rproc_mem_entry *carveout; > > > > > > > int ret; > > > > > > > > > > > > > > + pm_runtime_get_sync(dev); > > > > > > > + > > > > > > > + /* > > > > > > > + * Clear buffers after pm rumtime for internal ocram is not > > > > > > > + * accessible if power and clock are not enabled. > > > > > > > + */ > > > > > > > + list_for_each_entry(carveout, &rproc->carveouts, node) { > > > > > > > + if (carveout->va) > > > > > > > + memset(carveout->va, 0, carveout->len); > > > > > > > + } > > > > > > > + > > > > > > > + ret = imx_dsp_rproc_elf_load_segments(rproc, priv->firmware); > > > > > > > + if (ret) > > > > > > > + return ret; > > > > > > > + > > > > > > > switch (dcfg->method) { > > > > > > > case IMX_RPROC_MMIO: > > > > > > > ret = regmap_update_bits(priv->regmap, > > > > > > > @@ -446,6 +465,7 @@ static int imx_dsp_rproc_stop(struct rproc *rproc) > > > > > > > > > > > > > > if (rproc->state == RPROC_CRASHED) { > > > > > > > priv->flags &= ~REMOTE_IS_READY; > > > > > > > + pm_runtime_put_sync(dev); > > > > > > > > > > > > From this patch I understand that for a recovery to be successful, the > > > > > > remote processor _has_ to go through a hard reset. But here the PM runtime API > > > > > > is used, meaning the remote processor won't be switched off if another device in > > > > > > the same power domain still neeeds power. If that is the case, the solution in > > > > > > tihs patch won't work. > > > > > > > > > > Thanks for reviewing. > > > > > With the case you mentioned, there is software reset to make the > > > > > recovery process work. > > > > > > > > > > > > Are you talking about a manual software reset of some other mechanism? > > > > > > > > If manual software reset, the recovery may or may not work and we > > > > simply don't know when that might be. If it's another mechanism, then > > > > that mechanism should be used in all cases. Either way, I don't see > > > > how we can move forward with this patch. > > > > > > Not manual software reset, in this driver we registered .reset() function. > > > it has been called at imx_dsp_runtime_resume(), I paste the function below. > > > > > > And I have tested the case you mentioned, the recovery works. > > > > > > /* pm runtime functions */ > > > static int imx_dsp_runtime_resume(struct device *dev) > > > { > > > struct rproc *rproc = dev_get_drvdata(dev); > > > struct imx_dsp_rproc *priv = rproc->priv; > > > const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg; > > > int ret; > > > > > > /* > > > * There is power domain attached with mailbox, if setup mailbox > > > * in probe(), then the power of mailbox is always enabled, > > > * the power can't be saved. > > > * So move setup of mailbox to runtime resume. > > > */ > > > ret = imx_dsp_rproc_mbox_init(priv); > > > if (ret) { > > > dev_err(dev, "failed on imx_dsp_rproc_mbox_init\n"); > > > return ret; > > > } > > > > > > ret = clk_bulk_prepare_enable(DSP_RPROC_CLK_MAX, priv->clks); > > > if (ret) { > > > dev_err(dev, "failed on clk_bulk_prepare_enable\n"); > > > return ret; > > > } > > > > > > /* Reset DSP if needed */ > > > if (dsp_dcfg->reset) > > > dsp_dcfg->reset(priv); > > > > > > return 0; > > > } > > > > > > > Thanks for the clarification. I would have been nice to have that kind of > > explanation (not the copy paste of the imx_dsp_runtime_resume() function) in the > > changelog. > > Ok, will add it. > > > > > That said, that is just one aspect of the things I find bizarre with this > > patchset - see below. > > > > > > > > > > > > > > > > > > > > > best regards > > > > > Shengjiu Wang > > > > > > > > > > > > > > > > > Thanks, > > > > > > Mathieu > > > > > > > > > > > > > return 0; > > > > > > > } > > > > > > > > > > > > > > @@ -472,6 +492,8 @@ static int imx_dsp_rproc_stop(struct rproc *rproc) > > > > > > > else > > > > > > > priv->flags &= ~REMOTE_IS_READY; > > > > > > > > > > > > > > + pm_runtime_put_sync(dev); > > > > > > > + > > > > > > > return ret; > > > > > > > } > > > > > > > > > > > > > > @@ -774,7 +796,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc) > > > > > > > { > > > > > > > struct imx_dsp_rproc *priv = rproc->priv; > > > > > > > struct device *dev = rproc->dev.parent; > > > > > > > - struct rproc_mem_entry *carveout; > > > > > > > int ret; > > > > > > > > > > > > > > ret = imx_dsp_rproc_add_carveout(priv); > > > > > > > @@ -783,25 +804,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc) > > > > > > > return ret; > > > > > > > } > > > > > > > > > > > > > > - pm_runtime_get_sync(dev); > > > > > > > - > > > > > > > - /* > > > > > > > - * Clear buffers after pm rumtime for internal ocram is not > > > > > > > - * accessible if power and clock are not enabled. > > > > > > > - */ > > > > > > > - list_for_each_entry(carveout, &rproc->carveouts, node) { > > > > > > > - if (carveout->va) > > > > > > > - memset(carveout->va, 0, carveout->len); > > > > > > > - } > > > > > > > - > > > > > > > - return 0; > > > > > > > -} > > > > > > > - > > > > > > > -/* Unprepare function for rproc_ops */ > > > > > > > -static int imx_dsp_rproc_unprepare(struct rproc *rproc) > > > > > > > -{ > > > > > > > - pm_runtime_put_sync(rproc->dev.parent); > > > > > > > - > > > > > > > return 0; > > > > > > > } > > > > > > > > > > > > > > @@ -1022,13 +1024,25 @@ static int imx_dsp_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw > > > > > > > return 0; > > > > > > > } > > > > > > > > > > > > > > +static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw) > > > > > > > +{ > > > > > > > + struct imx_dsp_rproc *priv = rproc->priv; > > > > > > > + > > > > > > > + /* > > > > > > > + * Just save the fw handler, the firmware loading will be after > > > > > > > + * power enabled > > > > > > > + */ > > > > > > > + priv->firmware = fw; > > > > > > > + > > > > Why is a new firwmare variable needed? Why can't you just use rproc->firmware? > > The "firmware" in "rproc->firmware" is "const char *firmware;" > * @firmware: name of firmware file to be loaded > > But "const struct firmware *fw" is the result after request_firmware() > ret = request_firmware(&firmware_p, rproc->firmware, dev); > "firmware_p" is the "fw". Ah yes, of course. > > As the remoteproc_core.c has called request_firmware(), so we don't need to call > the request_firmware() again. so use the new "const struct firmware > *firmware;" for > saving the "fw". > > Best regards > Shengjiu Wang > > > > > > > > > + return 0; > > > > > > > +} > > > > > > > + > > > > > > > static const struct rproc_ops imx_dsp_rproc_ops = { > > > > > > > .prepare = imx_dsp_rproc_prepare, > > > > > > > - .unprepare = imx_dsp_rproc_unprepare, > > > > > > > .start = imx_dsp_rproc_start, > > > > > > > .stop = imx_dsp_rproc_stop, > > > > > > > .kick = imx_dsp_rproc_kick, > > > > > > > - .load = imx_dsp_rproc_elf_load_segments, > > > > > > > + .load = imx_dsp_rproc_load, > > > > > > > .parse_fw = imx_dsp_rproc_parse_fw, > > > > > > > .handle_rsc = imx_dsp_rproc_handle_rsc, > > > > > > > .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, > > > > > > > -- > > > > > > > 2.34.1 > > > > > > > > > > > > >