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 X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AD2BC433E0 for ; Tue, 2 Jun 2020 21:42:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3B19920897 for ; Tue, 2 Jun 2020 21:42:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eQZUhilG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728369AbgFBVmW (ORCPT ); Tue, 2 Jun 2020 17:42:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728226AbgFBVmV (ORCPT ); Tue, 2 Jun 2020 17:42:21 -0400 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66CFAC08C5C1 for ; Tue, 2 Jun 2020 14:42:21 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id 64so65108pfg.8 for ; Tue, 02 Jun 2020 14:42:21 -0700 (PDT) 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:user-agent; bh=a+Tcybpto4JW668grhb7VyG9dc5AOW4PN39gIL/jU6c=; b=eQZUhilGkaBHOOoh0h33kjW8acpHdskjmtnr8+p8u3+YcbEBAg1mnBMgsRYMZoUCe/ zjPfbkxvN+R0xfop0+txC9jk+HXsmmPsQAri/yT+qSiMp/zP4q8ZYuZeiXtIlmu0yy4V 3q80mdxcwijwNGit/BeIH9VP4K+Q4v83BqAb+AWyUQY6BMfAzGW2K4T7PlKqeDuY5iOV nc/WN5BlMzRAznAnzRH0k6EZSMN7A+NuZHIjNSlQupvXIJixIiqAGS2H768o0KFPWoHI V+2HWK7ARBBx0NMpK32joI9HR72nwqDdch3DyLjDpgabl65WF4kIlr1r6Ad/stVelagz 2jtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=a+Tcybpto4JW668grhb7VyG9dc5AOW4PN39gIL/jU6c=; b=PyUQ4+JXuLtpyhZP0ozi0aNVl8/+IpbgZJo4w9RGYuTzoXgi23Z5ICLiryxfrnVqSl ElwWU3yImVM2leiCJU6mDliD5GMjZj3iMmd596fgQXLd7muhoSMUqyzIaWh+4XjLOH4v V1E7Q6oAXjubMcdJFC0nDjcnNMhuqN18YbTTUGc5nHxS5OUP+fD9ohcZcNAh2C/fr2AS ly7ipVTpyCmcEpGrFFrrq7dD+jhN1l9IyyqXwrtEAsYb9dkrkoWoD5nrhERCwz50LVht XmpVGvTyiY0qhd/Bc7xNyaKmj+tGp4PvJpq2YXJWXSKSMrfu9U7ZWHcQ01dUPxshhxej b9nQ== X-Gm-Message-State: AOAM530LFRjkTKqRJOiATXDI9YaTmVvOZVf2RutslQA8+uvqvwcrmyTw ZJZlEJMT3l7ohcrsEw5r3OM7iA== X-Google-Smtp-Source: ABdhPJyqXHemvpCIKwQ9neFhznd2BQsaaQXX+YIDY6Y0U/tb+aUdp0BJUy4SV1Eo8wcOC7LdVW+xzA== X-Received: by 2002:a62:86cd:: with SMTP id x196mr19446924pfd.158.1591134140823; Tue, 02 Jun 2020 14:42:20 -0700 (PDT) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m5sm3086044pjn.56.2020.06.02.14.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 14:42:20 -0700 (PDT) Date: Tue, 2 Jun 2020 15:42:18 -0600 From: Mathieu Poirier To: Suman Anna Cc: Bjorn Andersson , Rob Herring , Lokesh Vutla , linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 4/4] remoteproc/k3-dsp: Add support for L2RAM loading on C66x DSPs Message-ID: <20200602214218.GC29840@xps15> References: <20200521001006.2725-1-s-anna@ti.com> <20200521001006.2725-5-s-anna@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200521001006.2725-5-s-anna@ti.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org On Wed, May 20, 2020 at 07:10:06PM -0500, Suman Anna wrote: > The resets for the DSP processors on K3 SoCs are managed through the > Power and Sleep Controller (PSC) module. Each DSP typically has two > resets - a global module reset for powering on the device, and a local > reset that affects only the CPU while allowing access to the other > sub-modules within the DSP processor sub-systems. > > The C66x DSPs have two levels of internal RAMs that can be used to > boot from, and the firmware loading into these RAMs require the > local reset to be asserted with the device powered on/enabled using > the module reset. Enhance the K3 DSP remoteproc driver to add support > for loading into the internal RAMs. The local reset is deasserted on > SoC power-on-reset, so logic has to be added in probe in remoteproc > mode to balance the remoteproc state-machine. > > Note that the local resets are a no-op on C71x cores, and the hardware > does not supporting loading into its internal RAMs. > > Signed-off-by: Suman Anna > --- > v2: > - Dropped the local-reset no-op checks from k3_dsp_rproc_prepare/unprepare() > callbacks. The logic will be adjusted back in the C71 patch series. > - The C71 local reset references are also removed from the comments for the > k3_dsp_rproc_prepare() function. > v1: https://patchwork.kernel.org/patch/11458579/ > > drivers/remoteproc/ti_k3_dsp_remoteproc.c | 72 +++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > Reviewed-by: Mathieu Poirier > diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c > index e4036f5992fe..610fbbf85ee6 100644 > --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c > +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c > @@ -174,6 +174,9 @@ static int k3_dsp_rproc_reset(struct k3_dsp_rproc *kproc) > return ret; > } > > + if (kproc->data->uses_lreset) > + return ret; > + > ret = kproc->ti_sci->ops.dev_ops.put_device(kproc->ti_sci, > kproc->ti_sci_id); > if (ret) { > @@ -191,6 +194,9 @@ static int k3_dsp_rproc_release(struct k3_dsp_rproc *kproc) > struct device *dev = kproc->dev; > int ret; > > + if (kproc->data->uses_lreset) > + goto lreset; > + > ret = kproc->ti_sci->ops.dev_ops.get_device(kproc->ti_sci, > kproc->ti_sci_id); > if (ret) { > @@ -198,6 +204,7 @@ static int k3_dsp_rproc_release(struct k3_dsp_rproc *kproc) > return ret; > } > > +lreset: > ret = reset_control_deassert(kproc->reset); > if (ret) { > dev_err(dev, "local-reset deassert failed, ret = %d\n", ret); > @@ -209,6 +216,53 @@ static int k3_dsp_rproc_release(struct k3_dsp_rproc *kproc) > return ret; > } > > +/* > + * The C66x DSP cores have a local reset that affects only the CPU, and a > + * generic module reset that powers on the device and allows the DSP internal > + * memories to be accessed while the local reset is asserted. This function is > + * used to release the global reset on C66x DSPs to allow loading into the DSP > + * internal RAMs. The .prepare() ops is invoked by remoteproc core before any > + * firmware loading, and is followed by the .start() ops after loading to > + * actually let the C66x DSP cores run. > + */ > +static int k3_dsp_rproc_prepare(struct rproc *rproc) > +{ > + struct k3_dsp_rproc *kproc = rproc->priv; > + struct device *dev = kproc->dev; > + int ret; > + > + ret = kproc->ti_sci->ops.dev_ops.get_device(kproc->ti_sci, > + kproc->ti_sci_id); > + if (ret) > + dev_err(dev, "module-reset deassert failed, cannot enable internal RAM loading, ret = %d\n", > + ret); > + > + return ret; > +} > + > +/* > + * This function implements the .unprepare() ops and performs the complimentary > + * operations to that of the .prepare() ops. The function is used to assert the > + * global reset on applicable C66x cores. This completes the second portion of > + * powering down the C66x DSP cores. The cores themselves are only halted in the > + * .stop() callback through the local reset, and the .unprepare() ops is invoked > + * by the remoteproc core after the remoteproc is stopped to balance the global > + * reset. > + */ > +static int k3_dsp_rproc_unprepare(struct rproc *rproc) > +{ > + struct k3_dsp_rproc *kproc = rproc->priv; > + struct device *dev = kproc->dev; > + int ret; > + > + ret = kproc->ti_sci->ops.dev_ops.put_device(kproc->ti_sci, > + kproc->ti_sci_id); > + if (ret) > + dev_err(dev, "module-reset assert failed, ret = %d\n", ret); > + > + return ret; > +} > + > /* > * Power up the DSP remote processor. > * > @@ -352,6 +406,8 @@ static void *k3_dsp_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len) > } > > static const struct rproc_ops k3_dsp_rproc_ops = { > + .prepare = k3_dsp_rproc_prepare, > + .unprepare = k3_dsp_rproc_unprepare, > .start = k3_dsp_rproc_start, > .stop = k3_dsp_rproc_stop, > .kick = k3_dsp_rproc_kick, > @@ -614,6 +670,22 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) > goto release_tsp; > } > > + /* > + * ensure the DSP local reset is asserted to ensure the DSP doesn't > + * execute bogus code in .prepare() when the module reset is released. > + */ > + if (data->uses_lreset) { > + ret = reset_control_status(kproc->reset); > + if (ret < 0) { > + dev_err(dev, "failed to get reset status, status = %d\n", > + ret); > + goto release_mem; > + } else if (ret == 0) { > + dev_warn(dev, "local reset is deasserted for device\n"); > + k3_dsp_rproc_reset(kproc); > + } > + } > + > ret = rproc_add(rproc); > if (ret) { > dev_err(dev, "failed to add register device with remoteproc core, status = %d\n", > -- > 2.26.0 >