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 25217EED616 for ; Thu, 12 Sep 2024 15:42:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UX3TDD1wg3fmZECxkbsHACOqCzp6B1JzxKfaMLm2U8M=; b=DcLgBX2Alj+JyBBcZCp+F2R9T6 /TCwTA8E+bRy+tf2E3qgALYiyysRH9VSmlgaqr2HkvPCOxZs6yTtKFp50admPRO1C1bJRA1L1E9d8 Mew946FhDMAsYdI9LIy3Cq90VDj5FEMd2G+JE5dE/zAsHSSOhIQX9wF5Ld5U0+nghmRohuM1hXNny ckyU995rAXuiS6PcyABzAE0m0enCWM1GWy2nvGqFbz5vFz51z9nJBUxsJytR1Yc0Dh4cJtjxfelNE PwfSPrGni/VkEwaDeaGCHx8mAxdFtrIGQF1pZorCap2Eo0FUKYWANZlmfEuWgJjMwSCXO+4q2bfDW uv71AwtA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1solxz-0000000DbL5-0UTW; Thu, 12 Sep 2024 15:42:43 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1solwm-0000000Db60-3ISX for linux-arm-kernel@lists.infradead.org; Thu, 12 Sep 2024 15:41:30 +0000 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-20543fdb7acso9664245ad.1 for ; Thu, 12 Sep 2024 08:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726155687; x=1726760487; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=UX3TDD1wg3fmZECxkbsHACOqCzp6B1JzxKfaMLm2U8M=; b=wpo1fVXT7KGfcq8+eHTEIKYod1MCJfvheWRXvB/np/3Kh3z+CQ1J+H4NElQCpOsOGW w/zkt4BISJ01AOzQZlnfmmga7rKEv5YeD5Z8PA3i0KnLUJMB7u+kTKfcIfBuQzlxb8Jr xjWLHOCUIzQ3zEJ1W9e1f+ey+0T5x9Rv+6tQoK7V6vnOtaxvLcP1STngYgDSW6B4nkpb cO/+sYTJvd8DWO546feiJrLHIncLvkl8L0C9ov8xAabfu0LoH78cRf2HEvmJebsr0+mm uj3ZXI2QJjxn0mNZGOiySV6Autl9nt3vYpKw3h8DjTRp/ziK7FznbdvCkUXDsIT5IORq Vs2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726155687; x=1726760487; h=in-reply-to: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=UX3TDD1wg3fmZECxkbsHACOqCzp6B1JzxKfaMLm2U8M=; b=aDef2OyrXW2WFl7JcMIqMWxFNPfsiZSvY04nJzTBELaEhOzzxrxchXxyYnTXvrsDMl TWeyKbkD8CMzLgZ9rLxdyYjVM31FJfke0zMz70MXf/oLuDFXiwd6jry89yruRnBT2mNh GZdJgB6NIDFqiaOpB8PTC3a5YTI9ciuavIwkS4oMUUqhEC7FufYnkzVdW6Yg1ji0tWXV SVLrJIg04MFDhiwREqnqZG9ymdbHEs6ro0hQuPIgiHZ93Mk1TfMsaw3Y/B3AuuPRyzcZ 4WjzAXq3pP39b3fMDKYQ5bjsjUVKm0DbdEilINmvaCrYNAOkJmxIa0pO5RGQIXaXJox+ QJsw== X-Forwarded-Encrypted: i=1; AJvYcCWFCJhnMGUzYu1gXYtgRw5/6tNuWYbre8yLtKjaOQOwRMuLBoUt10LC6b/gZ5HF9U1hiIU41mbrntq+/tIN8m4w@lists.infradead.org X-Gm-Message-State: AOJu0YwnKuRi6FHIBLGRQpt0lpGeaZBOC+aA4duJKTF4MaIom8efiabp z3mP3gJPNhDwoGplUXRWjTNsRAJKBHc2EGttgndDu9zCUh2VUmKaIjb3cPdSyd8= X-Google-Smtp-Source: AGHT+IFagW7EpGoI8wKxQY38cWVqzvg3XfqIXD61efl4qhGkGiSohPvpLEyd4ziYpx5dvCOQgOsAAQ== X-Received: by 2002:a17:903:32c3:b0:206:ca91:1dd6 with SMTP id d9443c01a7336-2076e315569mr46690225ad.9.1726155687450; Thu, 12 Sep 2024 08:41:27 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:a82e:e104:d822:3d3c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2076afdd672sm15667935ad.156.2024.09.12.08.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 08:41:26 -0700 (PDT) Date: Thu, 12 Sep 2024 09:41:23 -0600 From: Mathieu Poirier To: Arnaud Pouliquen Cc: Bjorn Andersson , Jens Wiklander , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org, devicetree@vger.kernel.org Subject: Re: [PATCH v9 6/7] remoteproc: stm32: Create sub-functions to request shutdown and release Message-ID: References: <20240830095147.3538047-1-arnaud.pouliquen@foss.st.com> <20240830095147.3538047-7-arnaud.pouliquen@foss.st.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240830095147.3538047-7-arnaud.pouliquen@foss.st.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240912_084128_865887_E4DE9DBC X-CRM114-Status: GOOD ( 27.17 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Aug 30, 2024 at 11:51:46AM +0200, Arnaud Pouliquen wrote: > To prepare for the support of TEE remoteproc, create sub-functions > that can be used in both cases, with and without remoteproc TEE support. > > Signed-off-by: Arnaud Pouliquen > --- > drivers/remoteproc/stm32_rproc.c | 84 +++++++++++++++++++------------- > 1 file changed, 51 insertions(+), 33 deletions(-) > > diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c > index 8c7f7950b80e..79c638936163 100644 > --- a/drivers/remoteproc/stm32_rproc.c > +++ b/drivers/remoteproc/stm32_rproc.c > @@ -209,6 +209,54 @@ static int stm32_rproc_mbox_idx(struct rproc *rproc, const unsigned char *name) > return -EINVAL; > } > > +static void stm32_rproc_request_shutdown(struct rproc *rproc) > +{ > + struct stm32_rproc *ddata = rproc->priv; > + int err, dummy_data, idx; > + > + /* Request shutdown of the remote processor */ > + if (rproc->state != RPROC_OFFLINE && rproc->state != RPROC_CRASHED) { > + idx = stm32_rproc_mbox_idx(rproc, STM32_MBX_SHUTDOWN); > + if (idx >= 0 && ddata->mb[idx].chan) { > + /* A dummy data is sent to allow to block on transmit. */ > + err = mbox_send_message(ddata->mb[idx].chan, > + &dummy_data); When refactoring functions, please do not change the inner code. Here @dummy_data was introduced. Making changes, even small ones, makes it really hard to review your work. I'm pretty sure we talked about that before. > + if (err < 0) > + dev_warn(&rproc->dev, "warning: remote FW shutdown without ack\n"); > + } > + } > +} > + > +static int stm32_rproc_release(struct rproc *rproc) > +{ > + struct stm32_rproc *ddata = rproc->priv; > + unsigned int err = 0; > + > + /* To allow platform Standby power mode, set remote proc Deep Sleep. */ > + if (ddata->pdds.map) { > + err = regmap_update_bits(ddata->pdds.map, ddata->pdds.reg, > + ddata->pdds.mask, 1); > + if (err) { > + dev_err(&rproc->dev, "failed to set pdds\n"); > + return err; > + } > + } > + > + /* Update coprocessor state to OFF if available. */ > + if (ddata->m4_state.map) { > + err = regmap_update_bits(ddata->m4_state.map, > + ddata->m4_state.reg, > + ddata->m4_state.mask, > + M4_STATE_OFF); > + if (err) { > + dev_err(&rproc->dev, "failed to set copro state\n"); > + return err; > + } > + } > + > + return 0; > +} > + > static int stm32_rproc_prepare(struct rproc *rproc) > { > struct device *dev = rproc->dev.parent; > @@ -519,17 +567,9 @@ static int stm32_rproc_detach(struct rproc *rproc) > static int stm32_rproc_stop(struct rproc *rproc) > { > struct stm32_rproc *ddata = rproc->priv; > - int err, idx; > + int err; > > - /* request shutdown of the remote processor */ > - if (rproc->state != RPROC_OFFLINE && rproc->state != RPROC_CRASHED) { > - idx = stm32_rproc_mbox_idx(rproc, STM32_MBX_SHUTDOWN); > - if (idx >= 0 && ddata->mb[idx].chan) { > - err = mbox_send_message(ddata->mb[idx].chan, "detach"); > - if (err < 0) > - dev_warn(&rproc->dev, "warning: remote FW shutdown without ack\n"); > - } > - } > + stm32_rproc_request_shutdown(rproc); > > err = stm32_rproc_set_hold_boot(rproc, true); > if (err) > @@ -541,29 +581,7 @@ static int stm32_rproc_stop(struct rproc *rproc) > return err; > } > > - /* to allow platform Standby power mode, set remote proc Deep Sleep */ > - if (ddata->pdds.map) { > - err = regmap_update_bits(ddata->pdds.map, ddata->pdds.reg, > - ddata->pdds.mask, 1); > - if (err) { > - dev_err(&rproc->dev, "failed to set pdds\n"); > - return err; > - } > - } > - > - /* update coprocessor state to OFF if available */ > - if (ddata->m4_state.map) { > - err = regmap_update_bits(ddata->m4_state.map, > - ddata->m4_state.reg, > - ddata->m4_state.mask, > - M4_STATE_OFF); > - if (err) { > - dev_err(&rproc->dev, "failed to set copro state\n"); > - return err; > - } > - } > - > - return 0; > + return stm32_rproc_release(rproc); > } > > static void stm32_rproc_kick(struct rproc *rproc, int vqid) > -- > 2.25.1 >