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 52CC4CCA47F for ; Tue, 12 Jul 2022 17:59:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232833AbiGLR75 (ORCPT ); Tue, 12 Jul 2022 13:59:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230424AbiGLR74 (ORCPT ); Tue, 12 Jul 2022 13:59:56 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75047B79F9 for ; Tue, 12 Jul 2022 10:59:54 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id o5-20020a17090a3d4500b001ef76490983so9165111pjf.2 for ; Tue, 12 Jul 2022 10:59:54 -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=/G0DDZaE1NIOrqy5BRsHqgUbEx+jksrp+9dmSSmyp7Y=; b=nd4B3HXTEpQlHv1ZF6Ub9xw48XHN6vwcEAzyzUnSSn0uLCdNsolCnggOVbYElnE4L8 YN4EHeQdlgjIIEogyKkqkSqwSB+VNyKNMX+4QQXiVbSgCak/ir2F60cHhYcCPK3inwzg QRJz5rVm/4dQcpWnucjDnce0DF+DUnwc/9Evk5aRiIRbaheDLG/sBOwG4eHUXBEjbJc7 s4NRVuEc3ajg5/m/3h57RWb19yLX9IaPDrXrK/pex6yySwXyQBp8A8JmCTZt0U0rVL3N VR8ueHFZOJ3e4ZvFytPKNjGRiNaQlOcBTCCtR0Up5W1Se2aO/hSid4/wUki5J4GJ80k9 hLkQ== 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=/G0DDZaE1NIOrqy5BRsHqgUbEx+jksrp+9dmSSmyp7Y=; b=LUJZGCa5VTHimyYqXsajaR2UhjOqg3PiuS1RF82Ql+wcmzk2jllNUPnjUsGiPDLu7i 3XKtahSEg5ellddULoF4XsAhinjIDUqNmUagGe8oPSfoV04isJDOi9AaeyOEZLMoN0iQ GaO+s3eToBDKyf6/ax70isiwKl6Ltbw/YKRwiRP7Wb/ft88vJmCDtg2i+8dOhKuNZiRh sU9rJ7IezTJ/MIaOhTarppcjiselnWzrqJZoilzsX7aTl/WVsO3gPuGyeAZ6feA+E8O/ 7jOR66Cc7mUaC2Hj/tSEg1XOAxTmNV4kg1KYeG9+0dkBA7paG/v+Ntm01YgoPr/aY80S 2dfw== X-Gm-Message-State: AJIora/xEL1t6szVXJ9TQywVeIJg8HiXMrXVCpqe6qBxqBARV1P/+2Ja DZ+8T1qWixLyMbvPyYzpg/B5WLwABvs/dA== X-Google-Smtp-Source: AGRyM1s5W3ZLpfE03NYqOFOmC2p8eVAXh7vv8P+5VAMvHNqcxM8kZH6pv0cfRRC5p3/A+9bzCxAYUw== X-Received: by 2002:a17:90b:314e:b0:1ef:9db1:a2b9 with SMTP id ip14-20020a17090b314e00b001ef9db1a2b9mr5615974pjb.18.1657648793906; Tue, 12 Jul 2022 10:59:53 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id t6-20020aa79466000000b005289c9a46aesm7192336pfq.80.2022.07.12.10.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 10:59:52 -0700 (PDT) Date: Tue, 12 Jul 2022 11:59:49 -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 2/6] remoteproc: pru: Add APIs to get and put the PRU cores Message-ID: <20220712175949.GB2945984@p14s> References: <20220607045650.4999-1-p-mohan@ti.com> <20220607045650.4999-3-p-mohan@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220607045650.4999-3-p-mohan@ti.com> Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Hi Puranjay, 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()... More comments to come tomorrow. I'm especially worried about this API racing with a remote processor being removed or detached. 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 > 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 12E56C433EF for ; Tue, 12 Jul 2022 18:01: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=dGlw+Qh/xC3Ws3/DLuUCY5eX2gqU1Db79AJtMGQAOA0=; b=tnDRSljhuf/A1c BYNgPEJ/CBxridpADGRs7n6EQeVeC8J78+CWjHXr9TkQ3UsBWjWLnPYdjzsWRLyoz5VKjSEjoqNd5 GnwY5xcX+FzCXaUZGZeZrW3OAs+yKtnPBANZNGvAa9PI8I51mq2dpUp3s04szRoXaOdq0eBz4B1Ox kyKcfOxsV5mdQa0QCLCKAay0opUsrc8DpJ5X0ADLqzFDI0CW3XFNXHf9idcOh81xWNm/05rz+oG4x IDHN4+X8bpWUMp+mQ32tvCIB1vDh4P0ePTmIPESCtLyIWHmIFZFw0zepCsQyESq6yNwY83tMto6w6 T20dIXBF1sS3NvFKaSqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBKAy-00DY2t-9a; Tue, 12 Jul 2022 18:00:00 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBKAt-00DY0p-Kk for linux-arm-kernel@lists.infradead.org; Tue, 12 Jul 2022 17:59:57 +0000 Received: by mail-pj1-x1034.google.com with SMTP id o3-20020a17090a744300b001ef8f7f3dddso9158391pjk.3 for ; Tue, 12 Jul 2022 10:59:54 -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=/G0DDZaE1NIOrqy5BRsHqgUbEx+jksrp+9dmSSmyp7Y=; b=nd4B3HXTEpQlHv1ZF6Ub9xw48XHN6vwcEAzyzUnSSn0uLCdNsolCnggOVbYElnE4L8 YN4EHeQdlgjIIEogyKkqkSqwSB+VNyKNMX+4QQXiVbSgCak/ir2F60cHhYcCPK3inwzg QRJz5rVm/4dQcpWnucjDnce0DF+DUnwc/9Evk5aRiIRbaheDLG/sBOwG4eHUXBEjbJc7 s4NRVuEc3ajg5/m/3h57RWb19yLX9IaPDrXrK/pex6yySwXyQBp8A8JmCTZt0U0rVL3N VR8ueHFZOJ3e4ZvFytPKNjGRiNaQlOcBTCCtR0Up5W1Se2aO/hSid4/wUki5J4GJ80k9 hLkQ== 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=/G0DDZaE1NIOrqy5BRsHqgUbEx+jksrp+9dmSSmyp7Y=; b=wBTaiAY28dYyEKJDqczmTf4QTDVOmu3ke/heaz09GSLQg7iEhULfs7vm4xHdT0yQxD EwVdvuA8bSMueX5e+1KMvrWG3bqOHzz5bK8T8xOM22WwW3dNj4iNHAacX1jmbChR3N5w Z0aTRTrT64ML6P0dIIqktkbD/Vx5FFrZGteqUKw1tAtuDxFHgEEnuphbzVVJPxC8FE9w SYioglvPkP6fNoSIRLJSu4okFBYJKUAx9nxB/7caS5GNlwuSzOIzxWeEzyXUQwpVTS5M WVemEDuVtf2hgO/5ZCtgwxtz27xjbHJbJOp409kF6qcZCtbmsH/sPkKYwHUl0B4zYrJI UQsg== X-Gm-Message-State: AJIora/WLxKR82PQOs/XpUk7SrrA2hy4VesShBUTGw0/lHJr695n61BJ Fnfem1W1O3mlJQ9qAufl7DvMlQ== X-Google-Smtp-Source: AGRyM1s5W3ZLpfE03NYqOFOmC2p8eVAXh7vv8P+5VAMvHNqcxM8kZH6pv0cfRRC5p3/A+9bzCxAYUw== X-Received: by 2002:a17:90b:314e:b0:1ef:9db1:a2b9 with SMTP id ip14-20020a17090b314e00b001ef9db1a2b9mr5615974pjb.18.1657648793906; Tue, 12 Jul 2022 10:59:53 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id t6-20020aa79466000000b005289c9a46aesm7192336pfq.80.2022.07.12.10.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 10:59:52 -0700 (PDT) Date: Tue, 12 Jul 2022 11:59:49 -0600 From: Mathieu Poirier To: Puranjay Mohan Subject: Re: [PATCH v5 2/6] remoteproc: pru: Add APIs to get and put the PRU cores Message-ID: <20220712175949.GB2945984@p14s> References: <20220607045650.4999-1-p-mohan@ti.com> <20220607045650.4999-3-p-mohan@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220607045650.4999-3-p-mohan@ti.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220712_105955_743094_5B421633 X-CRM114-Status: GOOD ( 44.18 ) 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 Hi Puranjay, 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()... More comments to come tomorrow. I'm especially worried about this API racing with a remote processor being removed or detached. 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