* [PATCH v8 1/4] soc: ti: pruss: Add pruss_get()/put() API
2023-04-12 10:30 [PATCH v8 0/4] Introduce PRU platform consumer API MD Danish Anwar
@ 2023-04-12 10:30 ` MD Danish Anwar
2023-04-12 17:00 ` Mathieu Poirier
2023-04-12 10:30 ` [PATCH v8 2/4] soc: ti: pruss: Add pruss_{request,release}_mem_region() API MD Danish Anwar
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: MD Danish Anwar @ 2023-04-12 10:30 UTC (permalink / raw)
To: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, MD Danish Anwar, Mathieu Poirier, Bjorn Andersson,
Santosh Shilimkar, Nishanth Menon
Cc: linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
From: Tero Kristo <t-kristo@ti.com>
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 <s-anna@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Reviewed-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
---
drivers/soc/ti/pruss.c | 62 ++++++++++++++++++++++++++++++++++++
include/linux/pruss_driver.h | 18 +++++++++++
2 files changed, 80 insertions(+)
diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
index 6882c86b3ce5..3fac92df8790 100644
--- a/drivers/soc/ti/pruss.c
+++ b/drivers/soc/ti/pruss.c
@@ -6,6 +6,7 @@
* Author(s):
* Suman Anna <s-anna@ti.com>
* Andrew F. Davis <afd@ti.com>
+ * Tero Kristo <t-kristo@ti.com>
*/
#include <linux/clk-provider.h>
@@ -18,6 +19,7 @@
#include <linux/pm_runtime.h>
#include <linux/pruss_driver.h>
#include <linux/regmap.h>
+#include <linux/remoteproc.h>
#include <linux/slab.h>
/**
@@ -30,6 +32,66 @@ 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.
+ *
+ * This API doesn't check if @rproc is valid or not. It is expected the caller
+ * will have done a pru_rproc_get() on @rproc, before calling this API to make
+ * sure that @rproc is valid.
+ *
+ * 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_driver.h b/include/linux/pruss_driver.h
index ecfded30ed05..cb40c2b31045 100644
--- a/include/linux/pruss_driver.h
+++ b/include/linux/pruss_driver.h
@@ -9,7 +9,9 @@
#ifndef _PRUSS_DRIVER_H_
#define _PRUSS_DRIVER_H_
+#include <linux/remoteproc/pruss.h>
#include <linux/types.h>
+#include <linux/err.h>
/*
* enum pruss_mem - PRUSS memory range identifiers
@@ -51,4 +53,20 @@ struct pruss {
struct clk *iep_clk_mux;
};
+#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(-EOPNOTSUPP);
+}
+
+static inline void pruss_put(struct pruss *pruss) { }
+
+#endif /* CONFIG_TI_PRUSS */
+
#endif /* _PRUSS_DRIVER_H_ */
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v8 1/4] soc: ti: pruss: Add pruss_get()/put() API
2023-04-12 10:30 ` [PATCH v8 1/4] soc: ti: pruss: Add pruss_get()/put() API MD Danish Anwar
@ 2023-04-12 17:00 ` Mathieu Poirier
0 siblings, 0 replies; 11+ messages in thread
From: Mathieu Poirier @ 2023-04-12 17:00 UTC (permalink / raw)
To: MD Danish Anwar
Cc: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, Bjorn Andersson, Santosh Shilimkar, Nishanth Menon,
linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
On Wed, Apr 12, 2023 at 04:00:09PM +0530, MD Danish Anwar wrote:
> From: Tero Kristo <t-kristo@ti.com>
>
> 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 <s-anna@ti.com>
> Signed-off-by: Suman Anna <s-anna@ti.com>
> Signed-off-by: Tero Kristo <t-kristo@ti.com>
> Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
> Reviewed-by: Roger Quadros <rogerq@kernel.org>
> Reviewed-by: Tony Lindgren <tony@atomide.com>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
> ---
> drivers/soc/ti/pruss.c | 62 ++++++++++++++++++++++++++++++++++++
> include/linux/pruss_driver.h | 18 +++++++++++
> 2 files changed, 80 insertions(+)
>
Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
> index 6882c86b3ce5..3fac92df8790 100644
> --- a/drivers/soc/ti/pruss.c
> +++ b/drivers/soc/ti/pruss.c
> @@ -6,6 +6,7 @@
> * Author(s):
> * Suman Anna <s-anna@ti.com>
> * Andrew F. Davis <afd@ti.com>
> + * Tero Kristo <t-kristo@ti.com>
> */
>
> #include <linux/clk-provider.h>
> @@ -18,6 +19,7 @@
> #include <linux/pm_runtime.h>
> #include <linux/pruss_driver.h>
> #include <linux/regmap.h>
> +#include <linux/remoteproc.h>
> #include <linux/slab.h>
>
> /**
> @@ -30,6 +32,66 @@ 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.
> + *
> + * This API doesn't check if @rproc is valid or not. It is expected the caller
> + * will have done a pru_rproc_get() on @rproc, before calling this API to make
> + * sure that @rproc is valid.
> + *
> + * 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_driver.h b/include/linux/pruss_driver.h
> index ecfded30ed05..cb40c2b31045 100644
> --- a/include/linux/pruss_driver.h
> +++ b/include/linux/pruss_driver.h
> @@ -9,7 +9,9 @@
> #ifndef _PRUSS_DRIVER_H_
> #define _PRUSS_DRIVER_H_
>
> +#include <linux/remoteproc/pruss.h>
> #include <linux/types.h>
> +#include <linux/err.h>
>
> /*
> * enum pruss_mem - PRUSS memory range identifiers
> @@ -51,4 +53,20 @@ struct pruss {
> struct clk *iep_clk_mux;
> };
>
> +#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(-EOPNOTSUPP);
> +}
> +
> +static inline void pruss_put(struct pruss *pruss) { }
> +
> +#endif /* CONFIG_TI_PRUSS */
> +
> #endif /* _PRUSS_DRIVER_H_ */
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v8 2/4] soc: ti: pruss: Add pruss_{request,release}_mem_region() API
2023-04-12 10:30 [PATCH v8 0/4] Introduce PRU platform consumer API MD Danish Anwar
2023-04-12 10:30 ` [PATCH v8 1/4] soc: ti: pruss: Add pruss_get()/put() API MD Danish Anwar
@ 2023-04-12 10:30 ` MD Danish Anwar
2023-04-12 17:01 ` Mathieu Poirier
2023-04-12 10:30 ` [PATCH v8 3/4] soc: ti: pruss: Add pruss_cfg_read()/update(), pruss_cfg_get_gpmux()/set_gpmux() APIs MD Danish Anwar
2023-04-12 10:30 ` [PATCH v8 4/4] soc: ti: pruss: Add helper functions to set GPI mode, MII_RT_event and XFR MD Danish Anwar
3 siblings, 1 reply; 11+ messages in thread
From: MD Danish Anwar @ 2023-04-12 10:30 UTC (permalink / raw)
To: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, MD Danish Anwar, Mathieu Poirier, Bjorn Andersson,
Santosh Shilimkar, Nishanth Menon
Cc: linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
From: "Andrew F. Davis" <afd@ti.com>
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 <s-anna@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Andrew F. Davis <afd@ti.com>
Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
---
drivers/soc/ti/pruss.c | 77 ++++++++++++++++++++++++++++++++++++
include/linux/pruss_driver.h | 22 +++++++++++
2 files changed, 99 insertions(+)
diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
index 3fac92df8790..8ada3758b31a 100644
--- a/drivers/soc/ti/pruss.c
+++ b/drivers/soc/ti/pruss.c
@@ -92,6 +92,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;
@@ -294,6 +370,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_driver.h b/include/linux/pruss_driver.h
index cb40c2b31045..c8f2e53b911b 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 <linux/mutex.h>
#include <linux/remoteproc/pruss.h>
#include <linux/types.h>
#include <linux/err.h>
@@ -41,6 +42,8 @@ struct pruss_mem_region {
* @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
*/
@@ -49,6 +52,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;
};
@@ -57,6 +62,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
@@ -67,6 +76,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 -EOPNOTSUPP;
+}
+
+static inline int pruss_release_mem_region(struct pruss *pruss,
+ struct pruss_mem_region *region)
+{
+ return -EOPNOTSUPP;
+}
+
#endif /* CONFIG_TI_PRUSS */
#endif /* _PRUSS_DRIVER_H_ */
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v8 2/4] soc: ti: pruss: Add pruss_{request,release}_mem_region() API
2023-04-12 10:30 ` [PATCH v8 2/4] soc: ti: pruss: Add pruss_{request,release}_mem_region() API MD Danish Anwar
@ 2023-04-12 17:01 ` Mathieu Poirier
0 siblings, 0 replies; 11+ messages in thread
From: Mathieu Poirier @ 2023-04-12 17:01 UTC (permalink / raw)
To: MD Danish Anwar
Cc: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, Bjorn Andersson, Santosh Shilimkar, Nishanth Menon,
linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
On Wed, Apr 12, 2023 at 04:00:10PM +0530, MD Danish Anwar wrote:
> From: "Andrew F. Davis" <afd@ti.com>
>
> 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 <s-anna@ti.com>
> Signed-off-by: Suman Anna <s-anna@ti.com>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> Reviewed-by: Roger Quadros <rogerq@kernel.org>
> Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> Reviewed-by: Tony Lindgren <tony@atomide.com>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
> ---
> drivers/soc/ti/pruss.c | 77 ++++++++++++++++++++++++++++++++++++
> include/linux/pruss_driver.h | 22 +++++++++++
> 2 files changed, 99 insertions(+)
>
Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
> index 3fac92df8790..8ada3758b31a 100644
> --- a/drivers/soc/ti/pruss.c
> +++ b/drivers/soc/ti/pruss.c
> @@ -92,6 +92,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;
> @@ -294,6 +370,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_driver.h b/include/linux/pruss_driver.h
> index cb40c2b31045..c8f2e53b911b 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 <linux/mutex.h>
> #include <linux/remoteproc/pruss.h>
> #include <linux/types.h>
> #include <linux/err.h>
> @@ -41,6 +42,8 @@ struct pruss_mem_region {
> * @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
> */
> @@ -49,6 +52,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;
> };
> @@ -57,6 +62,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
>
> @@ -67,6 +76,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 -EOPNOTSUPP;
> +}
> +
> +static inline int pruss_release_mem_region(struct pruss *pruss,
> + struct pruss_mem_region *region)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> #endif /* CONFIG_TI_PRUSS */
>
> #endif /* _PRUSS_DRIVER_H_ */
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v8 3/4] soc: ti: pruss: Add pruss_cfg_read()/update(), pruss_cfg_get_gpmux()/set_gpmux() APIs
2023-04-12 10:30 [PATCH v8 0/4] Introduce PRU platform consumer API MD Danish Anwar
2023-04-12 10:30 ` [PATCH v8 1/4] soc: ti: pruss: Add pruss_get()/put() API MD Danish Anwar
2023-04-12 10:30 ` [PATCH v8 2/4] soc: ti: pruss: Add pruss_{request,release}_mem_region() API MD Danish Anwar
@ 2023-04-12 10:30 ` MD Danish Anwar
2023-04-12 17:06 ` Mathieu Poirier
2023-04-12 10:30 ` [PATCH v8 4/4] soc: ti: pruss: Add helper functions to set GPI mode, MII_RT_event and XFR MD Danish Anwar
3 siblings, 1 reply; 11+ messages in thread
From: MD Danish Anwar @ 2023-04-12 10:30 UTC (permalink / raw)
To: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, MD Danish Anwar, Mathieu Poirier, Bjorn Andersson,
Santosh Shilimkar, Nishanth Menon
Cc: linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
From: Suman Anna <s-anna@ti.com>
Add two new generic API pruss_cfg_read() and pruss_cfg_update() to
the PRUSS platform driver to read and program respectively a register
within the PRUSS CFG sub-module represented by a syscon driver. These
APIs are internal to PRUSS driver.
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.
Various useful registers and macros for certain register bit-fields and
their values have also been added.
Signed-off-by: Suman Anna <s-anna@ti.com>
Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Reviewed-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
---
drivers/soc/ti/pruss.c | 45 ++++++++++++++++++
drivers/soc/ti/pruss.h | 88 ++++++++++++++++++++++++++++++++++++
include/linux/pruss_driver.h | 32 +++++++++++++
3 files changed, 165 insertions(+)
create mode 100644 drivers/soc/ti/pruss.h
diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
index 8ada3758b31a..34d513816a9d 100644
--- a/drivers/soc/ti/pruss.c
+++ b/drivers/soc/ti/pruss.c
@@ -21,6 +21,7 @@
#include <linux/regmap.h>
#include <linux/remoteproc.h>
#include <linux/slab.h>
+#include "pruss.h"
/**
* struct pruss_private_data - PRUSS driver private data
@@ -168,6 +169,50 @@ int pruss_release_mem_region(struct pruss *pruss,
}
EXPORT_SYMBOL_GPL(pruss_release_mem_region);
+/**
+ * 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
+ */
+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 || !mux)
+ 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;
+}
+EXPORT_SYMBOL_GPL(pruss_cfg_get_gpmux);
+
+/**
+ * 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
+ */
+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);
+}
+EXPORT_SYMBOL_GPL(pruss_cfg_set_gpmux);
+
static void pruss_of_free_clk_provider(void *data)
{
struct device_node *clk_mux_np = data;
diff --git a/drivers/soc/ti/pruss.h b/drivers/soc/ti/pruss.h
new file mode 100644
index 000000000000..6c55987e0e55
--- /dev/null
+++ b/drivers/soc/ti/pruss.h
@@ -0,0 +1,88 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * PRU-ICSS Subsystem user interfaces
+ *
+ * Copyright (C) 2015-2023 Texas Instruments Incorporated - http://www.ti.com
+ * MD Danish Anwar <danishanwar@ti.com>
+ */
+
+#ifndef _SOC_TI_PRUSS_H_
+#define _SOC_TI_PRUSS_H_
+
+#include <linux/bits.h>
+#include <linux/regmap.h>
+
+/*
+ * 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_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)
+#define PRUSS_SPP_RTU_XFR_SHIFT_EN BIT(3)
+
+/**
+ * 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
+ */
+static 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);
+}
+
+/**
+ * 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
+ */
+static 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);
+}
+
+#endif /* _SOC_TI_PRUSS_H_ */
diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h
index c8f2e53b911b..c70e08c90165 100644
--- a/include/linux/pruss_driver.h
+++ b/include/linux/pruss_driver.h
@@ -14,6 +14,24 @@
#include <linux/types.h>
#include <linux/err.h>
+/*
+ * 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_mem - PRUSS memory range identifiers
*/
@@ -66,6 +84,8 @@ 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_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux);
+int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux);
#else
@@ -89,6 +109,18 @@ static inline int pruss_release_mem_region(struct pruss *pruss,
return -EOPNOTSUPP;
}
+static inline int pruss_cfg_get_gpmux(struct pruss *pruss,
+ enum pruss_pru_id pru_id, u8 *mux)
+{
+ return ERR_PTR(-EOPNOTSUPP);
+}
+
+static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
+ enum pruss_pru_id pru_id, u8 mux)
+{
+ return ERR_PTR(-EOPNOTSUPP);
+}
+
#endif /* CONFIG_TI_PRUSS */
#endif /* _PRUSS_DRIVER_H_ */
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v8 3/4] soc: ti: pruss: Add pruss_cfg_read()/update(), pruss_cfg_get_gpmux()/set_gpmux() APIs
2023-04-12 10:30 ` [PATCH v8 3/4] soc: ti: pruss: Add pruss_cfg_read()/update(), pruss_cfg_get_gpmux()/set_gpmux() APIs MD Danish Anwar
@ 2023-04-12 17:06 ` Mathieu Poirier
2023-04-12 17:14 ` Mathieu Poirier
0 siblings, 1 reply; 11+ messages in thread
From: Mathieu Poirier @ 2023-04-12 17:06 UTC (permalink / raw)
To: MD Danish Anwar
Cc: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, Bjorn Andersson, Santosh Shilimkar, Nishanth Menon,
linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
On Wed, Apr 12, 2023 at 04:00:11PM +0530, MD Danish Anwar wrote:
> From: Suman Anna <s-anna@ti.com>
>
> Add two new generic API pruss_cfg_read() and pruss_cfg_update() to
> the PRUSS platform driver to read and program respectively a register
> within the PRUSS CFG sub-module represented by a syscon driver. These
> APIs are internal to PRUSS driver.
>
> 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.
>
> Various useful registers and macros for certain register bit-fields and
> their values have also been added.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
> Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
> Reviewed-by: Roger Quadros <rogerq@kernel.org>
> Reviewed-by: Tony Lindgren <tony@atomide.com>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
> ---
> drivers/soc/ti/pruss.c | 45 ++++++++++++++++++
> drivers/soc/ti/pruss.h | 88 ++++++++++++++++++++++++++++++++++++
> include/linux/pruss_driver.h | 32 +++++++++++++
> 3 files changed, 165 insertions(+)
> create mode 100644 drivers/soc/ti/pruss.h
>
> diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
> index 8ada3758b31a..34d513816a9d 100644
> --- a/drivers/soc/ti/pruss.c
> +++ b/drivers/soc/ti/pruss.c
> @@ -21,6 +21,7 @@
> #include <linux/regmap.h>
> #include <linux/remoteproc.h>
> #include <linux/slab.h>
> +#include "pruss.h"
>
> /**
> * struct pruss_private_data - PRUSS driver private data
> @@ -168,6 +169,50 @@ int pruss_release_mem_region(struct pruss *pruss,
> }
> EXPORT_SYMBOL_GPL(pruss_release_mem_region);
>
> +/**
> + * 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
> + */
> +int pruss_cfg_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux)
> +{
> + int ret = 0;
Variable initialization is not needed.
> + u32 val;
> +
> + if (pru_id < 0 || pru_id >= PRUSS_NUM_PRUS || !mux)
If @pru_id is an enum, how can it be smaller than 0?
> + 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;
> +}
> +EXPORT_SYMBOL_GPL(pruss_cfg_get_gpmux);
> +
> +/**
> + * 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
> + */
> +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)
Same
> + 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);
> +}
> +EXPORT_SYMBOL_GPL(pruss_cfg_set_gpmux);
> +
> static void pruss_of_free_clk_provider(void *data)
> {
> struct device_node *clk_mux_np = data;
> diff --git a/drivers/soc/ti/pruss.h b/drivers/soc/ti/pruss.h
> new file mode 100644
> index 000000000000..6c55987e0e55
> --- /dev/null
> +++ b/drivers/soc/ti/pruss.h
> @@ -0,0 +1,88 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * PRU-ICSS Subsystem user interfaces
> + *
> + * Copyright (C) 2015-2023 Texas Instruments Incorporated - http://www.ti.com
> + * MD Danish Anwar <danishanwar@ti.com>
> + */
> +
> +#ifndef _SOC_TI_PRUSS_H_
> +#define _SOC_TI_PRUSS_H_
> +
> +#include <linux/bits.h>
> +#include <linux/regmap.h>
> +
> +/*
> + * 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_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)
> +#define PRUSS_SPP_RTU_XFR_SHIFT_EN BIT(3)
> +
> +/**
> + * 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
> + */
> +static 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);
> +}
> +
> +/**
> + * 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
> + */
> +static 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);
> +}
> +
> +#endif /* _SOC_TI_PRUSS_H_ */
> diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h
> index c8f2e53b911b..c70e08c90165 100644
> --- a/include/linux/pruss_driver.h
> +++ b/include/linux/pruss_driver.h
> @@ -14,6 +14,24 @@
> #include <linux/types.h>
> #include <linux/err.h>
>
> +/*
> + * 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,
Initialization not needed
> + 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_mem - PRUSS memory range identifiers
> */
> @@ -66,6 +84,8 @@ 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_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux);
> +int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux);
>
> #else
>
> @@ -89,6 +109,18 @@ static inline int pruss_release_mem_region(struct pruss *pruss,
> return -EOPNOTSUPP;
> }
>
> +static inline int pruss_cfg_get_gpmux(struct pruss *pruss,
> + enum pruss_pru_id pru_id, u8 *mux)
> +{
> + return ERR_PTR(-EOPNOTSUPP);
> +}
> +
> +static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
> + enum pruss_pru_id pru_id, u8 mux)
> +{
> + return ERR_PTR(-EOPNOTSUPP);
> +}
> +
> #endif /* CONFIG_TI_PRUSS */
>
> #endif /* _PRUSS_DRIVER_H_ */
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v8 3/4] soc: ti: pruss: Add pruss_cfg_read()/update(), pruss_cfg_get_gpmux()/set_gpmux() APIs
2023-04-12 17:06 ` Mathieu Poirier
@ 2023-04-12 17:14 ` Mathieu Poirier
0 siblings, 0 replies; 11+ messages in thread
From: Mathieu Poirier @ 2023-04-12 17:14 UTC (permalink / raw)
To: MD Danish Anwar
Cc: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, Bjorn Andersson, Santosh Shilimkar, Nishanth Menon,
linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
On Wed, Apr 12, 2023 at 11:06:54AM -0600, Mathieu Poirier wrote:
> On Wed, Apr 12, 2023 at 04:00:11PM +0530, MD Danish Anwar wrote:
> > From: Suman Anna <s-anna@ti.com>
> >
> > Add two new generic API pruss_cfg_read() and pruss_cfg_update() to
> > the PRUSS platform driver to read and program respectively a register
> > within the PRUSS CFG sub-module represented by a syscon driver. These
> > APIs are internal to PRUSS driver.
> >
> > 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.
> >
> > Various useful registers and macros for certain register bit-fields and
> > their values have also been added.
> >
> > Signed-off-by: Suman Anna <s-anna@ti.com>
> > Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> > Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> > Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
> > Reviewed-by: Roger Quadros <rogerq@kernel.org>
> > Reviewed-by: Tony Lindgren <tony@atomide.com>
> > Reviewed-by: Simon Horman <simon.horman@corigine.com>
> > Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
> > ---
> > drivers/soc/ti/pruss.c | 45 ++++++++++++++++++
> > drivers/soc/ti/pruss.h | 88 ++++++++++++++++++++++++++++++++++++
> > include/linux/pruss_driver.h | 32 +++++++++++++
> > 3 files changed, 165 insertions(+)
> > create mode 100644 drivers/soc/ti/pruss.h
> >
> > diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
> > index 8ada3758b31a..34d513816a9d 100644
> > --- a/drivers/soc/ti/pruss.c
> > +++ b/drivers/soc/ti/pruss.c
> > @@ -21,6 +21,7 @@
> > #include <linux/regmap.h>
> > #include <linux/remoteproc.h>
> > #include <linux/slab.h>
> > +#include "pruss.h"
> >
> > /**
> > * struct pruss_private_data - PRUSS driver private data
> > @@ -168,6 +169,50 @@ int pruss_release_mem_region(struct pruss *pruss,
> > }
> > EXPORT_SYMBOL_GPL(pruss_release_mem_region);
> >
> > +/**
> > + * 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
> > + */
> > +int pruss_cfg_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux)
> > +{
> > + int ret = 0;
>
> Variable initialization is not needed.
>
> > + u32 val;
> > +
> > + if (pru_id < 0 || pru_id >= PRUSS_NUM_PRUS || !mux)
>
> If @pru_id is an enum, how can it be smaller than 0?
>
> > + 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;
> > +}
> > +EXPORT_SYMBOL_GPL(pruss_cfg_get_gpmux);
> > +
> > +/**
> > + * 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
> > + */
> > +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)
>
> Same
>
> > + 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);
> > +}
> > +EXPORT_SYMBOL_GPL(pruss_cfg_set_gpmux);
> > +
> > static void pruss_of_free_clk_provider(void *data)
> > {
> > struct device_node *clk_mux_np = data;
> > diff --git a/drivers/soc/ti/pruss.h b/drivers/soc/ti/pruss.h
> > new file mode 100644
> > index 000000000000..6c55987e0e55
> > --- /dev/null
> > +++ b/drivers/soc/ti/pruss.h
> > @@ -0,0 +1,88 @@
> > +/* SPDX-License-Identifier: GPL-2.0-only */
> > +/*
> > + * PRU-ICSS Subsystem user interfaces
> > + *
> > + * Copyright (C) 2015-2023 Texas Instruments Incorporated - http://www.ti.com
> > + * MD Danish Anwar <danishanwar@ti.com>
> > + */
> > +
> > +#ifndef _SOC_TI_PRUSS_H_
> > +#define _SOC_TI_PRUSS_H_
> > +
> > +#include <linux/bits.h>
> > +#include <linux/regmap.h>
> > +
> > +/*
> > + * 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_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)
> > +#define PRUSS_SPP_RTU_XFR_SHIFT_EN BIT(3)
> > +
> > +/**
> > + * 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
> > + */
> > +static 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);
> > +}
> > +
> > +/**
> > + * 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
> > + */
> > +static 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);
> > +}
> > +
> > +#endif /* _SOC_TI_PRUSS_H_ */
> > diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h
> > index c8f2e53b911b..c70e08c90165 100644
> > --- a/include/linux/pruss_driver.h
> > +++ b/include/linux/pruss_driver.h
> > @@ -14,6 +14,24 @@
> > #include <linux/types.h>
> > #include <linux/err.h>
> >
> > +/*
> > + * 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,
>
> Initialization not needed
>
With the above:
Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> > + 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_mem - PRUSS memory range identifiers
> > */
> > @@ -66,6 +84,8 @@ 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_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux);
> > +int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux);
> >
> > #else
> >
> > @@ -89,6 +109,18 @@ static inline int pruss_release_mem_region(struct pruss *pruss,
> > return -EOPNOTSUPP;
> > }
> >
> > +static inline int pruss_cfg_get_gpmux(struct pruss *pruss,
> > + enum pruss_pru_id pru_id, u8 *mux)
> > +{
> > + return ERR_PTR(-EOPNOTSUPP);
> > +}
> > +
> > +static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
> > + enum pruss_pru_id pru_id, u8 mux)
> > +{
> > + return ERR_PTR(-EOPNOTSUPP);
> > +}
> > +
> > #endif /* CONFIG_TI_PRUSS */
> >
> > #endif /* _PRUSS_DRIVER_H_ */
> > --
> > 2.34.1
> >
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v8 4/4] soc: ti: pruss: Add helper functions to set GPI mode, MII_RT_event and XFR
2023-04-12 10:30 [PATCH v8 0/4] Introduce PRU platform consumer API MD Danish Anwar
` (2 preceding siblings ...)
2023-04-12 10:30 ` [PATCH v8 3/4] soc: ti: pruss: Add pruss_cfg_read()/update(), pruss_cfg_get_gpmux()/set_gpmux() APIs MD Danish Anwar
@ 2023-04-12 10:30 ` MD Danish Anwar
2023-04-12 17:13 ` Mathieu Poirier
3 siblings, 1 reply; 11+ messages in thread
From: MD Danish Anwar @ 2023-04-12 10:30 UTC (permalink / raw)
To: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, MD Danish Anwar, Mathieu Poirier, Bjorn Andersson,
Santosh Shilimkar, Nishanth Menon
Cc: linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
From: Suman Anna <s-anna@ti.com>
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 <s-anna@ti.com>
Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Reviewed-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
---
drivers/remoteproc/pru_rproc.c | 15 -------
drivers/soc/ti/pruss.c | 74 ++++++++++++++++++++++++++++++++++
include/linux/pruss_driver.h | 51 +++++++++++++++++++++++
3 files changed, 125 insertions(+), 15 deletions(-)
diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
index 095f66130f48..54f5ce302e7a 100644
--- a/drivers/remoteproc/pru_rproc.c
+++ b/drivers/remoteproc/pru_rproc.c
@@ -81,21 +81,6 @@ enum pru_iomem {
PRU_IOMEM_MAX,
};
-/**
- * enum pru_type - PRU core type identifier
- *
- * @PRU_TYPE_PRU: Programmable Real-time Unit
- * @PRU_TYPE_RTU: Auxiliary Programmable Real-Time Unit
- * @PRU_TYPE_TX_PRU: Transmit Programmable Real-Time Unit
- * @PRU_TYPE_MAX: just keep this one at the end
- */
-enum pru_type {
- PRU_TYPE_PRU = 0,
- PRU_TYPE_RTU,
- PRU_TYPE_TX_PRU,
- PRU_TYPE_MAX,
-};
-
/**
* struct pru_private_data - device data for a PRU core
* @type: type of the PRU core (PRU, RTU, Tx_PRU)
diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
index 34d513816a9d..90a625ab9cfc 100644
--- a/drivers/soc/ti/pruss.c
+++ b/drivers/soc/ti/pruss.c
@@ -213,6 +213,80 @@ int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux)
}
EXPORT_SYMBOL_GPL(pruss_cfg_set_gpmux);
+/**
+ * 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
+ */
+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;
+
+ if (mode < 0 || mode > PRUSS_GPI_MODE_MAX)
+ 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);
+}
+EXPORT_SYMBOL_GPL(pruss_cfg_gpimode);
+
+/**
+ * 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
+ */
+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);
+}
+EXPORT_SYMBOL_GPL(pruss_cfg_miirt_enable);
+
+/**
+ * pruss_cfg_xfr_enable() - Enable/disable XIN XOUT shift functionality
+ * @pruss: the pruss instance
+ * @pru_type: PRU core type identifier
+ * @enable: enable/disable
+ *
+ * Return: 0 on success, or an error code otherwise
+ */
+int pruss_cfg_xfr_enable(struct pruss *pruss, enum pru_type pru_type,
+ bool enable)
+{
+ u32 mask, set;
+
+ switch (pru_type) {
+ case PRU_TYPE_PRU:
+ mask = PRUSS_SPP_XFER_SHIFT_EN;
+ break;
+ case PRU_TYPE_RTU:
+ mask = PRUSS_SPP_RTU_XFR_SHIFT_EN;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ set = enable ? mask : 0;
+
+ return pruss_cfg_update(pruss, PRUSS_CFG_SPP, mask, set);
+}
+EXPORT_SYMBOL_GPL(pruss_cfg_xfr_enable);
+
static void pruss_of_free_clk_provider(void *data)
{
struct device_node *clk_mux_np = data;
diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h
index c70e08c90165..2a139bfda452 100644
--- a/include/linux/pruss_driver.h
+++ b/include/linux/pruss_driver.h
@@ -32,6 +32,33 @@ enum pruss_gp_mux_sel {
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,
+ PRUSS_GPI_MODE_MAX,
+};
+
+/**
+ * enum pru_type - PRU core type identifier
+ *
+ * @PRU_TYPE_PRU: Programmable Real-time Unit
+ * @PRU_TYPE_RTU: Auxiliary Programmable Real-Time Unit
+ * @PRU_TYPE_TX_PRU: Transmit Programmable Real-Time Unit
+ * @PRU_TYPE_MAX: just keep this one at the end
+ */
+enum pru_type {
+ PRU_TYPE_PRU = 0,
+ PRU_TYPE_RTU,
+ PRU_TYPE_TX_PRU,
+ PRU_TYPE_MAX,
+};
+
/*
* enum pruss_mem - PRUSS memory range identifiers
*/
@@ -86,6 +113,11 @@ int pruss_release_mem_region(struct pruss *pruss,
struct pruss_mem_region *region);
int pruss_cfg_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux);
int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux);
+int pruss_cfg_gpimode(struct pruss *pruss, enum pruss_pru_id pru_id,
+ enum pruss_gpi_mode mode);
+int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable);
+int pruss_cfg_xfr_enable(struct pruss *pruss, enum pru_type pru_type,
+ bool enable);
#else
@@ -121,6 +153,25 @@ static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
return ERR_PTR(-EOPNOTSUPP);
}
+static inline int pruss_cfg_gpimode(struct pruss *pruss,
+ enum pruss_pru_id pru_id,
+ enum pruss_gpi_mode mode)
+{
+ return ERR_PTR(-EOPNOTSUPP);
+}
+
+static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)
+{
+ return ERR_PTR(-EOPNOTSUPP);
+}
+
+static inline int pruss_cfg_xfr_enable(struct pruss *pruss,
+ enum pru_type pru_type,
+ bool enable);
+{
+ return ERR_PTR(-EOPNOTSUPP);
+}
+
#endif /* CONFIG_TI_PRUSS */
#endif /* _PRUSS_DRIVER_H_ */
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v8 4/4] soc: ti: pruss: Add helper functions to set GPI mode, MII_RT_event and XFR
2023-04-12 10:30 ` [PATCH v8 4/4] soc: ti: pruss: Add helper functions to set GPI mode, MII_RT_event and XFR MD Danish Anwar
@ 2023-04-12 17:13 ` Mathieu Poirier
2023-04-14 4:49 ` [EXTERNAL] " Md Danish Anwar
0 siblings, 1 reply; 11+ messages in thread
From: Mathieu Poirier @ 2023-04-12 17:13 UTC (permalink / raw)
To: MD Danish Anwar
Cc: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, Bjorn Andersson, Santosh Shilimkar, Nishanth Menon,
linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
On Wed, Apr 12, 2023 at 04:00:12PM +0530, MD Danish Anwar wrote:
> From: Suman Anna <s-anna@ti.com>
>
> 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 <s-anna@ti.com>
> Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
> Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
> Reviewed-by: Roger Quadros <rogerq@kernel.org>
> Reviewed-by: Tony Lindgren <tony@atomide.com>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
> ---
> drivers/remoteproc/pru_rproc.c | 15 -------
> drivers/soc/ti/pruss.c | 74 ++++++++++++++++++++++++++++++++++
> include/linux/pruss_driver.h | 51 +++++++++++++++++++++++
> 3 files changed, 125 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
> index 095f66130f48..54f5ce302e7a 100644
> --- a/drivers/remoteproc/pru_rproc.c
> +++ b/drivers/remoteproc/pru_rproc.c
> @@ -81,21 +81,6 @@ enum pru_iomem {
> PRU_IOMEM_MAX,
> };
>
> -/**
> - * enum pru_type - PRU core type identifier
> - *
> - * @PRU_TYPE_PRU: Programmable Real-time Unit
> - * @PRU_TYPE_RTU: Auxiliary Programmable Real-Time Unit
> - * @PRU_TYPE_TX_PRU: Transmit Programmable Real-Time Unit
> - * @PRU_TYPE_MAX: just keep this one at the end
> - */
> -enum pru_type {
> - PRU_TYPE_PRU = 0,
> - PRU_TYPE_RTU,
> - PRU_TYPE_TX_PRU,
> - PRU_TYPE_MAX,
> -};
> -
> /**
> * struct pru_private_data - device data for a PRU core
> * @type: type of the PRU core (PRU, RTU, Tx_PRU)
> diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
> index 34d513816a9d..90a625ab9cfc 100644
> --- a/drivers/soc/ti/pruss.c
> +++ b/drivers/soc/ti/pruss.c
> @@ -213,6 +213,80 @@ int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux)
> }
> EXPORT_SYMBOL_GPL(pruss_cfg_set_gpmux);
>
> +/**
> + * 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
> + */
> +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;
> +
Same
> + if (mode < 0 || mode > PRUSS_GPI_MODE_MAX)
> + return -EINVAL;
> +
Same
> + return pruss_cfg_update(pruss, PRUSS_CFG_GPCFG(pru_id),
> + PRUSS_GPCFG_PRU_GPI_MODE_MASK,
> + mode << PRUSS_GPCFG_PRU_GPI_MODE_SHIFT);
> +}
> +EXPORT_SYMBOL_GPL(pruss_cfg_gpimode);
> +
> +/**
> + * 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
> + */
> +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);
> +}
> +EXPORT_SYMBOL_GPL(pruss_cfg_miirt_enable);
> +
> +/**
> + * pruss_cfg_xfr_enable() - Enable/disable XIN XOUT shift functionality
> + * @pruss: the pruss instance
> + * @pru_type: PRU core type identifier
> + * @enable: enable/disable
> + *
> + * Return: 0 on success, or an error code otherwise
> + */
> +int pruss_cfg_xfr_enable(struct pruss *pruss, enum pru_type pru_type,
> + bool enable)
> +{
> + u32 mask, set;
> +
> + switch (pru_type) {
> + case PRU_TYPE_PRU:
> + mask = PRUSS_SPP_XFER_SHIFT_EN;
> + break;
> + case PRU_TYPE_RTU:
> + mask = PRUSS_SPP_RTU_XFR_SHIFT_EN;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + set = enable ? mask : 0;
> +
> + return pruss_cfg_update(pruss, PRUSS_CFG_SPP, mask, set);
> +}
> +EXPORT_SYMBOL_GPL(pruss_cfg_xfr_enable);
> +
> static void pruss_of_free_clk_provider(void *data)
> {
> struct device_node *clk_mux_np = data;
> diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h
> index c70e08c90165..2a139bfda452 100644
> --- a/include/linux/pruss_driver.h
> +++ b/include/linux/pruss_driver.h
> @@ -32,6 +32,33 @@ enum pruss_gp_mux_sel {
> 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,
Not needed
> + PRUSS_GPI_MODE_PARALLEL,
> + PRUSS_GPI_MODE_28BIT_SHIFT,
> + PRUSS_GPI_MODE_MII,
> + PRUSS_GPI_MODE_MAX,
> +};
> +
> +/**
> + * enum pru_type - PRU core type identifier
> + *
> + * @PRU_TYPE_PRU: Programmable Real-time Unit
> + * @PRU_TYPE_RTU: Auxiliary Programmable Real-Time Unit
> + * @PRU_TYPE_TX_PRU: Transmit Programmable Real-Time Unit
> + * @PRU_TYPE_MAX: just keep this one at the end
> + */
> +enum pru_type {
> + PRU_TYPE_PRU = 0,
Same
With the above:
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> + PRU_TYPE_RTU,
> + PRU_TYPE_TX_PRU,
> + PRU_TYPE_MAX,
> +};
> +
> /*
> * enum pruss_mem - PRUSS memory range identifiers
> */
> @@ -86,6 +113,11 @@ int pruss_release_mem_region(struct pruss *pruss,
> struct pruss_mem_region *region);
> int pruss_cfg_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux);
> int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux);
> +int pruss_cfg_gpimode(struct pruss *pruss, enum pruss_pru_id pru_id,
> + enum pruss_gpi_mode mode);
> +int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable);
> +int pruss_cfg_xfr_enable(struct pruss *pruss, enum pru_type pru_type,
> + bool enable);
>
> #else
>
> @@ -121,6 +153,25 @@ static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
> return ERR_PTR(-EOPNOTSUPP);
> }
>
> +static inline int pruss_cfg_gpimode(struct pruss *pruss,
> + enum pruss_pru_id pru_id,
> + enum pruss_gpi_mode mode)
> +{
> + return ERR_PTR(-EOPNOTSUPP);
> +}
> +
> +static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)
> +{
> + return ERR_PTR(-EOPNOTSUPP);
> +}
> +
> +static inline int pruss_cfg_xfr_enable(struct pruss *pruss,
> + enum pru_type pru_type,
> + bool enable);
> +{
> + return ERR_PTR(-EOPNOTSUPP);
> +}
> +
> #endif /* CONFIG_TI_PRUSS */
>
> #endif /* _PRUSS_DRIVER_H_ */
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [EXTERNAL] Re: [PATCH v8 4/4] soc: ti: pruss: Add helper functions to set GPI mode, MII_RT_event and XFR
2023-04-12 17:13 ` Mathieu Poirier
@ 2023-04-14 4:49 ` Md Danish Anwar
0 siblings, 0 replies; 11+ messages in thread
From: Md Danish Anwar @ 2023-04-14 4:49 UTC (permalink / raw)
To: Mathieu Poirier, MD Danish Anwar
Cc: Andrew F. Davis, Suman Anna, Roger Quadros, Vignesh Raghavendra,
Tero Kristo, Bjorn Andersson, Santosh Shilimkar, Nishanth Menon,
linux-remoteproc, linux-arm-kernel, linux-kernel, linux-omap, srk,
devicetree, netdev
On 12/04/23 22:43, Mathieu Poirier wrote:
> On Wed, Apr 12, 2023 at 04:00:12PM +0530, MD Danish Anwar wrote:
>> From: Suman Anna <s-anna@ti.com>
>>
>> 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 <s-anna@ti.com>
>> Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
>> Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
>> Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
>> Reviewed-by: Roger Quadros <rogerq@kernel.org>
>> Reviewed-by: Tony Lindgren <tony@atomide.com>
>> Reviewed-by: Simon Horman <simon.horman@corigine.com>
>> Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
>> ---
>> drivers/remoteproc/pru_rproc.c | 15 -------
>> drivers/soc/ti/pruss.c | 74 ++++++++++++++++++++++++++++++++++
>> include/linux/pruss_driver.h | 51 +++++++++++++++++++++++
>> 3 files changed, 125 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
>> index 095f66130f48..54f5ce302e7a 100644
>> --- a/drivers/remoteproc/pru_rproc.c
>> +++ b/drivers/remoteproc/pru_rproc.c
>> @@ -81,21 +81,6 @@ enum pru_iomem {
>> PRU_IOMEM_MAX,
>> };
>>
>> -/**
>> - * enum pru_type - PRU core type identifier
>> - *
>> - * @PRU_TYPE_PRU: Programmable Real-time Unit
>> - * @PRU_TYPE_RTU: Auxiliary Programmable Real-Time Unit
>> - * @PRU_TYPE_TX_PRU: Transmit Programmable Real-Time Unit
>> - * @PRU_TYPE_MAX: just keep this one at the end
>> - */
>> -enum pru_type {
>> - PRU_TYPE_PRU = 0,
>> - PRU_TYPE_RTU,
>> - PRU_TYPE_TX_PRU,
>> - PRU_TYPE_MAX,
>> -};
>> -
>> /**
>> * struct pru_private_data - device data for a PRU core
>> * @type: type of the PRU core (PRU, RTU, Tx_PRU)
>> diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
>> index 34d513816a9d..90a625ab9cfc 100644
>> --- a/drivers/soc/ti/pruss.c
>> +++ b/drivers/soc/ti/pruss.c
>> @@ -213,6 +213,80 @@ int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux)
>> }
>> EXPORT_SYMBOL_GPL(pruss_cfg_set_gpmux);
>>
>> +/**
>> + * 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
>> + */
>> +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;
>> +
>
> Same
>
>> + if (mode < 0 || mode > PRUSS_GPI_MODE_MAX)
>> + return -EINVAL;
>> +
>
> Same
>
>> + return pruss_cfg_update(pruss, PRUSS_CFG_GPCFG(pru_id),
>> + PRUSS_GPCFG_PRU_GPI_MODE_MASK,
>> + mode << PRUSS_GPCFG_PRU_GPI_MODE_SHIFT);
>> +}
>> +EXPORT_SYMBOL_GPL(pruss_cfg_gpimode);
>> +
>> +/**
>> + * 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
>> + */
>> +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);
>> +}
>> +EXPORT_SYMBOL_GPL(pruss_cfg_miirt_enable);
>> +
>> +/**
>> + * pruss_cfg_xfr_enable() - Enable/disable XIN XOUT shift functionality
>> + * @pruss: the pruss instance
>> + * @pru_type: PRU core type identifier
>> + * @enable: enable/disable
>> + *
>> + * Return: 0 on success, or an error code otherwise
>> + */
>> +int pruss_cfg_xfr_enable(struct pruss *pruss, enum pru_type pru_type,
>> + bool enable)
>> +{
>> + u32 mask, set;
>> +
>> + switch (pru_type) {
>> + case PRU_TYPE_PRU:
>> + mask = PRUSS_SPP_XFER_SHIFT_EN;
>> + break;
>> + case PRU_TYPE_RTU:
>> + mask = PRUSS_SPP_RTU_XFR_SHIFT_EN;
>> + break;
>> + default:
>> + return -EINVAL;
>> + }
>> +
>> + set = enable ? mask : 0;
>> +
>> + return pruss_cfg_update(pruss, PRUSS_CFG_SPP, mask, set);
>> +}
>> +EXPORT_SYMBOL_GPL(pruss_cfg_xfr_enable);
>> +
>> static void pruss_of_free_clk_provider(void *data)
>> {
>> struct device_node *clk_mux_np = data;
>> diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h
>> index c70e08c90165..2a139bfda452 100644
>> --- a/include/linux/pruss_driver.h
>> +++ b/include/linux/pruss_driver.h
>> @@ -32,6 +32,33 @@ enum pruss_gp_mux_sel {
>> 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,
>
> Not needed
>
>> + PRUSS_GPI_MODE_PARALLEL,
>> + PRUSS_GPI_MODE_28BIT_SHIFT,
>> + PRUSS_GPI_MODE_MII,
>> + PRUSS_GPI_MODE_MAX,
>> +};
>> +
>> +/**
>> + * enum pru_type - PRU core type identifier
>> + *
>> + * @PRU_TYPE_PRU: Programmable Real-time Unit
>> + * @PRU_TYPE_RTU: Auxiliary Programmable Real-Time Unit
>> + * @PRU_TYPE_TX_PRU: Transmit Programmable Real-Time Unit
>> + * @PRU_TYPE_MAX: just keep this one at the end
>> + */
>> +enum pru_type {
>> + PRU_TYPE_PRU = 0,
>
> Same
>
> With the above:
> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
>
Sure Mathieu, I will do these changes and send next revision.
>> + PRU_TYPE_RTU,
>> + PRU_TYPE_TX_PRU,
>> + PRU_TYPE_MAX,
>> +};
>> +
>> /*
>> * enum pruss_mem - PRUSS memory range identifiers
>> */
>> @@ -86,6 +113,11 @@ int pruss_release_mem_region(struct pruss *pruss,
>> struct pruss_mem_region *region);
>> int pruss_cfg_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux);
>> int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux);
>> +int pruss_cfg_gpimode(struct pruss *pruss, enum pruss_pru_id pru_id,
>> + enum pruss_gpi_mode mode);
>> +int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable);
>> +int pruss_cfg_xfr_enable(struct pruss *pruss, enum pru_type pru_type,
>> + bool enable);
>>
>> #else
>>
>> @@ -121,6 +153,25 @@ static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
>> return ERR_PTR(-EOPNOTSUPP);
>> }
>>
>> +static inline int pruss_cfg_gpimode(struct pruss *pruss,
>> + enum pruss_pru_id pru_id,
>> + enum pruss_gpi_mode mode)
>> +{
>> + return ERR_PTR(-EOPNOTSUPP);
>> +}
>> +
>> +static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)
>> +{
>> + return ERR_PTR(-EOPNOTSUPP);
>> +}
>> +
>> +static inline int pruss_cfg_xfr_enable(struct pruss *pruss,
>> + enum pru_type pru_type,
>> + bool enable);
>> +{
>> + return ERR_PTR(-EOPNOTSUPP);
>> +}
>> +
>> #endif /* CONFIG_TI_PRUSS */
>>
>> #endif /* _PRUSS_DRIVER_H_ */
>> --
>> 2.34.1
>>
--
Thanks and Regards,
Danish.
^ permalink raw reply [flat|nested] 11+ messages in thread