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,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 967B8C43603 for ; Wed, 18 Dec 2019 21:31:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B2EE2176D for ; Wed, 18 Dec 2019 21:31:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tTgvCHxn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726633AbfLRVb4 (ORCPT ); Wed, 18 Dec 2019 16:31:56 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:47069 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726212AbfLRVb4 (ORCPT ); Wed, 18 Dec 2019 16:31:56 -0500 Received: by mail-pg1-f195.google.com with SMTP id z124so1928165pgb.13 for ; Wed, 18 Dec 2019 13:31:55 -0800 (PST) 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=dTCf+pryD2m4f95wnd2OQRt+bPmqhfTCioinpIRkPkc=; b=tTgvCHxntZHzq/kD2M9qsOiJYVyXbIGO9mKkR4KRKZ1YdKoWLsHfBJr2VcBWwLxvD8 DJi8kDUYxslq8C1GYTKXw6Vq421cqYTje89TtauBjJuByRv7JFR1an/X5tMn05sQxKs3 o3ukMaT4a16lp7B82poLOGZe45LPSVKRGsz7Ghs388ZSd3hLOIrIcAJTrXjz1pb3Gnff QC30ayqejHHvxT2vXFjtVHhsVVnzJvNxMxAXVItTFAt+VjzU2nWh0YpEB79qIYJVSLOH Rc7IFKWejiQm1KdLvB0kbW0aB9KxW3bKX1M9JSQXlQ25diHpgyXikXna8RYzH6UCn74u zo7w== 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=dTCf+pryD2m4f95wnd2OQRt+bPmqhfTCioinpIRkPkc=; b=pyE54XIz/zQkujWqu0yyD2YEYAeCbJn4HHsDM/n8sdfI1LOhOCe4MEQnJZJuZ4UXZp RQPrWMikw5lT94A6xB8T30NsnweyR/lDGJSN2BVAWBZfk/9EZXsHVMS1ypgiHjHRz/HH 6ZPZzk4yTDgycbDvnZDDPLUdpEeIWUHHABHicAF5SG7r+1ll/OyYis3MR3T+WhRdIXAi tZ2/yAmfBV6vV2qBZvz+DCUd94xuJFvYXjxW4pfmEAYiNb/nkzG+qFG07959/IXmYNqc uM09pffIyt+QFhlwVPIGseFdSOzHfxPa/lVcWAZbvmZGiaU75nNnU36ikNFGCCpkF9Er Sy3A== X-Gm-Message-State: APjAAAWMr96lfrTAq79yM+cpNRcWXCa3mjk/PUrQn7WahMo2bYrxS++d epV/hMFfh5Id5IPyiut4qJk44Q== X-Google-Smtp-Source: APXvYqy3+ffWDFY0ktNlNBL8Xn7H7teTJdZi+iAOrkrKTd8zzr8TusC23Mq8xdyS+rK9Ysk7nZVKIQ== X-Received: by 2002:aa7:96b6:: with SMTP id g22mr5452333pfk.206.1576704715288; Wed, 18 Dec 2019 13:31:55 -0800 (PST) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id n15sm4479756pgf.17.2019.12.18.13.31.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Dec 2019 13:31:54 -0800 (PST) Date: Wed, 18 Dec 2019 14:31:52 -0700 From: Mathieu Poirier To: Tero Kristo Cc: bjorn.andersson@linaro.org, ohad@wizery.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Suman Anna Subject: Re: [PATCHv3 07/15] remoteproc/omap: Add support for DRA7xx remote processors Message-ID: <20191218213152.GD16271@xps15> References: <20191213125537.11509-1-t-kristo@ti.com> <20191213125537.11509-8-t-kristo@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191213125537.11509-8-t-kristo@ti.com> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 13, 2019 at 02:55:29PM +0200, Tero Kristo wrote: > From: Suman Anna > > DRA7xx/AM57xx SoCs have two IPU and up to two DSP processor subsystems > for offloading different computation algorithms. The IPU processor > subsystem contains dual-core ARM Cortex-M4 processors, and is very > similar to those on OMAP5. The DSP processor subsystem is based on > the TI's standard TMS320C66x DSP CorePac core. > > Support has been added to the OMAP remoteproc driver through new > DRA7xx specific compatibles for properly probing and booting all > the different processor subsystem instances on DRA7xx/AM57xx > SoCs - IPU1, IPU2, DSP1 & DSP2. A build dependency with SOC_DRA7XX > is added to enable the driver to be built in DRA7xx-only configuration. > > The DSP boot address programming needed enhancement for DRA7xx as the > boot register fields are different on DRA7 compared to OMAP4 and OMAP5 > SoCs. The register on DRA7xx contains additional fields within the > register and the boot address bit-field is right-shifted by 10 bits. > The internal memory parsing logic has also been updated to compute > the device addresses for the L2 RAM for DSP devices using relative > addressing logic, and to parse two additional RAMs at L1 level - L1P > and L1D. This allows the remoteproc driver to support loading into > these regions for a small subset of firmware images requiring as > such. The most common usage would be to use the L1 programmable > RAMs as L1 Caches. > > The firmware lookup logic also has to be adjusted for DRA7xx as > there are (can be) more than one instance of both the IPU and DSP > remote processors for the first time in OMAP4+ SoCs. > > Signed-off-by: Suman Anna > [t-kristo@ti.com: moved address translation quirks to pdata] > Signed-off-by: Tero Kristo > --- > drivers/remoteproc/Kconfig | 2 +- > drivers/remoteproc/omap_remoteproc.c | 44 +++++++++++++++++++++++++++- > 2 files changed, 44 insertions(+), 2 deletions(-) > > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > index 94afdde4bc9f..d6450d7fcf92 100644 > --- a/drivers/remoteproc/Kconfig > +++ b/drivers/remoteproc/Kconfig > @@ -25,7 +25,7 @@ config IMX_REMOTEPROC > > config OMAP_REMOTEPROC > tristate "OMAP remoteproc support" > - depends on ARCH_OMAP4 || SOC_OMAP5 > + depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX > depends on OMAP_IOMMU > select MAILBOX > select OMAP2PLUS_MBOX > diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c > index 3ad74c4b4071..6cf7f0a9ba9a 100644 > --- a/drivers/remoteproc/omap_remoteproc.c > +++ b/drivers/remoteproc/omap_remoteproc.c > @@ -34,10 +34,13 @@ > * struct omap_rproc_boot_data - boot data structure for the DSP omap rprocs > * @syscon: regmap handle for the system control configuration module > * @boot_reg: boot register offset within the @syscon regmap > + * @boot_reg_shift: bit-field shift required for the boot address value in > + * @boot_reg > */ > struct omap_rproc_boot_data { > struct regmap *syscon; > unsigned int boot_reg; > + unsigned int boot_reg_shift; > }; > > /* > @@ -78,12 +81,14 @@ struct omap_rproc { > * struct omap_rproc_dev_data - device data for the omap remote processor > * @device_name: device name of the remote processor > * @has_bootreg: true if this remote processor has boot register > + * @boot_reg_shift: bit shift for the boot register mask > * @mem_names: memory names for this remote processor > * @dev_addrs: device addresses corresponding to the memory names > */ > struct omap_rproc_dev_data { > const char *device_name; > bool has_bootreg; > + int boot_reg_shift; > const char * const *mem_names; > const u32 *dev_addrs; > }; > @@ -153,6 +158,8 @@ static int omap_rproc_write_dsp_boot_addr(struct rproc *rproc) > struct omap_rproc *oproc = rproc->priv; > struct omap_rproc_boot_data *bdata = oproc->boot_data; > u32 offset = bdata->boot_reg; > + u32 value; > + u32 mask; > > if (rproc->bootaddr & (SZ_1K - 1)) { > dev_err(dev, "invalid boot address 0x%x, must be aligned on a 1KB boundary\n", > @@ -160,7 +167,10 @@ static int omap_rproc_write_dsp_boot_addr(struct rproc *rproc) > return -EINVAL; > } > > - regmap_write(bdata->syscon, offset, rproc->bootaddr); > + value = rproc->bootaddr >> bdata->boot_reg_shift; > + mask = ~(SZ_1K - 1) >> bdata->boot_reg_shift; > + > + regmap_update_bits(bdata->syscon, offset, mask, value); > > return 0; > } > @@ -286,6 +296,14 @@ static const u32 ipu_dev_addrs[] = { > 0x20000000, > }; > > +static const char * const dra7_dsp_mem_names[] = { > + "l2ram", "l1pram", "l1dram", NULL > +}; > + > +static const u32 dra7_dsp_dev_addrs[] = { > + 0x800000, 0xe00000, 0xf00000, > +}; > + > static const struct omap_rproc_dev_data omap4_dsp_dev_data = { > .device_name = "dsp", > .has_bootreg = true, > @@ -308,6 +326,20 @@ static const struct omap_rproc_dev_data omap5_ipu_dev_data = { > .dev_addrs = ipu_dev_addrs, > }; > > +static const struct omap_rproc_dev_data dra7_dsp_dev_data = { > + .device_name = "dsp", > + .has_bootreg = true, Shouldn't this be solely driven from the DT? If the "ti,bootreg" is specified then we can count on omap_rproc::boot_data to provide the same functionality. > + .boot_reg_shift = 10, I also think this should be driven from the DT. Otherwise some information is from the DT and other is hard coded in the omap_rproc_dev_data. > + .mem_names = dra7_dsp_mem_names, > + .dev_addrs = dra7_dsp_dev_addrs, > +}; > + > +static const struct omap_rproc_dev_data dra7_ipu_dev_data = { > + .device_name = "ipu", > + .mem_names = ipu_mem_names, > + .dev_addrs = ipu_dev_addrs, > +}; > + > static const struct of_device_id omap_rproc_of_match[] = { > { > .compatible = "ti,omap4-dsp", > @@ -325,6 +357,14 @@ static const struct of_device_id omap_rproc_of_match[] = { > .compatible = "ti,omap5-ipu", > .data = &omap5_ipu_dev_data, > }, > + { > + .compatible = "ti,dra7-dsp", > + .data = &dra7_dsp_dev_data, > + }, > + { > + .compatible = "ti,dra7-ipu", > + .data = &dra7_ipu_dev_data, > + }, > { > /* end */ > }, > @@ -382,6 +422,8 @@ static int omap_rproc_get_boot_data(struct platform_device *pdev, > return -EINVAL; > } > > + oproc->boot_data->boot_reg_shift = data->boot_reg_shift; > + > return 0; > } > > -- > 2.17.1 > > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki