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 B45DDC433EF for ; Fri, 15 Jul 2022 06:24:40 +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:From:References:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nOQKd33t1tKdYNBmNXJ7AnAulMPPd4GFD4kM76zJuTA=; b=PtKBfmB4yAt8zy s5NROBPORWdxhZ9A5BpsbxT15yBvSVLLV27I2S1IpB+MBuy9qQYYKcGgS6pofLwk6UnoGtQR1a5RE ujE8yR9nPjx6KBOTZAzYGYPTZwuoKUsVF7xbhm4yeKcslIR2PGjJp33+J3j1aj0de9WGthjbqK0sC fbUw18erG/Ax4PemckUcjAzH4x5l4L+NDAKI3M/VKkllddp7EO5r52MDvrjAI1G97goC+7nJKqR+b 1sGLM76PbtRa8OqHozyuQOUytsj6CS1fsRsxlKQQ4YlmVB/8hd00n9784JPCuLJPSpBsG3zBipMeU FUKheR/XmkROjAdUmDSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCEjO-004azx-HI; Fri, 15 Jul 2022 06:23:19 +0000 Received: from fllv0016.ext.ti.com ([198.47.19.142]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCEj8-004awc-IZ for linux-arm-kernel@lists.infradead.org; Fri, 15 Jul 2022 06:23:08 +0000 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 26F6Mr1R080937; Fri, 15 Jul 2022 01:22:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1657866173; bh=cxifYq88NKLDkvOt7sXCQfBrp2NcROn1LdKAggPmJO8=; h=Date:Subject:To:CC:References:From:In-Reply-To; b=LADJoRF7bTbJ9onLJAh6Dhh7VWo2wgRz+nSIiRSF1FzDfwHqBQVrnORQhyLTRDidm twCEZg1uW6M9TwPkZm95kLm7p+7x1/XRo/ULK/xJOsjFgGnnd1DDd5ghM/BsQyfsq+ VRfv4n6s7FyA9W/hqQAch845niVy4r2NiO1BZh7Q= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 26F6MrYw001512 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 15 Jul 2022 01:22:53 -0500 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Fri, 15 Jul 2022 01:22:52 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Fri, 15 Jul 2022 01:22:52 -0500 Received: from [10.24.69.159] (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 26F6Ml7B077236; Fri, 15 Jul 2022 01:22:48 -0500 Message-ID: <20c544ef-40b3-dcbc-1f29-aac140725b57@ti.com> Date: Fri, 15 Jul 2022 11:52:47 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v5 2/6] remoteproc: pru: Add APIs to get and put the PRU cores Content-Language: en-US To: Mathieu Poirier , Md Danish Anwar References: <20220607045650.4999-1-p-mohan@ti.com> <20220607045650.4999-3-p-mohan@ti.com> <20220712175949.GB2945984@p14s> <20220714172015.GA3106020@p14s> From: Kishon Vijay Abraham I In-Reply-To: <20220714172015.GA3106020@p14s> X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220714_232303_649092_363D902E X-CRM114-Status: GOOD ( 34.61 ) 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, robh@kernel.org, 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, 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 +Danish Hi Mathieu, On 14/07/22 22:50, Mathieu Poirier wrote: > On Tue, Jul 12, 2022 at 11:59:49AM -0600, Mathieu Poirier wrote: >> Hi Puranjay, Removed Puranjay (as he is no longer with TI) and adding Danish. Regards, Kishon >> >> On Tue, Jun 07, 2022 at 10:26:46AM +0530, Puranjay Mohan wrote: >>> From: Tero Kristo >>> >>> Add two new APIs, pru_rproc_get() and pru_rproc_put(), to the PRU >>> driver to allow client drivers to acquire and release the remoteproc >>> device associated with a PRU core. The PRU cores are treated as >>> resources with only one client owning it at a time. >>> >>> The pru_rproc_get() function returns the rproc handle corresponding >>> to a PRU core identified by the device tree "ti,prus" property under >>> the client node. The pru_rproc_put() is the complementary function >>> to pru_rproc_get(). >>> >>> Co-developed-by: Suman Anna >>> Signed-off-by: Suman Anna >>> Signed-off-by: Tero Kristo >>> Co-developed-by: Grzegorz Jaszczyk >>> Signed-off-by: Grzegorz Jaszczyk >>> Co-developed-by: Puranjay Mohan >>> Signed-off-by: Puranjay Mohan >>> --- >>> drivers/remoteproc/pru_rproc.c | 138 +++++++++++++++++++++++++++++++-- >>> include/linux/pruss.h | 56 +++++++++++++ >>> 2 files changed, 189 insertions(+), 5 deletions(-) >>> create mode 100644 include/linux/pruss.h >>> >>> diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c >>> index 1777a01fa84e..7a35b400287a 100644 >>> --- a/drivers/remoteproc/pru_rproc.c >>> +++ b/drivers/remoteproc/pru_rproc.c >>> @@ -2,12 +2,13 @@ >>> /* >>> * PRU-ICSS remoteproc driver for various TI SoCs >>> * >>> - * Copyright (C) 2014-2020 Texas Instruments Incorporated - https://www.ti.com/ >>> + * Copyright (C) 2014-2022 Texas Instruments Incorporated - https://www.ti.com/ >>> * >>> * Author(s): >>> * Suman Anna >>> * Andrew F. Davis >>> * Grzegorz Jaszczyk for Texas Instruments >>> + * Puranjay Mohan >>> */ >>> >>> #include >>> @@ -16,6 +17,7 @@ >>> #include >>> #include >>> #include >>> +#include >>> #include >>> #include >>> >>> @@ -111,6 +113,8 @@ struct pru_private_data { >>> * @rproc: remoteproc pointer for this PRU core >>> * @data: PRU core specific data >>> * @mem_regions: data for each of the PRU memory regions >>> + * @client_np: client device node >>> + * @lock: mutex to protect client usage >>> * @fw_name: name of firmware image used during loading >>> * @mapped_irq: virtual interrupt numbers of created fw specific mapping >>> * @pru_interrupt_map: pointer to interrupt mapping description (firmware) >>> @@ -126,6 +130,8 @@ struct pru_rproc { >>> struct rproc *rproc; >>> const struct pru_private_data *data; >>> struct pruss_mem_region mem_regions[PRU_IOMEM_MAX]; >>> + struct device_node *client_np; >>> + struct mutex lock; /* client access lock */ >>> const char *fw_name; >>> unsigned int *mapped_irq; >>> struct pru_irq_rsc *pru_interrupt_map; >>> @@ -146,6 +152,125 @@ 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 struct rproc *__pru_rproc_get(struct device_node *np, int index) >>> +{ >>> + struct device_node *rproc_np = NULL; >>> + struct platform_device *pdev; >>> + struct rproc *rproc; >>> + >>> + rproc_np = of_parse_phandle(np, "ti,prus", index); >>> + if (!rproc_np || !of_device_is_available(rproc_np)) >>> + return ERR_PTR(-ENODEV); >>> + >>> + pdev = of_find_device_by_node(rproc_np); >>> + of_node_put(rproc_np); >>> + >>> + if (!pdev || !(&pdev->dev) || !((&pdev->dev)->driver)) >>> + /* probably PRU not yet probed */ >>> + return ERR_PTR(-EPROBE_DEFER); >>> + >>> + /* make sure it is PRU rproc */ >>> + if (!is_pru_rproc(&pdev->dev)) { >>> + put_device(&pdev->dev); >>> + return ERR_PTR(-ENODEV); >>> + } >>> + >>> + rproc = platform_get_drvdata(pdev); >>> + put_device(&pdev->dev); >>> + if (!rproc) >>> + return ERR_PTR(-EPROBE_DEFER); >>> + >>> + get_device(&rproc->dev); >>> + >>> + return rproc; >>> +} >>> + >>> +/** >>> + * pru_rproc_get() - get the PRU rproc instance from a device node >>> + * @np: the user/client device node >>> + * @index: index to use for the ti,prus property >>> + * @pru_id: optional pointer to return the PRU remoteproc processor id >>> + * >>> + * This function looks through a client device node's "ti,prus" property at >>> + * index @index and returns the rproc handle for a valid PRU remote processor if >>> + * found. The function allows only one user to own the PRU rproc resource at a >>> + * time. Caller must call pru_rproc_put() when done with using the rproc, not >>> + * required if the function returns a failure. >>> + * >>> + * When optional @pru_id pointer is passed the PRU remoteproc processor id is >>> + * returned. >>> + * >>> + * Return: rproc handle on success, and an ERR_PTR on failure using one >>> + * of the following error values >>> + * -ENODEV if device is not found >>> + * -EBUSY if PRU is already acquired by anyone >>> + * -EPROBE_DEFER is PRU device is not probed yet >>> + */ >>> +struct rproc *pru_rproc_get(struct device_node *np, int index, >>> + enum pruss_pru_id *pru_id) >>> +{ >>> + struct rproc *rproc; >>> + struct pru_rproc *pru; >>> + struct device *dev; >>> + >>> + try_module_get(THIS_MODULE); >> >> There should be a module_put() in pru_rproc_put()... > > ... and in the error path of this function. > >> >> More comments to come tomorrow. I'm especially worried about this API racing >> with a remote processor being removed or detached. >> > > Looking at what is done in wkup_m3_ipc_probe(), it should be possible to call > rproc_get_by_handle() here and that would make sure the remote processor doesn't > go away before the end of the function. > > More comments to come... > > >> Thanks, >> Mathieu >> >>> + >>> + rproc = __pru_rproc_get(np, index); >>> + if (IS_ERR(rproc)) >>> + return rproc; >>> + >>> + pru = rproc->priv; >>> + dev = &rproc->dev; >>> + >>> + mutex_lock(&pru->lock); >>> + >>> + if (pru->client_np) { >>> + mutex_unlock(&pru->lock); >>> + put_device(dev); >>> + return ERR_PTR(-EBUSY); >>> + } >>> + >>> + pru->client_np = np; >>> + >>> + mutex_unlock(&pru->lock); >>> + >>> + if (pru_id) >>> + *pru_id = pru->id; >>> + >>> + return rproc; >>> +} >>> +EXPORT_SYMBOL_GPL(pru_rproc_get); >>> + >>> +/** >>> + * pru_rproc_put() - release the PRU rproc resource >>> + * @rproc: the rproc resource to release >>> + * >>> + * Releases the PRU rproc resource and makes it available to other >>> + * users. >>> + */ >>> +void pru_rproc_put(struct rproc *rproc) >>> +{ >>> + struct pru_rproc *pru; >>> + >>> + if (IS_ERR_OR_NULL(rproc) || !is_pru_rproc(rproc->dev.parent)) >>> + return; >>> + >>> + pru = rproc->priv; >>> + >>> + mutex_lock(&pru->lock); >>> + >>> + if (!pru->client_np) { >>> + mutex_unlock(&pru->lock); >>> + return; >>> + } >>> + >>> + pru->client_np = NULL; >>> + mutex_unlock(&pru->lock); >>> + >>> + put_device(&rproc->dev); >>> +} >>> +EXPORT_SYMBOL_GPL(pru_rproc_put); >>> + >>> 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); >>> @@ -438,7 +563,7 @@ static void *pru_d_da_to_va(struct pru_rproc *pru, u32 da, size_t len) >>> dram0 = pruss->mem_regions[PRUSS_MEM_DRAM0]; >>> dram1 = pruss->mem_regions[PRUSS_MEM_DRAM1]; >>> /* PRU1 has its local RAM addresses reversed */ >>> - if (pru->id == 1) >>> + if (pru->id == PRUSS_PRU1) >>> swap(dram0, dram1); >>> shrd_ram = pruss->mem_regions[PRUSS_MEM_SHRD_RAM2]; >>> >>> @@ -747,14 +872,14 @@ static int pru_rproc_set_id(struct pru_rproc *pru) >>> case RTU0_IRAM_ADDR_MASK: >>> fallthrough; >>> case PRU0_IRAM_ADDR_MASK: >>> - pru->id = 0; >>> + pru->id = PRUSS_PRU0; >>> break; >>> case TX_PRU1_IRAM_ADDR_MASK: >>> fallthrough; >>> case RTU1_IRAM_ADDR_MASK: >>> fallthrough; >>> case PRU1_IRAM_ADDR_MASK: >>> - pru->id = 1; >>> + pru->id = PRUSS_PRU1; >>> break; >>> default: >>> ret = -EINVAL; >>> @@ -816,6 +941,8 @@ static int pru_rproc_probe(struct platform_device *pdev) >>> pru->pruss = platform_get_drvdata(ppdev); >>> pru->rproc = rproc; >>> pru->fw_name = fw_name; >>> + pru->client_np = NULL; >>> + mutex_init(&pru->lock); >>> >>> for (i = 0; i < ARRAY_SIZE(mem_names); i++) { >>> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, >>> @@ -903,7 +1030,7 @@ MODULE_DEVICE_TABLE(of, pru_rproc_match); >>> >>> static struct platform_driver pru_rproc_driver = { >>> .driver = { >>> - .name = "pru-rproc", >>> + .name = PRU_RPROC_DRVNAME, >>> .of_match_table = pru_rproc_match, >>> .suppress_bind_attrs = true, >>> }, >>> @@ -915,5 +1042,6 @@ module_platform_driver(pru_rproc_driver); >>> MODULE_AUTHOR("Suman Anna "); >>> MODULE_AUTHOR("Andrew F. Davis "); >>> MODULE_AUTHOR("Grzegorz Jaszczyk "); >>> +MODULE_AUTHOR("Puranjay Mohan "); >>> MODULE_DESCRIPTION("PRU-ICSS Remote Processor Driver"); >>> MODULE_LICENSE("GPL v2"); >>> diff --git a/include/linux/pruss.h b/include/linux/pruss.h >>> new file mode 100644 >>> index 000000000000..fdc719b43db0 >>> --- /dev/null >>> +++ b/include/linux/pruss.h >>> @@ -0,0 +1,56 @@ >>> +/* SPDX-License-Identifier: GPL-2.0-only */ >>> +/** >>> + * PRU-ICSS Subsystem user interfaces >>> + * >>> + * Copyright (C) 2015-2022 Texas Instruments Incorporated - http://www.ti.com >>> + * Suman Anna >>> + */ >>> + >>> +#ifndef __LINUX_PRUSS_H >>> +#define __LINUX_PRUSS_H >>> + >>> +#include >>> +#include >>> + >>> +#define PRU_RPROC_DRVNAME "pru-rproc" >>> + >>> +/* >>> + * enum pruss_pru_id - PRU core identifiers >>> + */ >>> +enum pruss_pru_id { >>> + PRUSS_PRU0 = 0, >>> + PRUSS_PRU1, >>> + PRUSS_NUM_PRUS, >>> +}; >>> + >>> +struct device_node; >>> + >>> +#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); >>> + >>> +#else >>> + >>> +static inline struct rproc * >>> +pru_rproc_get(struct device_node *np, int index, enum pruss_pru_id *pru_id) >>> +{ >>> + return ERR_PTR(-EOPNOTSUPP); >>> +} >>> + >>> +static inline void pru_rproc_put(struct rproc *rproc) { } >>> + >>> +#endif /* CONFIG_PRU_REMOTEPROC */ >>> + >>> +static inline bool is_pru_rproc(struct device *dev) >>> +{ >>> + const char *drv_name = dev_driver_string(dev); >>> + >>> + if (strncmp(drv_name, PRU_RPROC_DRVNAME, sizeof(PRU_RPROC_DRVNAME))) >>> + return false; >>> + >>> + return true; >>> +} >>> + >>> +#endif /* __LINUX_PRUSS_H */ >>> -- >>> 2.17.1 >>> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel