Re: [RFC PATCH v2 1/2] drivers: mfd: refactor the vexpress config bridge API

2013-06-05 Thread Nicolas Pitre 
On Wed, 5 Jun 2013, Lorenzo Pieralisi wrote:

> From: Pawel Moll 
> 
> The introduction of Serial Power Controller (SPC) requires the vexpress
> config interface to change slightly since the SPC memory mapped interface
> can be used as configuration bus but also for operating points
> programming and retrieval. The helper that allocates the bridge functions
> requires an additional parameter allowing to request component specific
> functions that need not be initialized through device tree bindings but
> just using simple look-up and statically defined constants.
> 
> This patch introduces the necessary changes to the vexpress config layer
> to cater for the new vexpress bridge interface requirements.
> 
> Cc: Samuel Ortiz 
> Cc: Achin Gupta 
> Cc: Sudeep KarkadaNagesha 
> Cc: Pawel Moll 
> Cc: Nicolas Pitre 
> Cc: Amit Kucheria 
> Cc: Jon Medhurst 
> Signed-off-by: Pawel Moll 

Acked-by: Nicolas Pitre 

> ---
>  drivers/mfd/vexpress-config.c | 61 
> +++
>  drivers/mfd/vexpress-sysreg.c |  2 +-
>  include/linux/vexpress.h  | 16 
>  3 files changed, 51 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/mfd/vexpress-config.c b/drivers/mfd/vexpress-config.c
> index 84ce6b9..1af2b0e 100644
> --- a/drivers/mfd/vexpress-config.c
> +++ b/drivers/mfd/vexpress-config.c
> @@ -86,29 +86,13 @@ void vexpress_config_bridge_unregister(struct 
> vexpress_config_bridge *bridge)
>  }
>  EXPORT_SYMBOL(vexpress_config_bridge_unregister);
>  
> -
> -struct vexpress_config_func {
> - struct vexpress_config_bridge *bridge;
> - void *func;
> -};
> -
> -struct vexpress_config_func *__vexpress_config_func_get(struct device *dev,
> - struct device_node *node)
> +static struct vexpress_config_bridge *
> + vexpress_config_bridge_find(struct device_node *node)
>  {
> - struct device_node *bridge_node;
> - struct vexpress_config_func *func;
>   int i;
> + struct vexpress_config_bridge *res = NULL;
> + struct device_node *bridge_node = of_node_get(node);
>  
> - if (WARN_ON(dev && node && dev->of_node != node))
> - return NULL;
> - if (dev && !node)
> - node = dev->of_node;
> -
> - func = kzalloc(sizeof(*func), GFP_KERNEL);
> - if (!func)
> - return NULL;
> -
> - bridge_node = of_node_get(node);
>   while (bridge_node) {
>   const __be32 *prop = of_get_property(bridge_node,
>   "arm,vexpress,config-bridge", NULL);
> @@ -129,13 +113,46 @@ struct vexpress_config_func 
> *__vexpress_config_func_get(struct device *dev,
>  
>   if (test_bit(i, vexpress_config_bridges_map) &&
>   bridge->node == bridge_node) {
> - func->bridge = bridge;
> - func->func = bridge->info->func_get(dev, node);
> + res = bridge;
>   break;
>   }
>   }
>   mutex_unlock(_config_bridges_mutex);
>  
> + return res;
> +}
> +
> +
> +struct vexpress_config_func {
> + struct vexpress_config_bridge *bridge;
> + void *func;
> +};
> +
> +struct vexpress_config_func *__vexpress_config_func_get(
> + struct vexpress_config_bridge *bridge,
> + struct device *dev,
> + struct device_node *node,
> + const char *id)
> +{
> + struct vexpress_config_func *func;
> +
> + if (WARN_ON(dev && node && dev->of_node != node))
> + return NULL;
> + if (dev && !node)
> + node = dev->of_node;
> +
> + if (!bridge)
> + bridge = vexpress_config_bridge_find(node);
> + if (!bridge)
> + return NULL;
> +
> + func = kzalloc(sizeof(*func), GFP_KERNEL);
> + if (!func)
> + return NULL;
> +
> + func->bridge = bridge;
> + func->func = bridge->info->func_get(dev, node, id);
> +
>   if (!func->func) {
>   of_node_put(node);
>   kfree(func);
> diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
> index 96a020b..d2599aa 100644
> --- a/drivers/mfd/vexpress-sysreg.c
> +++ b/drivers/mfd/vexpress-sysreg.c
> @@ -165,7 +165,7 @@ static u32 *vexpress_sysreg_config_data;
>  static int vexpress_sysreg_config_tries;
>  
>  static void *vexpress_sysreg_config_func_get(struct device *dev,
> - struct device_node *node)
> + struct device_node *node, const char *id)
>  {
>   struct vexpress_sysreg_config_func *config_func;
>   u32 site;
> diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h
> index 6e7980d..50368e0 100644
> --- a/include/linux/vexpress.h
> +++ b/include/linux/vexpress.h
> @@ -68,7 +68,8 @@
>   */
>  struct vexpress_config_bridge_info {
>   const char *name;
> - void *(*func_get)(struct device *dev, struct device_node *node);
> + void *(*func_get)(struct device *dev, struct device_node *node,
> +

[RFC PATCH v2 1/2] drivers: mfd: refactor the vexpress config bridge API

2013-06-05 Thread Lorenzo Pieralisi 
From: Pawel Moll 

The introduction of Serial Power Controller (SPC) requires the vexpress
config interface to change slightly since the SPC memory mapped interface
can be used as configuration bus but also for operating points
programming and retrieval. The helper that allocates the bridge functions
requires an additional parameter allowing to request component specific
functions that need not be initialized through device tree bindings but
just using simple look-up and statically defined constants.

This patch introduces the necessary changes to the vexpress config layer
to cater for the new vexpress bridge interface requirements.

Cc: Samuel Ortiz 
Cc: Achin Gupta 
Cc: Sudeep KarkadaNagesha 
Cc: Pawel Moll 
Cc: Nicolas Pitre 
Cc: Amit Kucheria 
Cc: Jon Medhurst 
Signed-off-by: Pawel Moll 
---
 drivers/mfd/vexpress-config.c | 61 +++
 drivers/mfd/vexpress-sysreg.c |  2 +-
 include/linux/vexpress.h  | 16 
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/drivers/mfd/vexpress-config.c b/drivers/mfd/vexpress-config.c
index 84ce6b9..1af2b0e 100644
--- a/drivers/mfd/vexpress-config.c
+++ b/drivers/mfd/vexpress-config.c
@@ -86,29 +86,13 @@ void vexpress_config_bridge_unregister(struct 
vexpress_config_bridge *bridge)
 }
 EXPORT_SYMBOL(vexpress_config_bridge_unregister);
 
-
-struct vexpress_config_func {
-   struct vexpress_config_bridge *bridge;
-   void *func;
-};
-
-struct vexpress_config_func *__vexpress_config_func_get(struct device *dev,
-   struct device_node *node)
+static struct vexpress_config_bridge *
+   vexpress_config_bridge_find(struct device_node *node)
 {
-   struct device_node *bridge_node;
-   struct vexpress_config_func *func;
int i;
+   struct vexpress_config_bridge *res = NULL;
+   struct device_node *bridge_node = of_node_get(node);
 
-   if (WARN_ON(dev && node && dev->of_node != node))
-   return NULL;
-   if (dev && !node)
-   node = dev->of_node;
-
-   func = kzalloc(sizeof(*func), GFP_KERNEL);
-   if (!func)
-   return NULL;
-
-   bridge_node = of_node_get(node);
while (bridge_node) {
const __be32 *prop = of_get_property(bridge_node,
"arm,vexpress,config-bridge", NULL);
@@ -129,13 +113,46 @@ struct vexpress_config_func 
*__vexpress_config_func_get(struct device *dev,
 
if (test_bit(i, vexpress_config_bridges_map) &&
bridge->node == bridge_node) {
-   func->bridge = bridge;
-   func->func = bridge->info->func_get(dev, node);
+   res = bridge;
break;
}
}
mutex_unlock(_config_bridges_mutex);
 
+   return res;
+}
+
+
+struct vexpress_config_func {
+   struct vexpress_config_bridge *bridge;
+   void *func;
+};
+
+struct vexpress_config_func *__vexpress_config_func_get(
+   struct vexpress_config_bridge *bridge,
+   struct device *dev,
+   struct device_node *node,
+   const char *id)
+{
+   struct vexpress_config_func *func;
+
+   if (WARN_ON(dev && node && dev->of_node != node))
+   return NULL;
+   if (dev && !node)
+   node = dev->of_node;
+
+   if (!bridge)
+   bridge = vexpress_config_bridge_find(node);
+   if (!bridge)
+   return NULL;
+
+   func = kzalloc(sizeof(*func), GFP_KERNEL);
+   if (!func)
+   return NULL;
+
+   func->bridge = bridge;
+   func->func = bridge->info->func_get(dev, node, id);
+
if (!func->func) {
of_node_put(node);
kfree(func);
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index 96a020b..d2599aa 100644
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -165,7 +165,7 @@ static u32 *vexpress_sysreg_config_data;
 static int vexpress_sysreg_config_tries;
 
 static void *vexpress_sysreg_config_func_get(struct device *dev,
-   struct device_node *node)
+   struct device_node *node, const char *id)
 {
struct vexpress_sysreg_config_func *config_func;
u32 site;
diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h
index 6e7980d..50368e0 100644
--- a/include/linux/vexpress.h
+++ b/include/linux/vexpress.h
@@ -68,7 +68,8 @@
  */
 struct vexpress_config_bridge_info {
const char *name;
-   void *(*func_get)(struct device *dev, struct device_node *node);
+   void *(*func_get)(struct device *dev, struct device_node *node,
+ const char *id);
void (*func_put)(void *func);
int (*func_exec)(void *func, int offset, bool write, u32 *data);
 };
@@ -87,12 +88,17 @@ void vexpress_config_complete(struct vexpress_config_bridge 
*bridge,

[RFC PATCH v2 1/2] drivers: mfd: refactor the vexpress config bridge API

2013-06-05 Thread Lorenzo Pieralisi 
From: Pawel Moll pawel.m...@arm.com

The introduction of Serial Power Controller (SPC) requires the vexpress
config interface to change slightly since the SPC memory mapped interface
can be used as configuration bus but also for operating points
programming and retrieval. The helper that allocates the bridge functions
requires an additional parameter allowing to request component specific
functions that need not be initialized through device tree bindings but
just using simple look-up and statically defined constants.

This patch introduces the necessary changes to the vexpress config layer
to cater for the new vexpress bridge interface requirements.

Cc: Samuel Ortiz sa...@linux.intel.com
Cc: Achin Gupta achin.gu...@arm.com
Cc: Sudeep KarkadaNagesha sudeep.karkadanage...@arm.com
Cc: Pawel Moll pawel.m...@arm.com
Cc: Nicolas Pitre nicolas.pi...@linaro.org
Cc: Amit Kucheria amit.kuche...@linaro.org
Cc: Jon Medhurst t...@linaro.org
Signed-off-by: Pawel Moll pawel.m...@arm.com
---
 drivers/mfd/vexpress-config.c | 61 +++
 drivers/mfd/vexpress-sysreg.c |  2 +-
 include/linux/vexpress.h  | 16 
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/drivers/mfd/vexpress-config.c b/drivers/mfd/vexpress-config.c
index 84ce6b9..1af2b0e 100644
--- a/drivers/mfd/vexpress-config.c
+++ b/drivers/mfd/vexpress-config.c
@@ -86,29 +86,13 @@ void vexpress_config_bridge_unregister(struct 
vexpress_config_bridge *bridge)
 }
 EXPORT_SYMBOL(vexpress_config_bridge_unregister);
 
-
-struct vexpress_config_func {
-   struct vexpress_config_bridge *bridge;
-   void *func;
-};
-
-struct vexpress_config_func *__vexpress_config_func_get(struct device *dev,
-   struct device_node *node)
+static struct vexpress_config_bridge *
+   vexpress_config_bridge_find(struct device_node *node)
 {
-   struct device_node *bridge_node;
-   struct vexpress_config_func *func;
int i;
+   struct vexpress_config_bridge *res = NULL;
+   struct device_node *bridge_node = of_node_get(node);
 
-   if (WARN_ON(dev  node  dev-of_node != node))
-   return NULL;
-   if (dev  !node)
-   node = dev-of_node;
-
-   func = kzalloc(sizeof(*func), GFP_KERNEL);
-   if (!func)
-   return NULL;
-
-   bridge_node = of_node_get(node);
while (bridge_node) {
const __be32 *prop = of_get_property(bridge_node,
arm,vexpress,config-bridge, NULL);
@@ -129,13 +113,46 @@ struct vexpress_config_func 
*__vexpress_config_func_get(struct device *dev,
 
if (test_bit(i, vexpress_config_bridges_map) 
bridge-node == bridge_node) {
-   func-bridge = bridge;
-   func-func = bridge-info-func_get(dev, node);
+   res = bridge;
break;
}
}
mutex_unlock(vexpress_config_bridges_mutex);
 
+   return res;
+}
+
+
+struct vexpress_config_func {
+   struct vexpress_config_bridge *bridge;
+   void *func;
+};
+
+struct vexpress_config_func *__vexpress_config_func_get(
+   struct vexpress_config_bridge *bridge,
+   struct device *dev,
+   struct device_node *node,
+   const char *id)
+{
+   struct vexpress_config_func *func;
+
+   if (WARN_ON(dev  node  dev-of_node != node))
+   return NULL;
+   if (dev  !node)
+   node = dev-of_node;
+
+   if (!bridge)
+   bridge = vexpress_config_bridge_find(node);
+   if (!bridge)
+   return NULL;
+
+   func = kzalloc(sizeof(*func), GFP_KERNEL);
+   if (!func)
+   return NULL;
+
+   func-bridge = bridge;
+   func-func = bridge-info-func_get(dev, node, id);
+
if (!func-func) {
of_node_put(node);
kfree(func);
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index 96a020b..d2599aa 100644
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -165,7 +165,7 @@ static u32 *vexpress_sysreg_config_data;
 static int vexpress_sysreg_config_tries;
 
 static void *vexpress_sysreg_config_func_get(struct device *dev,
-   struct device_node *node)
+   struct device_node *node, const char *id)
 {
struct vexpress_sysreg_config_func *config_func;
u32 site;
diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h
index 6e7980d..50368e0 100644
--- a/include/linux/vexpress.h
+++ b/include/linux/vexpress.h
@@ -68,7 +68,8 @@
  */
 struct vexpress_config_bridge_info {
const char *name;
-   void *(*func_get)(struct device *dev, struct device_node *node);
+   void *(*func_get)(struct device *dev, struct device_node *node,
+ const char *id);
void (*func_put)(void *func);

Re: [RFC PATCH v2 1/2] drivers: mfd: refactor the vexpress config bridge API

2013-06-05 Thread Nicolas Pitre 
On Wed, 5 Jun 2013, Lorenzo Pieralisi wrote:

 From: Pawel Moll pawel.m...@arm.com
 
 The introduction of Serial Power Controller (SPC) requires the vexpress
 config interface to change slightly since the SPC memory mapped interface
 can be used as configuration bus but also for operating points
 programming and retrieval. The helper that allocates the bridge functions
 requires an additional parameter allowing to request component specific
 functions that need not be initialized through device tree bindings but
 just using simple look-up and statically defined constants.
 
 This patch introduces the necessary changes to the vexpress config layer
 to cater for the new vexpress bridge interface requirements.
 
 Cc: Samuel Ortiz sa...@linux.intel.com
 Cc: Achin Gupta achin.gu...@arm.com
 Cc: Sudeep KarkadaNagesha sudeep.karkadanage...@arm.com
 Cc: Pawel Moll pawel.m...@arm.com
 Cc: Nicolas Pitre nicolas.pi...@linaro.org
 Cc: Amit Kucheria amit.kuche...@linaro.org
 Cc: Jon Medhurst t...@linaro.org
 Signed-off-by: Pawel Moll pawel.m...@arm.com

Acked-by: Nicolas Pitre n...@linaro.org

 ---
  drivers/mfd/vexpress-config.c | 61 
 +++
  drivers/mfd/vexpress-sysreg.c |  2 +-
  include/linux/vexpress.h  | 16 
  3 files changed, 51 insertions(+), 28 deletions(-)
 
 diff --git a/drivers/mfd/vexpress-config.c b/drivers/mfd/vexpress-config.c
 index 84ce6b9..1af2b0e 100644
 --- a/drivers/mfd/vexpress-config.c
 +++ b/drivers/mfd/vexpress-config.c
 @@ -86,29 +86,13 @@ void vexpress_config_bridge_unregister(struct 
 vexpress_config_bridge *bridge)
  }
  EXPORT_SYMBOL(vexpress_config_bridge_unregister);
  
 -
 -struct vexpress_config_func {
 - struct vexpress_config_bridge *bridge;
 - void *func;
 -};
 -
 -struct vexpress_config_func *__vexpress_config_func_get(struct device *dev,
 - struct device_node *node)
 +static struct vexpress_config_bridge *
 + vexpress_config_bridge_find(struct device_node *node)
  {
 - struct device_node *bridge_node;
 - struct vexpress_config_func *func;
   int i;
 + struct vexpress_config_bridge *res = NULL;
 + struct device_node *bridge_node = of_node_get(node);
  
 - if (WARN_ON(dev  node  dev-of_node != node))
 - return NULL;
 - if (dev  !node)
 - node = dev-of_node;
 -
 - func = kzalloc(sizeof(*func), GFP_KERNEL);
 - if (!func)
 - return NULL;
 -
 - bridge_node = of_node_get(node);
   while (bridge_node) {
   const __be32 *prop = of_get_property(bridge_node,
   arm,vexpress,config-bridge, NULL);
 @@ -129,13 +113,46 @@ struct vexpress_config_func 
 *__vexpress_config_func_get(struct device *dev,
  
   if (test_bit(i, vexpress_config_bridges_map) 
   bridge-node == bridge_node) {
 - func-bridge = bridge;
 - func-func = bridge-info-func_get(dev, node);
 + res = bridge;
   break;
   }
   }
   mutex_unlock(vexpress_config_bridges_mutex);
  
 + return res;
 +}
 +
 +
 +struct vexpress_config_func {
 + struct vexpress_config_bridge *bridge;
 + void *func;
 +};
 +
 +struct vexpress_config_func *__vexpress_config_func_get(
 + struct vexpress_config_bridge *bridge,
 + struct device *dev,
 + struct device_node *node,
 + const char *id)
 +{
 + struct vexpress_config_func *func;
 +
 + if (WARN_ON(dev  node  dev-of_node != node))
 + return NULL;
 + if (dev  !node)
 + node = dev-of_node;
 +
 + if (!bridge)
 + bridge = vexpress_config_bridge_find(node);
 + if (!bridge)
 + return NULL;
 +
 + func = kzalloc(sizeof(*func), GFP_KERNEL);
 + if (!func)
 + return NULL;
 +
 + func-bridge = bridge;
 + func-func = bridge-info-func_get(dev, node, id);
 +
   if (!func-func) {
   of_node_put(node);
   kfree(func);
 diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
 index 96a020b..d2599aa 100644
 --- a/drivers/mfd/vexpress-sysreg.c
 +++ b/drivers/mfd/vexpress-sysreg.c
 @@ -165,7 +165,7 @@ static u32 *vexpress_sysreg_config_data;
  static int vexpress_sysreg_config_tries;
  
  static void *vexpress_sysreg_config_func_get(struct device *dev,
 - struct device_node *node)
 + struct device_node *node, const char *id)
  {
   struct vexpress_sysreg_config_func *config_func;
   u32 site;
 diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h
 index 6e7980d..50368e0 100644
 --- a/include/linux/vexpress.h
 +++ b/include/linux/vexpress.h
 @@ -68,7 +68,8 @@
   */
  struct vexpress_config_bridge_info {
   const char *name;
 - void *(*func_get)(struct device *dev, struct device_node *node);
 + void *(*func_get)(struct device *dev,