From patchwork Fri Dec 11 18:48:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Jaszczyk X-Patchwork-Id: 341978 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp810133jai; Fri, 11 Dec 2020 10:52:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJxTx816uj+23p34q9/8mNWdGS21qHzOZJS6/8tXktqYTV0tqTo1OOaNzD0B1ZpKsOExYuwy X-Received: by 2002:aa7:c7d8:: with SMTP id o24mr13475707eds.328.1607712736714; Fri, 11 Dec 2020 10:52:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607712736; cv=none; d=google.com; s=arc-20160816; b=lk0CllkgYiJSJxy6iB3eLIwCISQ7xPSHtsittTYiy2vE+b1HNYHDzl1jAIPjN3DZtP eDmqO3flUuYl4g6UQtp5CYKSAKC42ZiSqABd8hRySdmCy+XtHCftcfrTpbUGSyxxomyy MU4kx71KNL9uLftZiB2YL3KqH9JThLLaQFjeXDMS5NCKm3MPeHQlUnFqn/Ns8i4bp8uc z7/EeqFKUBOFesjoBO6e0tnS1BbwDBxSkWMUtgu9Z0tuOU1mSktonVveN8XPq3XBHRY0 lZJG5KnY1GoM1oMECk+nqAvy2RJW8OR5GRRnbOyUr8juwWSda+b2pT+b3A3vqFbpuM7f oiIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OeQblmEHmyU6ck7RbL05kxW1lADVlZG0oOc0x1IzMi8=; b=lQIJAQhFANJSbo7U7CR0ZNx3QrlTL5Zd3fyy4HEYtRiM+6GjT2hXfd/Pu0VBa+UmEi iThFWQSokhwIR43vFRz10f18X40Yqu/fSA0yIpChkqgCLi8p5/TUIAM6UwTTUVTt+K7r cU1LhYdB+s60N8ExyU3Cbs356QcJ6b2kgcrsMZuFOuxY5IJRAFC/2wgc0k2kObWPZdKC lNaZ85g8cy24ZEkX0J6x+tf3iXFNxfLH6momNhJc3O/w7qrFqd5AxKdjlhDiNO0aEjsq LdPzWJWoxppALlxsaYYHBChWTYj2xv5+7KfZ2uHnX3sL+pIQJoYMh7+bl8Js0LA8cyMT mc7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VnMB+AKl; spf=pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f21si5431033edr.152.2020.12.11.10.52.16; Fri, 11 Dec 2020 10:52:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VnMB+AKl; spf=pass (google.com: domain of linux-omap-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436724AbgLKStp (ORCPT + 3 others); Fri, 11 Dec 2020 13:49:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436762AbgLKStE (ORCPT ); Fri, 11 Dec 2020 13:49:04 -0500 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3D78C06138C for ; Fri, 11 Dec 2020 10:48:34 -0800 (PST) Received: by mail-lj1-x243.google.com with SMTP id f11so12055974ljm.8 for ; Fri, 11 Dec 2020 10:48:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OeQblmEHmyU6ck7RbL05kxW1lADVlZG0oOc0x1IzMi8=; b=VnMB+AKlZB60TxwFqAfhWZM36t9koknPXjgiZAlqim5uZDFdayVyxM/n8jJgSCEcMK UCe5WR7aDt8Tmezde9EzGrbI2CIWD/uNVmZ7+TVoQWq8OMNuwscPQpJkPrVHlC8naDsv 8ppjsxEP7AkbFt8SdGPbL1Xo/oIQCw2eyCjrsMyWQ3gDxGqlzn2P3NHDdFBWazk6wnWp 00G4FfNRt1R8uq+dSAKocGIkWgg45vKN9h72sq4oG28pd4kw6hFar4owBmLxxImuCOmD NgbPRdXF2Y4h2Ppia8FgnmJ/xU0rtC1xP7u+mJIoJvC+Sw0YMAUzhfrOQxzZV47Ab1Oi J9Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OeQblmEHmyU6ck7RbL05kxW1lADVlZG0oOc0x1IzMi8=; b=TTDyAcqkvOCi6gTPZnYahNdbVL1x4kVlByjeXOcqpGwutfSocxHFQ3Pl2tJckJsLEB PN0lx6b7ky2DUg9z1hCAqxpk+qALMjscC82ucjiYO6E76wdD7MczWVZYJned20o+U+km QLA0JTwsY5wGB1ff5JLaSPZ2FcFHm7C+2SSVmU7E2PiGgyf2cLJqCCMwVRLKjd0v08uJ i0p1OnK34Vlj3lDimJ2R2to7dfQzn18gaV8QA/KwVT4bgSJDJWIsuxqZBhAm1A6xmfkt i0hw18gGuJVQNJ5CbX8+HqICcKXwhf4DwQx5fWgkMHDoQ+HI+zISGejxHFpEGObOx74Q Dw+A== X-Gm-Message-State: AOAM533ml6qDJgQkC40MC2yDLMGEyHXuo1xteitvQHuVxDqNE/7QLdlk Th7guo4/1mNOqhfAoMs1j9eRoA== X-Received: by 2002:a2e:3312:: with SMTP id d18mr4645763ljc.284.1607712512029; Fri, 11 Dec 2020 10:48:32 -0800 (PST) Received: from gilgamesh.semihalf.com (193-106-246-138.noc.fibertech.net.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id b12sm903316lfb.139.2020.12.11.10.48.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Dec 2020 10:48:31 -0800 (PST) From: Grzegorz Jaszczyk To: ssantosh@kernel.org, s-anna@ti.com Cc: grzegorz.jaszczyk@linaro.org, santosh.shilimkar@oracle.com, lee.jones@linaro.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, praneeth@ti.com, tony@atomide.com, linux-remoteproc@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH 2/6] soc: ti: pruss: Add pruss_{request, release}_mem_region() API Date: Fri, 11 Dec 2020 19:48:07 +0100 Message-Id: <20201211184811.6490-3-grzegorz.jaszczyk@linaro.org> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201211184811.6490-1-grzegorz.jaszczyk@linaro.org> References: <20201211184811.6490-1-grzegorz.jaszczyk@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: "Andrew F. Davis" Add two new API - pruss_request_mem_region() & pruss_release_mem_region(), to the PRUSS platform driver to allow client drivers to acquire and release the common memory resources present within a PRU-ICSS subsystem. This allows the client drivers to directly manipulate the respective memories, as per their design contract with the associated firmware. Co-developed-by: Suman Anna Signed-off-by: Suman Anna Signed-off-by: Andrew F. Davis Co-developed-by: Grzegorz Jaszczyk Signed-off-by: Grzegorz Jaszczyk --- drivers/soc/ti/pruss.c | 77 ++++++++++++++++++++++++++++++++++++ include/linux/pruss.h | 39 ++++++++++++++++++ include/linux/pruss_driver.h | 27 +++---------- 3 files changed, 121 insertions(+), 22 deletions(-) -- 2.29.0 diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c index 28eb6415cb95..7569a7fc94f6 100644 --- a/drivers/soc/ti/pruss.c +++ b/drivers/soc/ti/pruss.c @@ -88,6 +88,82 @@ void pruss_put(struct pruss *pruss) } EXPORT_SYMBOL_GPL(pruss_put); +/** + * pruss_request_mem_region() - request a memory resource + * @pruss: the pruss instance + * @mem_id: the memory resource id + * @region: pointer to memory region structure to be filled in + * + * This function allows a client driver to request a memory resource, + * and if successful, will let the client driver own the particular + * memory region until released using the pruss_release_mem_region() + * API. + * + * Return: 0 if requested memory region is available (in such case pointer to + * memory region is returned via @region), an error otherwise + */ +int pruss_request_mem_region(struct pruss *pruss, enum pruss_mem mem_id, + struct pruss_mem_region *region) +{ + if (!pruss || !region || mem_id >= PRUSS_MEM_MAX) + return -EINVAL; + + mutex_lock(&pruss->lock); + + if (pruss->mem_in_use[mem_id]) { + mutex_unlock(&pruss->lock); + return -EBUSY; + } + + *region = pruss->mem_regions[mem_id]; + pruss->mem_in_use[mem_id] = region; + + mutex_unlock(&pruss->lock); + + return 0; +} +EXPORT_SYMBOL_GPL(pruss_request_mem_region); + +/** + * pruss_release_mem_region() - release a memory resource + * @pruss: the pruss instance + * @region: the memory region to release + * + * This function is the complimentary function to + * pruss_request_mem_region(), and allows the client drivers to + * release back a memory resource. + * + * Return: 0 on success, an error code otherwise + */ +int pruss_release_mem_region(struct pruss *pruss, + struct pruss_mem_region *region) +{ + int id; + + if (!pruss || !region) + return -EINVAL; + + mutex_lock(&pruss->lock); + + /* find out the memory region being released */ + for (id = 0; id < PRUSS_MEM_MAX; id++) { + if (pruss->mem_in_use[id] == region) + break; + } + + if (id == PRUSS_MEM_MAX) { + mutex_unlock(&pruss->lock); + return -EINVAL; + } + + pruss->mem_in_use[id] = NULL; + + mutex_unlock(&pruss->lock); + + return 0; +} +EXPORT_SYMBOL_GPL(pruss_release_mem_region); + static void pruss_of_free_clk_provider(void *data) { struct device_node *clk_mux_np = data; @@ -243,6 +319,7 @@ static int pruss_probe(struct platform_device *pdev) return -ENOMEM; pruss->dev = dev; + mutex_init(&pruss->lock); child = of_get_child_by_name(np, "memories"); if (!child) { diff --git a/include/linux/pruss.h b/include/linux/pruss.h index 403951910515..ec5b6609b5e5 100644 --- a/include/linux/pruss.h +++ b/include/linux/pruss.h @@ -39,6 +39,28 @@ enum pru_ctable_idx { PRU_C31, }; +/* + * enum pruss_mem - PRUSS memory range identifiers + */ +enum pruss_mem { + PRUSS_MEM_DRAM0 = 0, + PRUSS_MEM_DRAM1, + PRUSS_MEM_SHRD_RAM2, + PRUSS_MEM_MAX, +}; + +/** + * struct pruss_mem_region - PRUSS memory region structure + * @va: kernel virtual address of the PRUSS memory region + * @pa: physical (bus) address of the PRUSS memory region + * @size: size of the PRUSS memory region + */ +struct pruss_mem_region { + void __iomem *va; + phys_addr_t pa; + size_t size; +}; + struct device_node; struct rproc; struct pruss; @@ -47,6 +69,10 @@ struct pruss; struct pruss *pruss_get(struct rproc *rproc); void pruss_put(struct pruss *pruss); +int pruss_request_mem_region(struct pruss *pruss, enum pruss_mem mem_id, + struct pruss_mem_region *region); +int pruss_release_mem_region(struct pruss *pruss, + struct pruss_mem_region *region); #else @@ -57,6 +83,19 @@ static inline struct pruss *pruss_get(struct rproc *rproc) static inline void pruss_put(struct pruss *pruss) { } +static inline int pruss_request_mem_region(struct pruss *pruss, + enum pruss_mem mem_id, + struct pruss_mem_region *region) +{ + return -ENOTSUPP; +} + +static inline int pruss_release_mem_region(struct pruss *pruss, + struct pruss_mem_region *region) +{ + return -ENOTSUPP; +} + #endif /* CONFIG_TI_PRUSS */ #if IS_ENABLED(CONFIG_PRU_REMOTEPROC) diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h index d054d2179d82..e2d5477225c6 100644 --- a/include/linux/pruss_driver.h +++ b/include/linux/pruss_driver.h @@ -9,37 +9,18 @@ #ifndef _PRUSS_DRIVER_H_ #define _PRUSS_DRIVER_H_ +#include #include #include -/* - * enum pruss_mem - PRUSS memory range identifiers - */ -enum pruss_mem { - PRUSS_MEM_DRAM0 = 0, - PRUSS_MEM_DRAM1, - PRUSS_MEM_SHRD_RAM2, - PRUSS_MEM_MAX, -}; - -/** - * struct pruss_mem_region - PRUSS memory region structure - * @va: kernel virtual address of the PRUSS memory region - * @pa: physical (bus) address of the PRUSS memory region - * @size: size of the PRUSS memory region - */ -struct pruss_mem_region { - void __iomem *va; - phys_addr_t pa; - size_t size; -}; - /** * struct pruss - PRUSS parent structure * @dev: pruss device pointer * @cfg_base: base iomap for CFG region * @cfg_regmap: regmap for config region * @mem_regions: data for each of the PRUSS memory regions + * @mem_in_use: to indicate if memory resource is in use + * @lock: mutex to serialize access to resources * @core_clk_mux: clk handle for PRUSS CORE_CLK_MUX * @iep_clk_mux: clk handle for PRUSS IEP_CLK_MUX */ @@ -48,6 +29,8 @@ struct pruss { void __iomem *cfg_base; struct regmap *cfg_regmap; struct pruss_mem_region mem_regions[PRUSS_MEM_MAX]; + struct pruss_mem_region *mem_in_use[PRUSS_MEM_MAX]; + struct mutex lock; /* PRU resource lock */ struct clk *core_clk_mux; struct clk *iep_clk_mux; };