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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D73C4C43334 for ; Tue, 19 Jul 2022 15:53:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239214AbiGSPxs (ORCPT ); Tue, 19 Jul 2022 11:53:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239326AbiGSPxr (ORCPT ); Tue, 19 Jul 2022 11:53:47 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C56A354054 for ; Tue, 19 Jul 2022 08:53:45 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id b133so10150861pfb.6 for ; Tue, 19 Jul 2022 08:53:45 -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; bh=97PrQlIB8/07EwQL9gOpc20PS5FL9FE1rwJO80C1yVM=; b=UPim7G55cZS0qbyf/En9E8FI/NhxptHgmYuDWQzwtpEQyojz3bZGdpj23WjBFWGs4j WR91KmwclDvXUhcO6AmCwOM+gW1k7KmwNncAv/4uMzgMP3YLlQxoQfV9inHkHQFamXho DlOzPi581rMHGTa4ypb6FDQaTJopFk5kllqZWBoUnfGEK39q3T19q00IINOBd9jT0P/+ BXfhh2Eehvezwa0+dO6SjyB9lKP2Kj9Vz381fzfsDM9OPNyElm6611TAAg5Dzrhs6i/7 JDHRnRY+bsTXv4m8u+4MtnC20HmsTSsyr5G97faGyLM2F+ZJJww09fBzX3YiSYSOSIZ3 Di0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=97PrQlIB8/07EwQL9gOpc20PS5FL9FE1rwJO80C1yVM=; b=BUzvfkm6IWRT29HRLls8Aaz2CkKm7h0H/951DlnqJvYPSYrT1sJ1mqMF9GFbfydVOg EeHKmUEJC/vYdjeEEo4TMgLBSUALdwj2NceQltbqne2hM9ItjWhSLWykIhDENSuTgY9l Ow+PXCiGfhJMUr/vHOf4kodKvbxL36nGXunz4Qleg7166cOv1TwQsGYFNctkG1mIWeMG 8F0BfcItvritTgc6tYsctfWph8OvqCVSs/fH1EQlgLBjdUTkVuhMLFTK1zAXjdkJB87W zpau9owdTmTBBZTZF7vcz5Yx8TGDQUTs0y7rM0N3Esb0fiaAUPeznwMiaiBC5ws7TrOD Kppw== X-Gm-Message-State: AJIora8tfho2MA9Bmfm+reA/9u6wQgttI9yLHFge/AAWMZNNTU9ubntZ 7kJUIyOxqSX0nNZzFjYJrHca7g== X-Google-Smtp-Source: AGRyM1tkkiudUZbVg8XqOG/4Xa31HkkoEf7SZ2OfYCY0g4XW4BuT8wvr+CAoqB68Sklx9GpLmM3C5A== X-Received: by 2002:a05:6a00:1781:b0:528:c839:9886 with SMTP id s1-20020a056a00178100b00528c8399886mr34310041pfg.71.1658246024535; Tue, 19 Jul 2022 08:53:44 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id o17-20020a170902779100b0015e8d4eb27esm11779414pll.200.2022.07.19.08.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:53:43 -0700 (PDT) Date: Tue, 19 Jul 2022 09:53:40 -0600 From: Mathieu Poirier To: Puranjay Mohan Cc: linux-kernel@vger.kernel.org, bjorn.andersson@linaro.org, krzysztof.kozlowski+dt@linaro.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, nm@ti.com, ssantosh@kernel.org, s-anna@ti.com, linux-arm-kernel@lists.infradead.org, rogerq@kernel.org, grygorii.strashko@ti.com, vigneshr@ti.com, kishon@ti.com, robh@kernel.org Subject: Re: [PATCH v5 4/6] remoteproc: pru: Add pru_rproc_set_ctable() function Message-ID: <20220719155340.GA3393732@p14s> References: <20220607045650.4999-1-p-mohan@ti.com> <20220607045650.4999-5-p-mohan@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220607045650.4999-5-p-mohan@ti.com> Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org On Tue, Jun 07, 2022 at 10:26:48AM +0530, Puranjay Mohan wrote: > From: Roger Quadros > > Some firmwares expect the OS drivers to configure the CTABLE > entries publishing dynamically allocated memory regions. For > example, the PRU Ethernet firmwares use the C28 and C30 entries > for retrieving the Shared RAM and System SRAM (OCMC) areas > allocated by the PRU Ethernet client driver. > > Provide a way for users to do that through a new API, > pru_rproc_set_ctable(). The API returns 0 on success and > a negative value on error. > > NOTE: > The programmable CTABLE entries are typically re-programmed by > the PRU firmwares when dealing with a certain block of memory > during block processing. This API provides an interface to the > PRU client drivers to publish a dynamically allocated memory > block with the PRU firmware using a CTABLE entry instead of a > negotiated address in shared memory. Additional synchronization > may be needed between the PRU client drivers and firmwares if > different addresses needs to be published at run-time reusing > the same CTABLE entry. In all this the concept of a "ctable" is not explained and as such, I have to guess it stands for "constant table". I also have to guess this table stores memory addresses known to other drivers, making it possible to boot a system without all components having access to a DT. Again, those are all guesses because it is not explained. And all that guessing makes reviewing this small patchset quite difficult. > > Co-developed-by: Andrew F. Davis > Signed-off-by: Andrew F. Davis > Co-developed-by: Suman Anna > Signed-off-by: Suman Anna > Signed-off-by: Roger Quadros > Co-developed-by: Grzegorz Jaszczyk > Signed-off-by: Grzegorz Jaszczyk > Signed-off-by: Puranjay Mohan > --- > drivers/remoteproc/pru_rproc.c | 59 ++++++++++++++++++++++++++++++++++ > include/linux/pruss.h | 22 +++++++++++++ > 2 files changed, 81 insertions(+) > > diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c > index 9fed3e0372d3..d06b763e995e 100644 > --- a/drivers/remoteproc/pru_rproc.c > +++ b/drivers/remoteproc/pru_rproc.c > @@ -119,6 +119,7 @@ struct pru_private_data { > * @mapped_irq: virtual interrupt numbers of created fw specific mapping > * @pru_interrupt_map: pointer to interrupt mapping description (firmware) > * @pru_interrupt_map_sz: pru_interrupt_map size > + * @rmw_lock: lock for read, modify, write operations on registers > * @dbg_single_step: debug state variable to set PRU into single step mode > * @dbg_continuous: debug state variable to restore PRU execution mode > * @evt_count: number of mapped events > @@ -136,6 +137,7 @@ struct pru_rproc { > unsigned int *mapped_irq; > struct pru_irq_rsc *pru_interrupt_map; > size_t pru_interrupt_map_sz; > + spinlock_t rmw_lock; /* register access lock */ > u32 dbg_single_step; > u32 dbg_continuous; > u8 evt_count; > @@ -152,6 +154,23 @@ void pru_control_write_reg(struct pru_rproc *pru, unsigned int reg, u32 val) > writel_relaxed(val, pru->mem_regions[PRU_IOMEM_CTRL].va + reg); > } > > +static inline > +void pru_control_set_reg(struct pru_rproc *pru, unsigned int reg, > + u32 mask, u32 set) > +{ > + u32 val; > + unsigned long flags; > + > + spin_lock_irqsave(&pru->rmw_lock, flags); > + > + val = pru_control_read_reg(pru, reg); > + val &= ~mask; > + val |= (set & mask); > + pru_control_write_reg(pru, reg, val); > + > + spin_unlock_irqrestore(&pru->rmw_lock, flags); > +} > + > static struct rproc *__pru_rproc_get(struct device_node *np, int index) > { > struct device_node *rproc_np = NULL; > @@ -273,6 +292,45 @@ void pru_rproc_put(struct rproc *rproc) > } > EXPORT_SYMBOL_GPL(pru_rproc_put); > > +/** > + * pru_rproc_set_ctable() - set the constant table index for the PRU > + * @rproc: the rproc instance of the PRU > + * @c: constant table index to set > + * @addr: physical address to set it to > + * > + * Return: 0 on success, or errno in error case. > + */ > +int pru_rproc_set_ctable(struct rproc *rproc, enum pru_ctable_idx c, u32 addr) > +{ > + struct pru_rproc *pru = rproc->priv; > + unsigned int reg; > + u32 mask, set; > + u16 idx; > + u16 idx_mask; > + > + if (IS_ERR_OR_NULL(rproc)) > + return -EINVAL; > + > + if (!rproc->dev.parent || !is_pru_rproc(rproc->dev.parent)) > + return -ENODEV; > + > + /* pointer is 16 bit and index is 8-bit so mask out the rest */ > + idx_mask = (c >= PRU_C28) ? 0xFFFF : 0xFF; > + > + /* ctable uses bit 8 and upwards only */ > + idx = (addr >> 8) & idx_mask; > + > + /* configurable ctable (i.e. C24) starts at PRU_CTRL_CTBIR0 */ > + reg = PRU_CTRL_CTBIR0 + 4 * (c >> 1); > + mask = idx_mask << (16 * (c & 1)); > + set = idx << (16 * (c & 1)); > + Please add comments that describe the content and format of the CTABLE. Otherwise this code becomes unmaintainable. > + pru_control_set_reg(pru, reg, mask, set); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(pru_rproc_set_ctable); > + > static inline u32 pru_debug_read_reg(struct pru_rproc *pru, unsigned int reg) > { > return readl_relaxed(pru->mem_regions[PRU_IOMEM_DEBUG].va + reg); > @@ -944,6 +1002,7 @@ static int pru_rproc_probe(struct platform_device *pdev) > pru->rproc = rproc; > pru->fw_name = fw_name; > pru->client_np = NULL; > + spin_lock_init(&pru->rmw_lock); > mutex_init(&pru->lock); > > for (i = 0; i < ARRAY_SIZE(mem_names); i++) { > diff --git a/include/linux/pruss.h b/include/linux/pruss.h > index fdc719b43db0..d830e20056c7 100644 > --- a/include/linux/pruss.h > +++ b/include/linux/pruss.h > @@ -23,13 +23,29 @@ enum pruss_pru_id { > PRUSS_NUM_PRUS, > }; > > +/* > + * enum pru_ctable_idx - Configurable Constant table index identifiers > + */ > +enum pru_ctable_idx { > + PRU_C24 = 0, > + PRU_C25, > + PRU_C26, > + PRU_C27, > + PRU_C28, > + PRU_C29, > + PRU_C30, > + PRU_C31, > +}; > + > struct device_node; > +struct rproc; > > #if IS_ENABLED(CONFIG_PRU_REMOTEPROC) > > struct rproc *pru_rproc_get(struct device_node *np, int index, > enum pruss_pru_id *pru_id); > void pru_rproc_put(struct rproc *rproc); > +int pru_rproc_set_ctable(struct rproc *rproc, enum pru_ctable_idx c, u32 addr); > > #else > > @@ -41,6 +57,12 @@ pru_rproc_get(struct device_node *np, int index, enum pruss_pru_id *pru_id) > > static inline void pru_rproc_put(struct rproc *rproc) { } > > +static inline int pru_rproc_set_ctable(struct rproc *rproc, > + enum pru_ctable_idx c, u32 addr) > +{ > + return -EOPNOTSUPP; > +} > + > #endif /* CONFIG_PRU_REMOTEPROC */ > > static inline bool is_pru_rproc(struct device *dev) > -- > 2.17.1 > 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 90577C433EF for ; Tue, 19 Jul 2022 15:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=r1GcaKVh41iRFfuFqmgaee/G/zVxuAxrnIdJl6UFtDk=; b=Zpq26+StqJJqSd Dh8vmeVcq5gtgeCDDvvMQmk3Do1VqfmLE45BomkyAlIGIva1dCFKsfw33JpiQa+tUkyfD0xg27/q0 ivHXSYsffr7vdk6RJllngJEh+3iuwZOPy5R8n8a4p0VUpxZ4W1CctQG0oN7I/Q+c1he2wtmYe3AQO 09YG3AZ60QrmxF26mxHOyRZrxDQb5CAUo9er9fOWLkl2LejwVYgYOKoeBI83v8d9wYQ//zKJ6KLRg 0UpQ15PDwXXGQ59qhLGCKD7bkbg1MfUH0nxN06zlbGAOADZz90asjvzGZlQ5kh2uoNxdZ8Y3nsRNp rZyPfH4SSKBi3FUOz0Pg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oDpY2-00AHft-LH; Tue, 19 Jul 2022 15:54:11 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oDpXx-00AHQE-Sf for linux-arm-kernel@lists.infradead.org; Tue, 19 Jul 2022 15:54:07 +0000 Received: by mail-pf1-x42f.google.com with SMTP id l124so13916877pfl.8 for ; Tue, 19 Jul 2022 08:53:45 -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; bh=97PrQlIB8/07EwQL9gOpc20PS5FL9FE1rwJO80C1yVM=; b=UPim7G55cZS0qbyf/En9E8FI/NhxptHgmYuDWQzwtpEQyojz3bZGdpj23WjBFWGs4j WR91KmwclDvXUhcO6AmCwOM+gW1k7KmwNncAv/4uMzgMP3YLlQxoQfV9inHkHQFamXho DlOzPi581rMHGTa4ypb6FDQaTJopFk5kllqZWBoUnfGEK39q3T19q00IINOBd9jT0P/+ BXfhh2Eehvezwa0+dO6SjyB9lKP2Kj9Vz381fzfsDM9OPNyElm6611TAAg5Dzrhs6i/7 JDHRnRY+bsTXv4m8u+4MtnC20HmsTSsyr5G97faGyLM2F+ZJJww09fBzX3YiSYSOSIZ3 Di0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=97PrQlIB8/07EwQL9gOpc20PS5FL9FE1rwJO80C1yVM=; b=RTgI8oOOXK1JgpLQjdUuHyWuVSiERK4B1s2CPmIbYPhyJhRN871x6rfQic3aHkzA7U SAzI++6qBNh5IN7ehvlPT9j6e8u3Jn2IF1aIqEirwKBpRVajXLRxjv1Qxiez7uiIn+he Sx2NRcWNcmqCzcedkrt8b3SEIN5mMpSPscpO4vCoJxrXK+QYHBfxbcHtIg+CRnSBZv4O mLZAvvoNuul4nLpfAlx2z6LvuAFkMwep0Dr+aPZBhd4ByvGJsYAKxhiRN3s7WRGFC9gF +YeJvec6vkdWpXe4tQ4W70QbSTP4Jn+h6V9k+2zs+Hx6GSHsuAzNfTkydkYkHKfxsC2S 3ifA== X-Gm-Message-State: AJIora83G7zjXZg4eZhfb9mE+xM3WsWorGub6nPYIEdrCzMoWkiK0RwY Cj5Z0a5SlWp7ios+3rK/7l5CUQ== X-Google-Smtp-Source: AGRyM1tkkiudUZbVg8XqOG/4Xa31HkkoEf7SZ2OfYCY0g4XW4BuT8wvr+CAoqB68Sklx9GpLmM3C5A== X-Received: by 2002:a05:6a00:1781:b0:528:c839:9886 with SMTP id s1-20020a056a00178100b00528c8399886mr34310041pfg.71.1658246024535; Tue, 19 Jul 2022 08:53:44 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id o17-20020a170902779100b0015e8d4eb27esm11779414pll.200.2022.07.19.08.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:53:43 -0700 (PDT) Date: Tue, 19 Jul 2022 09:53:40 -0600 From: Mathieu Poirier To: Puranjay Mohan Subject: Re: [PATCH v5 4/6] remoteproc: pru: Add pru_rproc_set_ctable() function Message-ID: <20220719155340.GA3393732@p14s> References: <20220607045650.4999-1-p-mohan@ti.com> <20220607045650.4999-5-p-mohan@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220607045650.4999-5-p-mohan@ti.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220719_085405_976193_FC2EDFB1 X-CRM114-Status: GOOD ( 39.40 ) 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: , Cc: nm@ti.com, devicetree@vger.kernel.org, grygorii.strashko@ti.com, vigneshr@ti.com, kishon@ti.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, bjorn.andersson@linaro.org, rogerq@kernel.org, krzysztof.kozlowski+dt@linaro.org, ssantosh@kernel.org, robh@kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Jun 07, 2022 at 10:26:48AM +0530, Puranjay Mohan wrote: > From: Roger Quadros > > Some firmwares expect the OS drivers to configure the CTABLE > entries publishing dynamically allocated memory regions. For > example, the PRU Ethernet firmwares use the C28 and C30 entries > for retrieving the Shared RAM and System SRAM (OCMC) areas > allocated by the PRU Ethernet client driver. > > Provide a way for users to do that through a new API, > pru_rproc_set_ctable(). The API returns 0 on success and > a negative value on error. > > NOTE: > The programmable CTABLE entries are typically re-programmed by > the PRU firmwares when dealing with a certain block of memory > during block processing. This API provides an interface to the > PRU client drivers to publish a dynamically allocated memory > block with the PRU firmware using a CTABLE entry instead of a > negotiated address in shared memory. Additional synchronization > may be needed between the PRU client drivers and firmwares if > different addresses needs to be published at run-time reusing > the same CTABLE entry. In all this the concept of a "ctable" is not explained and as such, I have to guess it stands for "constant table". I also have to guess this table stores memory addresses known to other drivers, making it possible to boot a system without all components having access to a DT. Again, those are all guesses because it is not explained. And all that guessing makes reviewing this small patchset quite difficult. > > Co-developed-by: Andrew F. Davis > Signed-off-by: Andrew F. Davis > Co-developed-by: Suman Anna > Signed-off-by: Suman Anna > Signed-off-by: Roger Quadros > Co-developed-by: Grzegorz Jaszczyk > Signed-off-by: Grzegorz Jaszczyk > Signed-off-by: Puranjay Mohan > --- > drivers/remoteproc/pru_rproc.c | 59 ++++++++++++++++++++++++++++++++++ > include/linux/pruss.h | 22 +++++++++++++ > 2 files changed, 81 insertions(+) > > diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c > index 9fed3e0372d3..d06b763e995e 100644 > --- a/drivers/remoteproc/pru_rproc.c > +++ b/drivers/remoteproc/pru_rproc.c > @@ -119,6 +119,7 @@ struct pru_private_data { > * @mapped_irq: virtual interrupt numbers of created fw specific mapping > * @pru_interrupt_map: pointer to interrupt mapping description (firmware) > * @pru_interrupt_map_sz: pru_interrupt_map size > + * @rmw_lock: lock for read, modify, write operations on registers > * @dbg_single_step: debug state variable to set PRU into single step mode > * @dbg_continuous: debug state variable to restore PRU execution mode > * @evt_count: number of mapped events > @@ -136,6 +137,7 @@ struct pru_rproc { > unsigned int *mapped_irq; > struct pru_irq_rsc *pru_interrupt_map; > size_t pru_interrupt_map_sz; > + spinlock_t rmw_lock; /* register access lock */ > u32 dbg_single_step; > u32 dbg_continuous; > u8 evt_count; > @@ -152,6 +154,23 @@ void pru_control_write_reg(struct pru_rproc *pru, unsigned int reg, u32 val) > writel_relaxed(val, pru->mem_regions[PRU_IOMEM_CTRL].va + reg); > } > > +static inline > +void pru_control_set_reg(struct pru_rproc *pru, unsigned int reg, > + u32 mask, u32 set) > +{ > + u32 val; > + unsigned long flags; > + > + spin_lock_irqsave(&pru->rmw_lock, flags); > + > + val = pru_control_read_reg(pru, reg); > + val &= ~mask; > + val |= (set & mask); > + pru_control_write_reg(pru, reg, val); > + > + spin_unlock_irqrestore(&pru->rmw_lock, flags); > +} > + > static struct rproc *__pru_rproc_get(struct device_node *np, int index) > { > struct device_node *rproc_np = NULL; > @@ -273,6 +292,45 @@ void pru_rproc_put(struct rproc *rproc) > } > EXPORT_SYMBOL_GPL(pru_rproc_put); > > +/** > + * pru_rproc_set_ctable() - set the constant table index for the PRU > + * @rproc: the rproc instance of the PRU > + * @c: constant table index to set > + * @addr: physical address to set it to > + * > + * Return: 0 on success, or errno in error case. > + */ > +int pru_rproc_set_ctable(struct rproc *rproc, enum pru_ctable_idx c, u32 addr) > +{ > + struct pru_rproc *pru = rproc->priv; > + unsigned int reg; > + u32 mask, set; > + u16 idx; > + u16 idx_mask; > + > + if (IS_ERR_OR_NULL(rproc)) > + return -EINVAL; > + > + if (!rproc->dev.parent || !is_pru_rproc(rproc->dev.parent)) > + return -ENODEV; > + > + /* pointer is 16 bit and index is 8-bit so mask out the rest */ > + idx_mask = (c >= PRU_C28) ? 0xFFFF : 0xFF; > + > + /* ctable uses bit 8 and upwards only */ > + idx = (addr >> 8) & idx_mask; > + > + /* configurable ctable (i.e. C24) starts at PRU_CTRL_CTBIR0 */ > + reg = PRU_CTRL_CTBIR0 + 4 * (c >> 1); > + mask = idx_mask << (16 * (c & 1)); > + set = idx << (16 * (c & 1)); > + Please add comments that describe the content and format of the CTABLE. Otherwise this code becomes unmaintainable. > + pru_control_set_reg(pru, reg, mask, set); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(pru_rproc_set_ctable); > + > static inline u32 pru_debug_read_reg(struct pru_rproc *pru, unsigned int reg) > { > return readl_relaxed(pru->mem_regions[PRU_IOMEM_DEBUG].va + reg); > @@ -944,6 +1002,7 @@ static int pru_rproc_probe(struct platform_device *pdev) > pru->rproc = rproc; > pru->fw_name = fw_name; > pru->client_np = NULL; > + spin_lock_init(&pru->rmw_lock); > mutex_init(&pru->lock); > > for (i = 0; i < ARRAY_SIZE(mem_names); i++) { > diff --git a/include/linux/pruss.h b/include/linux/pruss.h > index fdc719b43db0..d830e20056c7 100644 > --- a/include/linux/pruss.h > +++ b/include/linux/pruss.h > @@ -23,13 +23,29 @@ enum pruss_pru_id { > PRUSS_NUM_PRUS, > }; > > +/* > + * enum pru_ctable_idx - Configurable Constant table index identifiers > + */ > +enum pru_ctable_idx { > + PRU_C24 = 0, > + PRU_C25, > + PRU_C26, > + PRU_C27, > + PRU_C28, > + PRU_C29, > + PRU_C30, > + PRU_C31, > +}; > + > struct device_node; > +struct rproc; > > #if IS_ENABLED(CONFIG_PRU_REMOTEPROC) > > struct rproc *pru_rproc_get(struct device_node *np, int index, > enum pruss_pru_id *pru_id); > void pru_rproc_put(struct rproc *rproc); > +int pru_rproc_set_ctable(struct rproc *rproc, enum pru_ctable_idx c, u32 addr); > > #else > > @@ -41,6 +57,12 @@ pru_rproc_get(struct device_node *np, int index, enum pruss_pru_id *pru_id) > > static inline void pru_rproc_put(struct rproc *rproc) { } > > +static inline int pru_rproc_set_ctable(struct rproc *rproc, > + enum pru_ctable_idx c, u32 addr) > +{ > + return -EOPNOTSUPP; > +} > + > #endif /* CONFIG_PRU_REMOTEPROC */ > > static inline bool is_pru_rproc(struct device *dev) > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel