From patchwork Fri Dec 11 18:48:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Jaszczyk X-Patchwork-Id: 341975 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp808899jai; Fri, 11 Dec 2020 10:50:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCS7TkVRctT1awh5VKv+oKVygNQZ3wjwwViuF8BNJl6XReVrHuUSSGXIjBeZE1wklWwgbI X-Received: by 2002:a17:906:b74b:: with SMTP id fx11mr12173097ejb.410.1607712619554; Fri, 11 Dec 2020 10:50:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607712619; cv=none; d=google.com; s=arc-20160816; b=T3BXGVX2Orp/WIrCdlxVhMW5AbjQGu64dNseL/l5l0s9JYmlmyZuxkrTV3b9dtHnN+ VJv4O0gEUxsXD4n3mI0D5vTc85t7/SCRFW6Q9FAuKYrLRQsudfsi1zNd6xChn7dta5Rc lXRrrF+3qC6NyN/GxCblJAP0K6b6qux2zOrTFzrVvaQcfNS/ipSDjTvOCxslvNNzDCFO 2XbUCua0nk5p6ETZlcWHkr/m1wgKW/G2kei8wHU5J8/xEY95MtbT6ZN11aV9hjamybZ9 7OVHWm7hbV08hOcyiBsz6CfEH4SzVoStTPA+vwP2zMepiAqu6QQ4XSJpBhMIEBBQvvXU a7Wg== 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=NWoP9tZ6oHWWAkB8TJmlPklU15pvtoRQyvnFdEsRKOI=; b=z9q3zhAHq9CC7BNHBSv4wDe+XtSsninTMho5edVOFCrxhPLOgj7vVysznIe6YHhS2t BQZPrD4iYi9LeLoBd3e9i6cKz0Rs4i81lYuRsuQ48P44p98AZUCD+H3Ev7N68VNLtmUi 4QGwrWV8ga3/V1QfASMXGIwhH7MqjrJaMYWVVTndtVnx1qa0E+MwEB+gu4zlq9kGKYpn 5d2z/zJ4ZqBd02vsKsQlDiMvXwbZPVRHinvjVYNWk6DNwISTXUE7WaEONmm0YpeLUHTw XJKATquJwHdvgXpL/ONPeNI65yd4FC9gy32dW7ScllmTsRLhwng3CUfK8NvmQwbvLzEg Z2gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mt+MbXD2; 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 c26si4785760eja.409.2020.12.11.10.50.19; Fri, 11 Dec 2020 10:50:19 -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=mt+MbXD2; 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 S2436871AbgLKSto (ORCPT + 3 others); Fri, 11 Dec 2020 13:49:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436714AbgLKStD (ORCPT ); Fri, 11 Dec 2020 13:49:03 -0500 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7C5FC0617A7 for ; Fri, 11 Dec 2020 10:48:32 -0800 (PST) Received: by mail-lj1-x236.google.com with SMTP id y22so12031486ljn.9 for ; Fri, 11 Dec 2020 10:48:32 -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=NWoP9tZ6oHWWAkB8TJmlPklU15pvtoRQyvnFdEsRKOI=; b=mt+MbXD2G45R++itmA44Y3a+euSVz+hpvfoElDRG++OVuwkByNS1vc7OabMmUtKWeo v0aT/8IrkEN8cN+shN8XTIaW878S+/7ha2P44D/Gt5gdkLvQvWArOX65vhoT4R645744 MIcxllWspC2Fa4BSwLkH+F0lgpokTvyV6Fnkh5CpE30AU+EvM1KFTdnl9KtSk5m0Fhz9 IkOyHfcFvMEPOnFTpXFS2eHCd+xwURCig+1YH3X+BeIQGH8bWrWFNhI9JaC4subDoRR7 avXiBmKiXVXxcSErpYNVbsJfvje5997xmBa9SNYAGvFMeqtEuNM4dUGSDu0+Ci3geU/Y 5s5g== 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=NWoP9tZ6oHWWAkB8TJmlPklU15pvtoRQyvnFdEsRKOI=; b=PflQiWrK6q2FuBWjvkpNg4IHmnfmdVtC1EVXGjvYFRpFgAJr9dvSfiKvpsy6RtKs7D rgeoyBsCDu19MWG+ajVt9Y/DLZABbHFyTTDSIDDOvmJa9SU2zMJfKhwTmzdNpkhU5gyK uCCjz7e1W+PldEPgiOHKGCGoPqioM0delPkjl7wRB8SEPX2kvtWRE9w1i+eB3bwKGTuQ 35k5r+9fplkJrnLtdNcrUwms6W9iiDd6ZX8muH4pXJ5vXUgG6aLeHaTe+bmXosBUCQPr nYLIvfK2bxIJKErcGr1P66XAGb1iwxKxbQ2IqnY7CN2ISSaj1155O03/TZ6d2BKjAsUd 8bwg== X-Gm-Message-State: AOAM532I4OkPQyCt3yq3+g2NSi+FpKDwFMR+AX4cItsZGoKuQYp5Gxtb 6DbaX5bjILtD0sHHvM6V6qhAqg== X-Received: by 2002:a2e:5753:: with SMTP id r19mr5356621ljd.240.1607712510751; Fri, 11 Dec 2020 10:48:30 -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.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Dec 2020 10:48:30 -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 1/6] soc: ti: pruss: Add pruss_get()/put() API Date: Fri, 11 Dec 2020 19:48:06 +0100 Message-Id: <20201211184811.6490-2-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: Tero Kristo Add two new get and put API, pruss_get() and pruss_put() to the PRUSS platform driver to allow client drivers to request a handle to a PRUSS device. This handle will be used by client drivers to request various operations of the PRUSS platform driver through additional API that will be added in the following patches. The pruss_get() function returns the pruss handle corresponding to a PRUSS device referenced by a PRU remoteproc instance. The pruss_put() is the complimentary function to pruss_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 --- drivers/soc/ti/pruss.c | 58 ++++++++++++++++++++++++++++++++++++ include/linux/pruss.h | 19 ++++++++++++ include/linux/pruss_driver.h | 1 + 3 files changed, 78 insertions(+) -- 2.29.0 diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c index 5d6e7132a5c4..28eb6415cb95 100644 --- a/drivers/soc/ti/pruss.c +++ b/drivers/soc/ti/pruss.c @@ -6,6 +6,7 @@ * Author(s): * Suman Anna * Andrew F. Davis + * Tero Kristo */ #include @@ -18,6 +19,7 @@ #include #include #include +#include #include /** @@ -30,6 +32,62 @@ struct pruss_private_data { bool has_core_mux_clock; }; +/** + * pruss_get() - get the pruss for a given PRU remoteproc + * @rproc: remoteproc handle of a PRU instance + * + * Finds the parent pruss device for a PRU given the @rproc handle of the + * PRU remote processor. This function increments the pruss device's refcount, + * so always use pruss_put() to decrement it back once pruss isn't needed + * anymore. + * + * Return: pruss handle on success, and an ERR_PTR on failure using one + * of the following error values + * -EINVAL if invalid parameter + * -ENODEV if PRU device or PRUSS device is not found + */ +struct pruss *pruss_get(struct rproc *rproc) +{ + struct pruss *pruss; + struct device *dev; + struct platform_device *ppdev; + + if (IS_ERR_OR_NULL(rproc)) + return ERR_PTR(-EINVAL); + + dev = &rproc->dev; + + /* make sure it is PRU rproc */ + if (!dev->parent || !is_pru_rproc(dev->parent)) + return ERR_PTR(-ENODEV); + + ppdev = to_platform_device(dev->parent->parent); + pruss = platform_get_drvdata(ppdev); + if (!pruss) + return ERR_PTR(-ENODEV); + + get_device(pruss->dev); + + return pruss; +} +EXPORT_SYMBOL_GPL(pruss_get); + +/** + * pruss_put() - decrement pruss device's usecount + * @pruss: pruss handle + * + * Complimentary function for pruss_get(). Needs to be called + * after the PRUSS is used, and only if the pruss_get() succeeds. + */ +void pruss_put(struct pruss *pruss) +{ + if (IS_ERR_OR_NULL(pruss)) + return; + + put_device(pruss->dev); +} +EXPORT_SYMBOL_GPL(pruss_put); + static void pruss_of_free_clk_provider(void *data) { struct device_node *clk_mux_np = data; diff --git a/include/linux/pruss.h b/include/linux/pruss.h index 903d0c0b75be..403951910515 100644 --- a/include/linux/pruss.h +++ b/include/linux/pruss.h @@ -4,12 +4,14 @@ * * Copyright (C) 2015-2020 Texas Instruments Incorporated - http://www.ti.com * Suman Anna + * Tero Kristo */ #ifndef __LINUX_PRUSS_H #define __LINUX_PRUSS_H #include +#include #include #define PRU_RPROC_DRVNAME "pru-rproc" @@ -39,6 +41,23 @@ enum pru_ctable_idx { struct device_node; struct rproc; +struct pruss; + +#if IS_ENABLED(CONFIG_TI_PRUSS) + +struct pruss *pruss_get(struct rproc *rproc); +void pruss_put(struct pruss *pruss); + +#else + +static inline struct pruss *pruss_get(struct rproc *rproc) +{ + return ERR_PTR(-ENOTSUPP); +} + +static inline void pruss_put(struct pruss *pruss) { } + +#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 ecfded30ed05..d054d2179d82 100644 --- a/include/linux/pruss_driver.h +++ b/include/linux/pruss_driver.h @@ -9,6 +9,7 @@ #ifndef _PRUSS_DRIVER_H_ #define _PRUSS_DRIVER_H_ +#include #include /* 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; }; From patchwork Fri Dec 11 18:48:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Jaszczyk X-Patchwork-Id: 341976 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp810107jai; Fri, 11 Dec 2020 10:52:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJztK1vA3Hb+J5gI8Eh29V6cxpE+lILwPoLkmmbYFfhTi4soA98mft2GT3vjU9ZHGvoVmeii X-Received: by 2002:aa7:dc0d:: with SMTP id b13mr13437010edu.170.1607712734704; Fri, 11 Dec 2020 10:52:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607712734; cv=none; d=google.com; s=arc-20160816; b=Rpw4891YC1Sf3uIgp3QKRGjjuB2rg7gZaR0x2lPFucoSABNG9YJquwaEfcdNAYXS7d rHQsj/s1tFxNkRIYmwesZFdf6Rfwne0M/tyLKg52ZmwXjFjR6mseh4wG1VFe8A03g/Sh 6XfL2BAlHluiQkH6KiDKOaApDJgnMyUAGqsdfRXwylWVV+s9Zkff+m8uVl7BEHM48XcA FRH+xu8w125RONySzCvU4Fcij87WjTmYPdbknEOQfmsTH+pIhtuwA1GW5Glr188JXpuN DwNpZNstTB9FJY/Ze/W1zX58ROwcRT3ooZqTTlpnw9Ur9W8j/isV7NrnYPB8eQ3ScRni dNgg== 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=dyHsTJlcQ/DwhU6wIqjlDoykB2TJbiA9Zakot90S9Vs=; b=yZ64Pr6sEjB7ilHyiYpSJWDsnzqhLym7QjpCZXuzP3xRx8jSZPhgLiXp1dlFnFtCw3 p0CbTR6j4d4ZiNz+EsYJvu99Cvjb60lFy3xUn/adiDe0ckLp9lRZA12w8nJ2B7guFR/F izIUJtOwWi6Wqdo8V+jD+ttaIrGVH1MZNkZzVsVwqitgRrLZm4IwgLEo484MSFB53fV9 wrySaku3QHwZqDM7OBu+je7dFrh/M1zgls6qg0U38ExJmEYb8jcGcsRrxAGEEJDgV85e voUKTdLcwf8P2BZWdVOiLPMXXc5lPJuUkj1UvHrxYZqAkMo/z/fEZwHu9wh208ZWRKm5 BD9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s8hMlrRD; 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.14; Fri, 11 Dec 2020 10:52:14 -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=s8hMlrRD; 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 S2436877AbgLKStp (ORCPT + 3 others); Fri, 11 Dec 2020 13:49:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436764AbgLKStH (ORCPT ); Fri, 11 Dec 2020 13:49:07 -0500 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97053C061282 for ; Fri, 11 Dec 2020 10:48:35 -0800 (PST) Received: by mail-lj1-x242.google.com with SMTP id y22so12031606ljn.9 for ; Fri, 11 Dec 2020 10:48:35 -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=dyHsTJlcQ/DwhU6wIqjlDoykB2TJbiA9Zakot90S9Vs=; b=s8hMlrRDfCXKGv3HbwBnjy2oFH/99B5AkmJ6C6nONeyDiAl1vLqb4kpj/VPt3dacBh xjzyamxYYefF0fBSrlHgtapsfk2YedemOAbIcMe60inCtTxiLWElxGPiYjm6niPQzNHu 3zSKjducrUXRRqGauoMGcuTq5hmcr+uxhB3IWOfIIR6j+POPekXbWvvsMDV+VgSZ22sK G1woGS5ahBLmk54bwAEGlNZkgA3juAtkxotifqiqFL/ygRiKOwYd7D2TY73syb6n/22+ RYy+vRtN4ykfkmwQRYs5sOaYx8Bq0IZiIFoEtNGpD2lTVQDYVjGhgjWwsHXOyGrVCwuh PJiA== 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=dyHsTJlcQ/DwhU6wIqjlDoykB2TJbiA9Zakot90S9Vs=; b=csbgnX6pTCmmARXbouEeUaBgWKIGw5kZYMB9BO/S2z7+lC5wDMxi7NQuhRe17iMmhh PkKxdMBrd49m/+g0NaARedzHJdr7KabwBYH+6fnobblJGKCzP+7C1VTKnRzxdw2yW81m ue3eqWGHqphU0pisNKggCY6LBI04WCl2MVvxXi+/DOeaw7eHXkjgBfyk1AN5GaBacUUk ErOj4tQyFjonSDsZvMSeHAsDFnx0Af+HrJ+a7RE01Ni3a6jIb4aDhJgxkeGJvgS7DQFx LH3KedLHgQwmiG8zyDbJSmduTMhz+zV5GV48JqjzkBRGVhA8sHZB2K8yTJqK1FFas8Oj F+gg== X-Gm-Message-State: AOAM532roG6xAIVVNbswU1Ho8aMCtbV5PHXZPJx8J8fM49hC56VbpB92 LaJ9vS/vgaVWF0QZcCp5KW8tWktb8c6tIg== X-Received: by 2002:a2e:6c10:: with SMTP id h16mr2959620ljc.404.1607712513417; Fri, 11 Dec 2020 10:48:33 -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.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Dec 2020 10:48:32 -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 3/6] soc: ti: pruss: Add pruss_cfg_read()/update() API Date: Fri, 11 Dec 2020 19:48:08 +0100 Message-Id: <20201211184811.6490-4-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: Suman Anna Add two new generic API pruss_cfg_read() and pruss_cfg_update() to the PRUSS platform driver to allow other drivers to read and program respectively a register within the PRUSS CFG sub-module represented by a syscon driver. This interface provides a simple way for client drivers without having them to include and parse the CFG syscon node within their respective device nodes. Various useful registers and macros for certain register bit-fields and their values have also been added. It is the responsibility of the client drivers to reconfigure or reset a particular register upon any failures. Signed-off-by: Suman Anna Co-developed-by: Grzegorz Jaszczyk Signed-off-by: Grzegorz Jaszczyk --- drivers/soc/ti/pruss.c | 41 +++++++++++++++++ include/linux/pruss.h | 102 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+) -- 2.29.0 diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c index 7569a7fc94f6..56e0ac948796 100644 --- a/drivers/soc/ti/pruss.c +++ b/drivers/soc/ti/pruss.c @@ -164,6 +164,47 @@ int pruss_release_mem_region(struct pruss *pruss, } EXPORT_SYMBOL_GPL(pruss_release_mem_region); +/** + * pruss_cfg_read() - read a PRUSS CFG sub-module register + * @pruss: the pruss instance handle + * @reg: register offset within the CFG sub-module + * @val: pointer to return the value in + * + * Reads a given register within the PRUSS CFG sub-module and + * returns it through the passed-in @val pointer + * + * Return: 0 on success, or an error code otherwise + */ +int pruss_cfg_read(struct pruss *pruss, unsigned int reg, unsigned int *val) +{ + if (IS_ERR_OR_NULL(pruss)) + return -EINVAL; + + return regmap_read(pruss->cfg_regmap, reg, val); +} +EXPORT_SYMBOL_GPL(pruss_cfg_read); + +/** + * pruss_cfg_update() - configure a PRUSS CFG sub-module register + * @pruss: the pruss instance handle + * @reg: register offset within the CFG sub-module + * @mask: bit mask to use for programming the @val + * @val: value to write + * + * Programs a given register within the PRUSS CFG sub-module + * + * Return: 0 on success, or an error code otherwise + */ +int pruss_cfg_update(struct pruss *pruss, unsigned int reg, + unsigned int mask, unsigned int val) +{ + if (IS_ERR_OR_NULL(pruss)) + return -EINVAL; + + return regmap_update_bits(pruss->cfg_regmap, reg, mask, val); +} +EXPORT_SYMBOL_GPL(pruss_cfg_update); + static void pruss_of_free_clk_provider(void *data) { struct device_node *clk_mux_np = data; diff --git a/include/linux/pruss.h b/include/linux/pruss.h index ec5b6609b5e5..9cef536c6cb5 100644 --- a/include/linux/pruss.h +++ b/include/linux/pruss.h @@ -10,12 +10,99 @@ #ifndef __LINUX_PRUSS_H #define __LINUX_PRUSS_H +#include #include #include #include #define PRU_RPROC_DRVNAME "pru-rproc" +/* + * PRU_ICSS_CFG registers + * SYSCFG, ISRP, ISP, IESP, IECP, SCRP applicable on AMxxxx devices only + */ +#define PRUSS_CFG_REVID 0x00 +#define PRUSS_CFG_SYSCFG 0x04 +#define PRUSS_CFG_GPCFG(x) (0x08 + (x) * 4) +#define PRUSS_CFG_CGR 0x10 +#define PRUSS_CFG_ISRP 0x14 +#define PRUSS_CFG_ISP 0x18 +#define PRUSS_CFG_IESP 0x1C +#define PRUSS_CFG_IECP 0x20 +#define PRUSS_CFG_SCRP 0x24 +#define PRUSS_CFG_PMAO 0x28 +#define PRUSS_CFG_MII_RT 0x2C +#define PRUSS_CFG_IEPCLK 0x30 +#define PRUSS_CFG_SPP 0x34 +#define PRUSS_CFG_PIN_MX 0x40 + +/* PRUSS_GPCFG register bits */ +#define PRUSS_GPCFG_PRU_GPO_SH_SEL BIT(25) + +#define PRUSS_GPCFG_PRU_DIV1_SHIFT 20 +#define PRUSS_GPCFG_PRU_DIV1_MASK GENMASK(24, 20) + +#define PRUSS_GPCFG_PRU_DIV0_SHIFT 15 +#define PRUSS_GPCFG_PRU_DIV0_MASK GENMASK(15, 19) + +#define PRUSS_GPCFG_PRU_GPO_MODE BIT(14) +#define PRUSS_GPCFG_PRU_GPO_MODE_DIRECT 0 +#define PRUSS_GPCFG_PRU_GPO_MODE_SERIAL BIT(14) + +#define PRUSS_GPCFG_PRU_GPI_SB BIT(13) + +#define PRUSS_GPCFG_PRU_GPI_DIV1_SHIFT 8 +#define PRUSS_GPCFG_PRU_GPI_DIV1_MASK GENMASK(12, 8) + +#define PRUSS_GPCFG_PRU_GPI_DIV0_SHIFT 3 +#define PRUSS_GPCFG_PRU_GPI_DIV0_MASK GENMASK(7, 3) + +#define PRUSS_GPCFG_PRU_GPI_CLK_MODE_POSITIVE 0 +#define PRUSS_GPCFG_PRU_GPI_CLK_MODE_NEGATIVE BIT(2) +#define PRUSS_GPCFG_PRU_GPI_CLK_MODE BIT(2) + +#define PRUSS_GPCFG_PRU_GPI_MODE_MASK GENMASK(1, 0) +#define PRUSS_GPCFG_PRU_GPI_MODE_SHIFT 0 + +#define PRUSS_GPCFG_PRU_MUX_SEL_SHIFT 26 +#define PRUSS_GPCFG_PRU_MUX_SEL_MASK GENMASK(29, 26) + +/* PRUSS_MII_RT register bits */ +#define PRUSS_MII_RT_EVENT_EN BIT(0) + +/* PRUSS_SPP register bits */ +#define PRUSS_SPP_XFER_SHIFT_EN BIT(1) +#define PRUSS_SPP_PRU1_PAD_HP_EN BIT(0) + +/* + * enum pruss_gp_mux_sel - PRUSS GPI/O Mux modes for the + * PRUSS_GPCFG0/1 registers + * + * NOTE: The below defines are the most common values, but there + * are some exceptions like on 66AK2G, where the RESERVED and MII2 + * values are interchanged. Also, this bit-field does not exist on + * AM335x SoCs + */ +enum pruss_gp_mux_sel { + PRUSS_GP_MUX_SEL_GP = 0, + PRUSS_GP_MUX_SEL_ENDAT, + PRUSS_GP_MUX_SEL_RESERVED, + PRUSS_GP_MUX_SEL_SD, + PRUSS_GP_MUX_SEL_MII2, + PRUSS_GP_MUX_SEL_MAX, +}; + +/* + * enum pruss_gpi_mode - PRUSS GPI configuration modes, used + * to program the PRUSS_GPCFG0/1 registers + */ +enum pruss_gpi_mode { + PRUSS_GPI_MODE_DIRECT = 0, + PRUSS_GPI_MODE_PARALLEL, + PRUSS_GPI_MODE_28BIT_SHIFT, + PRUSS_GPI_MODE_MII, +}; + /* * enum pruss_pru_id - PRU core identifiers */ @@ -73,6 +160,9 @@ 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); +int pruss_cfg_read(struct pruss *pruss, unsigned int reg, unsigned int *val); +int pruss_cfg_update(struct pruss *pruss, unsigned int reg, + unsigned int mask, unsigned int val); #else @@ -96,6 +186,18 @@ static inline int pruss_release_mem_region(struct pruss *pruss, return -ENOTSUPP; } +static inline int pruss_cfg_read(struct pruss *pruss, unsigned int reg, + unsigned int *val) +{ + return -ENOTSUPP; +} + +static inline int pruss_cfg_update(struct pruss *pruss, unsigned int reg, + unsigned int mask, unsigned int val) +{ + return -ENOTSUPP; +} + #endif /* CONFIG_TI_PRUSS */ #if IS_ENABLED(CONFIG_PRU_REMOTEPROC) From patchwork Fri Dec 11 18:48:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Jaszczyk X-Patchwork-Id: 341977 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp810121jai; Fri, 11 Dec 2020 10:52:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbP1B1CIPYJCYUDK0Pd9i8/3vx94r72GXNZJZTcPY39/fJFRKnNI0/w8fTpNoUSEy4KBsK X-Received: by 2002:a17:906:7b82:: with SMTP id s2mr12132395ejo.435.1607712735912; Fri, 11 Dec 2020 10:52:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607712735; cv=none; d=google.com; s=arc-20160816; b=xhkn0MNEck2CD/Z2MxGiEMA+YZwHSq39vOjey/USvEwGm+/J4cSpaWWotaSEZgDJvt FjtdZdFBrYD4bfdZjanEjeszu/6pnK1c1yujslZZHClGnfMw95tofuEZWxICIGwk4gto eTWdyT/B/9d1fcnSdG/qVECmX4HQo5Ab4BAIZBuIHIj45pNC/kudBIRKnF0uYEBaK+oV 3/0NP6gA4THmcc++BOyVUksgu5mLgEQjnjkYS/htTLPxbgZLLgkxHatHc2OPTw7wrspd miKj96DFBaNb5KAfQgHZYgzJ75wab/DztCFRGHZvef4hs96ZseAYV/ybj71wr6F52DGo qpNg== 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=8EDSgNyu6IgaeBQKoeFyD6qLBqoz4cEoQmcNe8L/mqU=; b=oH++SfjHygzMmiRThOy8nrokibvCprYlx1o4SMRvkqzgYXS6OdZjnmGB6gOvKbMy/a ujZzoS8pIQ9h0h6QaC65RoRxP19CzVzSU57vJlsGCS3OKkbXB3JrX8zsUVD/02Ff7+mM DLTXNpxqv5ggld0OTLND0N/6weGGvhh9QLX+Rt1g+UG4Ql1ljFx6rpumj9b4I8G3iDJQ S8Ao/H/HU8r5wlaE2L/pzFwnH0gLQfWylkjo6wKR/kLBkjSbhmA/9KjDVqbfypSV5bHo rF+i2UyJKqbhKylT+or9oEAQ2DBaDOPpB29gzMGn/87KYrWWTMcWSI5pR2EWCigA95Tw 5qvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xovfjv2e; 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.15; Fri, 11 Dec 2020 10:52:15 -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=Xovfjv2e; 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 S2436896AbgLKStt (ORCPT + 3 others); Fri, 11 Dec 2020 13:49:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436775AbgLKStK (ORCPT ); Fri, 11 Dec 2020 13:49:10 -0500 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11725C061257 for ; Fri, 11 Dec 2020 10:48:36 -0800 (PST) Received: by mail-lj1-x231.google.com with SMTP id n11so7213949lji.5 for ; Fri, 11 Dec 2020 10:48:35 -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=8EDSgNyu6IgaeBQKoeFyD6qLBqoz4cEoQmcNe8L/mqU=; b=Xovfjv2eUSzSO44meUSG4hzRoVIBRQkhuv4mNlvZ8xHhln76wJF5HYI9mbOIwOxX4s Svqrn2IdOqCmMHtbOhTzR1htB8j9u1CuVLMQoAL+np9GOa/0EoRBivpwhqtOCvV8t7+A 6BxTF9mIANhGnfxLJcQH5AsHMiUR7qJ6R0XnIOW1yYzsW7cuUcimT3PJ+D5aE3esLrFJ kNBkmlkBtQXOZtyw71y3ucfYEVzd0GQY0x88gYGD3aJVFdrKPSxx4xS/rQHoGEXHsa5G jbfiQgqD0QV4+8iPhmzaWcKap6MIrPhbBX4+2RE8n+YyNHjCFF59egFY2pubmQhTEAiS recw== 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=8EDSgNyu6IgaeBQKoeFyD6qLBqoz4cEoQmcNe8L/mqU=; b=azx+AiRCl4OVN47uOlYOBqsuE6cXzBOA0VGIKaj95MclDuGDu6DTIdtDuhflnpceQR uXnMV03XBgIv6l0wT7TQ4A0KoxRqcMczaK0mvDwd9FgLYgBrYit+aTBlFFNKMMVZsjuA qS2TsEFv6am1567OYWqojav+2QQAryn2nqgyxQWiEflcGD5W3BYfU3jMGt1JlTpyVBJQ 00V3+H+KArf4TzoeSbmGEMB2Y5+se7nygiJ92EgKMrp6863pGF5DV7iNpJflFiEPjusC GP8ZN94P2tiPWhtZ8MboanjZlXP9s2jU1TYTWiDhz6eHssETKhaEvos6oSQfa6Su4DMW Wz7w== X-Gm-Message-State: AOAM533JQ/gK1aymclKLUtwwcYQ6YO+VlON1y3OCN8eGfVZQfZ2B0JVq vk6R0GWruhJcR7vKNHqtGwoycw== X-Received: by 2002:a2e:86d1:: with SMTP id n17mr4291920ljj.120.1607712514591; Fri, 11 Dec 2020 10:48:34 -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.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Dec 2020 10:48:34 -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 4/6] soc: ti: pruss: Add helper functions to set GPI mode, MII_RT_event and XFR Date: Fri, 11 Dec 2020 19:48:09 +0100 Message-Id: <20201211184811.6490-5-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: Suman Anna The PRUSS CFG module is represented as a syscon node and is currently managed by the PRUSS platform driver. Add easy accessor functions to set GPI mode, MII_RT event enable/disable and XFR (XIN XOUT) enable/disable to enable the PRUSS Ethernet usecase. These functions reuse the generic pruss_cfg_update() API function. Signed-off-by: Suman Anna Co-developed-by: Grzegorz Jaszczyk Signed-off-by: Grzegorz Jaszczyk --- include/linux/pruss.h | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) -- 2.29.0 diff --git a/include/linux/pruss.h b/include/linux/pruss.h index 9cef536c6cb5..c8d73cc6baa9 100644 --- a/include/linux/pruss.h +++ b/include/linux/pruss.h @@ -235,4 +235,59 @@ static inline bool is_pru_rproc(struct device *dev) return true; } +/** + * pruss_cfg_gpimode() - set the GPI mode of the PRU + * @pruss: the pruss instance handle + * @pru_id: id of the PRU core within the PRUSS + * @mode: GPI mode to set + * + * Sets the GPI mode for a given PRU by programming the + * corresponding PRUSS_CFG_GPCFGx register + * + * Return: 0 on success, or an error code otherwise + */ +static inline int pruss_cfg_gpimode(struct pruss *pruss, + enum pruss_pru_id pru_id, + enum pruss_gpi_mode mode) +{ + if (pru_id < 0 || pru_id >= PRUSS_NUM_PRUS) + return -EINVAL; + + return pruss_cfg_update(pruss, PRUSS_CFG_GPCFG(pru_id), + PRUSS_GPCFG_PRU_GPI_MODE_MASK, + mode << PRUSS_GPCFG_PRU_GPI_MODE_SHIFT); +} + +/** + * pruss_cfg_miirt_enable() - Enable/disable MII RT Events + * @pruss: the pruss instance + * @enable: enable/disable + * + * Enable/disable the MII RT Events for the PRUSS. + * + * Return: 0 on success, or an error code otherwise + */ +static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable) +{ + u32 set = enable ? PRUSS_MII_RT_EVENT_EN : 0; + + return pruss_cfg_update(pruss, PRUSS_CFG_MII_RT, + PRUSS_MII_RT_EVENT_EN, set); +} + +/** + * pruss_cfg_xfr_enable() - Enable/disable XIN XOUT shift functionality + * @pruss: the pruss instance + * @enable: enable/disable + * + * Return: 0 on success, or an error code otherwise + */ +static inline int pruss_cfg_xfr_enable(struct pruss *pruss, bool enable) +{ + u32 set = enable ? PRUSS_SPP_XFER_SHIFT_EN : 0; + + return pruss_cfg_update(pruss, PRUSS_CFG_SPP, + PRUSS_SPP_XFER_SHIFT_EN, set); +} + #endif /* __LINUX_PRUSS_H */ From patchwork Fri Dec 11 18:48:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Jaszczyk X-Patchwork-Id: 341980 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp810579jai; Fri, 11 Dec 2020 10:53:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxYiHgGcNAFfsd/8FyoTgYCBkHI1gZAhJBTEQnbCW5BpGRlV4KMXxO6pNrbCGWNEH9bQnRG X-Received: by 2002:aa7:c58a:: with SMTP id g10mr13150644edq.315.1607712779998; Fri, 11 Dec 2020 10:52:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607712779; cv=none; d=google.com; s=arc-20160816; b=RweRbz+eAhyt1JxQZrEgzvKm0DM5cdBUhsyY6XqZOUCZyU0k/WObVrfoIVquBry9Gr rw/c5M+j2dJka4D21bN9+363WGjZ6CCHG9TgEEakNwZOu0zxrzaUkNVDgGLfeIBx7Rqa ylRthrp58jRUNj6omhHLR3RjGKJ1xxMWKrTka9O59MYCZbHislQeGxoryHJ/qHOoRBtT Q6vJiWHlib6XzcELWLy7RIY0EoS654SXCJfjQhsYF3gyj4v7BAelRqZrPV+sO1Tyct6z 3iaBYacA+nZFOyMPxYHjnv+pUwCCDYoZXHMSyCnoypcNCakz73bc9OBrevau6JYS90zi uxmA== 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=slw9FlW0qv1ca+qHNtWZZr6egc4uA3g+4z4fUtQXfwA=; b=i6pT1QcFg0d2HRUf5QACYjyhXcVbeX2CNdq0iKDUCpyEtKZBesAs1uLTCVTWYoafSj ULPr0Nbnzqo+b7E6v28xfreWAULM/2WckBwVRAx/D82xLmnMTFnOkZpiaesuDL80ERi/ KMk5AW6gk7URMrZEmUEHaS6Ug5o+ZP8rKU5+ICJ2Ntp0Vx+4x0QFYHGeChQB4e1J6ui4 J4OX9yCLPXm06Sa7/LbRMG1zcfMzh01oPrpFaaGtcqDSsktdW6USf6aeqePV6Kc6pR/r SmkUKwxdhO9JKioVQS+Ji0bYJiKJx7/H6A6pNLameYDEzeIeXo+9dGB+YMbMxkovxWts V4LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yH9YN3CX; 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.59; Fri, 11 Dec 2020 10:52:59 -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=yH9YN3CX; 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 S2390361AbgLKSw0 (ORCPT + 3 others); Fri, 11 Dec 2020 13:52:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406396AbgLKStS (ORCPT ); Fri, 11 Dec 2020 13:49:18 -0500 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5ED2DC0611CD for ; Fri, 11 Dec 2020 10:48:37 -0800 (PST) Received: by mail-lj1-x236.google.com with SMTP id b10so9738909ljp.6 for ; Fri, 11 Dec 2020 10:48:37 -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=slw9FlW0qv1ca+qHNtWZZr6egc4uA3g+4z4fUtQXfwA=; b=yH9YN3CX1M9ZwQcP1i/VPDSn6CBQQeYWJ6J4iAu8dH/wDVXFGel/wCGQsDQHQANMor TeJtPjOuECCIeyaFvQum4ty3bEZ3psaeaQA/XNhwn3DziOu71yVzWlYfmXQkJMRG1s0S nK1DkXXCN1zjvq9ei9e34hv4kHTDPfV42Drzed/fjdDTz51oIGYD1O4oksGsO7decono UVkU14uGeDyMesT6C/dalGUZAWwL3s5qVXdCaW2NVL92QoPe3WHia3nL9R0ne5mq8qB4 tWatL1shAmIHT/ks2cyeP1Za0xUE9INLNMcedXJrBxSlU30/P17qSlzn2LtJx3DGZSfB U31g== 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=slw9FlW0qv1ca+qHNtWZZr6egc4uA3g+4z4fUtQXfwA=; b=Q3JCm6TZFMoik4vkPULM+t1tyyWMpaCPuRGwHXEk7IUjNta5uHh5gDTgMD2BQj4PRg Pahdpb7SO6SmBcBfRFIWLR1+/Y/xdHN2DfuWH0oq9jEkm0KqJC/WVBUqNGNttCDIkIow MHuD3QnoY/b6Pth6dShKFwyqLipocDPjp6mjeFtbldK1jQVlyLKxo7EwrG6Y0XKLjAdV JhiJiheZmxkuhduDbLiCDyn3SCS+LHtJDQkzeMRX3DsSkwBEMxDKtHlzJltls74sPSaS a49D89ixkNYeaFwNMnoKXpsHf0HJlJuj6ynWpBdpYvuSKt+Qjl1oP7TEmOtiLMpCf9KG WLkg== X-Gm-Message-State: AOAM532zJ2Hb/uBeGXL4xiB23vCy2SfhjhQtFPx6itTuv/+xnC85WZgX So65nTls135ajofh5n1U+nzmnp8pvGa0dQ== X-Received: by 2002:a05:651c:211e:: with SMTP id a30mr6105765ljq.18.1607712515842; Fri, 11 Dec 2020 10:48:35 -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.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Dec 2020 10:48:35 -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 5/6] soc: ti: pruss: Add helper function to enable OCP master ports Date: Fri, 11 Dec 2020 19:48:10 +0100 Message-Id: <20201211184811.6490-6-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: Suman Anna The PRU-ICSS subsystem on OMAP-architecture based SoCS (AM33xx, AM437x and AM57xx SoCs) has a control bit STANDBY_INIT in the PRUSS_CFG register to initiate a Standby sequence (when set) and trigger a MStandby request to the SoC's PRCM module. This same bit is also used to enable the OCP master ports (when cleared). The clearing of the STANDBY_INIT bit requires an acknowledgment from PRCM and is done through the monitoring of the PRUSS_SYSCFG.SUB_MWAIT bit. Add a helper function pruss_cfg_ocp_master_ports() to allow the PRU client drivers to control this bit and enable or disable the firmware running on PRU cores access to any peripherals or memory to achieve desired functionality. The access is disabled by default on power-up and on any suspend (context is not maintained). Signed-off-by: Suman Anna Co-developed-by: Grzegorz Jaszczyk Signed-off-by: Grzegorz Jaszczyk --- drivers/soc/ti/pruss.c | 81 ++++++++++++++++++++++++++++++++++++++++-- include/linux/pruss.h | 6 ++++ 2 files changed, 85 insertions(+), 2 deletions(-) -- 2.29.0 diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c index 56e0ac948796..b373d5579647 100644 --- a/drivers/soc/ti/pruss.c +++ b/drivers/soc/ti/pruss.c @@ -22,14 +22,19 @@ #include #include +#define SYSCFG_STANDBY_INIT BIT(4) +#define SYSCFG_SUB_MWAIT_READY BIT(5) + /** * struct pruss_private_data - PRUSS driver private data * @has_no_sharedram: flag to indicate the absence of PRUSS Shared Data RAM * @has_core_mux_clock: flag to indicate the presence of PRUSS core clock + * @has_ocp_syscfg: flag to indicate if OCP SYSCFG is present */ struct pruss_private_data { bool has_no_sharedram; bool has_core_mux_clock; + bool has_ocp_syscfg; }; /** @@ -205,6 +210,72 @@ int pruss_cfg_update(struct pruss *pruss, unsigned int reg, } EXPORT_SYMBOL_GPL(pruss_cfg_update); +/** + * pruss_cfg_ocp_master_ports() - configure PRUSS OCP master ports + * @pruss: the pruss instance handle + * @enable: set to true for enabling or false for disabling the OCP master ports + * + * This function programs the PRUSS_SYSCFG.STANDBY_INIT bit either to enable or + * disable the OCP master ports (applicable only on SoCs using OCP interconnect + * like the OMAP family). Clearing the bit achieves dual functionalities - one + * is to deassert the MStandby signal to the device PRCM, and the other is to + * enable OCP master ports to allow accesses outside of the PRU-ICSS. The + * function has to wait for the PRCM to acknowledge through the monitoring of + * the PRUSS_SYSCFG.SUB_MWAIT bit when enabling master ports. Setting the bit + * disables the master access, and also signals the PRCM that the PRUSS is ready + * for Standby. + * + * Return: 0 on success, or an error code otherwise. ETIMEDOUT is returned + * when the ready-state fails. + */ +int pruss_cfg_ocp_master_ports(struct pruss *pruss, bool enable) +{ + int ret; + u32 syscfg_val, i; + const struct pruss_private_data *data; + + if (IS_ERR_OR_NULL(pruss)) + return -EINVAL; + + data = of_device_get_match_data(pruss->dev); + + /* nothing to do on non OMAP-SoCs */ + if (!data || !data->has_ocp_syscfg) + return 0; + + /* assert the MStandby signal during disable path */ + if (!enable) + return pruss_cfg_update(pruss, PRUSS_CFG_SYSCFG, + SYSCFG_STANDBY_INIT, + SYSCFG_STANDBY_INIT); + + /* enable the OCP master ports and disable MStandby */ + ret = pruss_cfg_update(pruss, PRUSS_CFG_SYSCFG, SYSCFG_STANDBY_INIT, 0); + if (ret) + return ret; + + /* wait till we are ready for transactions - delay is arbitrary */ + for (i = 0; i < 10; i++) { + ret = pruss_cfg_read(pruss, PRUSS_CFG_SYSCFG, &syscfg_val); + if (ret) + goto disable; + + if (!(syscfg_val & SYSCFG_SUB_MWAIT_READY)) + return 0; + + udelay(5); + } + + dev_err(pruss->dev, "timeout waiting for SUB_MWAIT_READY\n"); + ret = -ETIMEDOUT; + +disable: + pruss_cfg_update(pruss, PRUSS_CFG_SYSCFG, SYSCFG_STANDBY_INIT, + SYSCFG_STANDBY_INIT); + return ret; +} +EXPORT_SYMBOL_GPL(pruss_cfg_ocp_master_ports); + static void pruss_of_free_clk_provider(void *data) { struct device_node *clk_mux_np = data; @@ -487,10 +558,16 @@ static int pruss_remove(struct platform_device *pdev) /* instance-specific driver private data */ static const struct pruss_private_data am437x_pruss1_data = { .has_no_sharedram = false, + .has_ocp_syscfg = true, }; static const struct pruss_private_data am437x_pruss0_data = { .has_no_sharedram = true, + .has_ocp_syscfg = false, +}; + +static const struct pruss_private_data am33xx_am57xx_data = { + .has_ocp_syscfg = true, }; static const struct pruss_private_data am65x_j721e_pruss_data = { @@ -498,10 +575,10 @@ static const struct pruss_private_data am65x_j721e_pruss_data = { }; static const struct of_device_id pruss_of_match[] = { - { .compatible = "ti,am3356-pruss" }, + { .compatible = "ti,am3356-pruss", .data = &am33xx_am57xx_data }, { .compatible = "ti,am4376-pruss0", .data = &am437x_pruss0_data, }, { .compatible = "ti,am4376-pruss1", .data = &am437x_pruss1_data, }, - { .compatible = "ti,am5728-pruss" }, + { .compatible = "ti,am5728-pruss", .data = &am33xx_am57xx_data }, { .compatible = "ti,k2g-pruss" }, { .compatible = "ti,am654-icssg", .data = &am65x_j721e_pruss_data, }, { .compatible = "ti,j721e-icssg", .data = &am65x_j721e_pruss_data, }, diff --git a/include/linux/pruss.h b/include/linux/pruss.h index c8d73cc6baa9..b3087dc9730e 100644 --- a/include/linux/pruss.h +++ b/include/linux/pruss.h @@ -163,6 +163,7 @@ int pruss_release_mem_region(struct pruss *pruss, int pruss_cfg_read(struct pruss *pruss, unsigned int reg, unsigned int *val); int pruss_cfg_update(struct pruss *pruss, unsigned int reg, unsigned int mask, unsigned int val); +int pruss_cfg_ocp_master_ports(struct pruss *pruss, bool enable); #else @@ -198,6 +199,11 @@ static inline int pruss_cfg_update(struct pruss *pruss, unsigned int reg, return -ENOTSUPP; } +static inline int pruss_cfg_ocp_master_ports(struct pruss *pruss, bool enable) +{ + return -ENOTSUPP; +} + #endif /* CONFIG_TI_PRUSS */ #if IS_ENABLED(CONFIG_PRU_REMOTEPROC) From patchwork Fri Dec 11 18:48:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Jaszczyk X-Patchwork-Id: 341979 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp810576jai; Fri, 11 Dec 2020 10:52:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQPiZQ9EV4ydXsfU6WNG49hx1ZIO6HB+oeCoA75ml+Ih4N+pYp8FQAgjG36f1Rs80dF1ZD X-Received: by 2002:a50:d888:: with SMTP id p8mr13361981edj.147.1607712779629; Fri, 11 Dec 2020 10:52:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607712779; cv=none; d=google.com; s=arc-20160816; b=eeQXx59acuX+YbcVH+mbMPjSL2HwSXZ6F5Q2uEraI+z9K84I/wwQb+j38msuihwpc4 wvaDtLdXCaKZAOqcAw7anxIemXz20gaDdFq7wmpC1ghSWbwBfPeCtNOuBoA5aq6e9dwD uX8sJ6WVQBTJVNdV36Ph9OIGwTfo0BOzTWfIvUJCTgKR/WgwwLTJj/uVlk4YbWOIeopf Cp4gvYeGqdms3xwnChM1XXrtU4pAeNfKftHP8YXkKToFyJVlCmnAlUETKyZgTUVe7Aji RqEBVxpD6J+jJCJuo78U3/UJDrJy1q4ka0I1pDMep2kAkjdq5xCX05OwQe8nIGb+uIbr UtEA== 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=23e4OtAdhS6/eJqfaLbIjryiFMaMMoJbdSAg/gW4lu0=; b=OH339+3agRSEdppFU8oH+W1IYTn7GAOhK90H8sEsHE62KAUo7qTJ6o3P3w9s2fgP7Z P6gbWO4MZsB/uPjzJyJE4q97sHMJS7k0tjlhw6BnYggWk/zrarbvtFRzqfCkG6hwRr3U EIsvzblj49G9C/MFv6qdCRxo6jUCkVreJbVgDnWAp4Mmi10D3sKu8QUDdgpgRyfyPHi/ d42tidyIg7rhFDGx74HdXMgHDvgMwNH5MFrGyZPPup6GbCj+qMoBPUnWU/FW3HmpdcCf GCB8kVh1ti1FrbCIPO06TnSsIOs3SDXa52beQwvdEZTkjB4PxLrZi9rQ2Lr9ZiY7+yR1 yh1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q79X2koi; 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.59; Fri, 11 Dec 2020 10:52:59 -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=q79X2koi; 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 S1727714AbgLKSw0 (ORCPT + 3 others); Fri, 11 Dec 2020 13:52:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391175AbgLKStS (ORCPT ); Fri, 11 Dec 2020 13:49:18 -0500 Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8086CC0611D0 for ; Fri, 11 Dec 2020 10:48:38 -0800 (PST) Received: by mail-lf1-x142.google.com with SMTP id u18so14696985lfd.9 for ; Fri, 11 Dec 2020 10:48:38 -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=23e4OtAdhS6/eJqfaLbIjryiFMaMMoJbdSAg/gW4lu0=; b=q79X2koiMjIHXybLkIW4FWzjM/9/iZFbs+VMBdG6rVDGEHSeJh7EPaE+HbHzPrq7oU CigCr/VHSjXJfVgBpTI05X1oJY0g2BT7jjhHlm8w95330FvCWsMNYmSxXdDpJVmFmPCr e44f0E+2RX6RkzuqcEu7hYqwHNCk0Fgt/1stP62U0Bf9vCOmyivfbb5QoggKNVfBRwDq tyVkLBum85kpO75FYOeuReJgHBG/cTqxY6ZQ7d6g4B6GFz9YYlnKzo2ZmTKZ2oKf6Jth JorAl48lb+ppozzchngCQK6trkAGU1w+3jFsWLCbO/BO503e01IXfdV/PMFSpRF/8/RR MBCA== 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=23e4OtAdhS6/eJqfaLbIjryiFMaMMoJbdSAg/gW4lu0=; b=rR6cameEQlmWegm12WhXswqaoLb8Dmfcw/7KsKZRWYNiaSjvpV6gNvQl8bgkQ5iqXn 7fj0+Tq5ztJZqEyz0gWqvOki/tDsEdDXPrz2VXrDooZt7m1/HmDb/IXselYUX4z0zqsM oNNd1mrySNX7S+ich4BBfht+fSDpXbJzac93PeZVw5d1IarzXAfEiRlnXJauPB7Ply/E y6fgUZLa8+VGRNndds8eNObMgaDyYuuD/QEdfRpzlppUsJhJ8xQsqdm0lrcpBOePwDeT TAjw2F3/kjKHMRQjWEgVc5wrp+Qh2uQcJU206w02sMlzSn/+W55TWasYG7plDkZdMNRo bAjQ== X-Gm-Message-State: AOAM5326gA6DKSLh/679P8TFxwNxHVktru28OHaa1iFAQcCFkAEKtjLt YFQDhu/EykuEoKZ38E0bnw5XTA== X-Received: by 2002:ac2:5451:: with SMTP id d17mr2678709lfn.222.1607712517070; Fri, 11 Dec 2020 10:48:37 -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.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Dec 2020 10:48:36 -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 6/6] soc: ti: pruss: Add helper functions to get/set PRUSS_CFG_GPMUX Date: Fri, 11 Dec 2020 19:48:11 +0100 Message-Id: <20201211184811.6490-7-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: Tero Kristo Add two new helper functions pruss_cfg_get_gpmux() & pruss_cfg_set_gpmux() to get and set the GP MUX mode for programming the PRUSS internal wrapper mux functionality as needed by usecases. 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 --- include/linux/pruss_driver.h | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) -- 2.29.0 diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h index e2d5477225c6..3312281ef4c1 100644 --- a/include/linux/pruss_driver.h +++ b/include/linux/pruss_driver.h @@ -35,4 +35,48 @@ struct pruss { struct clk *iep_clk_mux; }; +/** + * pruss_cfg_get_gpmux() - get the current GPMUX value for a PRU device + * @pruss: pruss instance + * @pru_id: PRU identifier (0-1) + * @mux: pointer to store the current mux value into + * + * Return: 0 on success, or an error code otherwise + */ +static inline int pruss_cfg_get_gpmux(struct pruss *pruss, + enum pruss_pru_id pru_id, u8 *mux) +{ + int ret = 0; + u32 val; + + if (pru_id < 0 || pru_id >= PRUSS_NUM_PRUS) + return -EINVAL; + + ret = pruss_cfg_read(pruss, PRUSS_CFG_GPCFG(pru_id), &val); + if (!ret) + *mux = (u8)((val & PRUSS_GPCFG_PRU_MUX_SEL_MASK) >> + PRUSS_GPCFG_PRU_MUX_SEL_SHIFT); + return ret; +} + +/** + * pruss_cfg_set_gpmux() - set the GPMUX value for a PRU device + * @pruss: pruss instance + * @pru_id: PRU identifier (0-1) + * @mux: new mux value for PRU + * + * Return: 0 on success, or an error code otherwise + */ +static inline int pruss_cfg_set_gpmux(struct pruss *pruss, + enum pruss_pru_id pru_id, u8 mux) +{ + if (mux >= PRUSS_GP_MUX_SEL_MAX || + pru_id < 0 || pru_id >= PRUSS_NUM_PRUS) + return -EINVAL; + + return pruss_cfg_update(pruss, PRUSS_CFG_GPCFG(pru_id), + PRUSS_GPCFG_PRU_MUX_SEL_MASK, + (u32)mux << PRUSS_GPCFG_PRU_MUX_SEL_SHIFT); +} + #endif /* _PRUSS_DRIVER_H_ */