cpufreq: brcmstb-avs-cpufreq: more flexible interface for __issue_avs_command()
Subsystems (3)
PATCH 1/3 cpufreq: brcmstb-avs-cpufreq: more flexible interface for __issue_avs_command()
We are changing how parameters are passed to __issue_avs_command(), so we can pass input *and* output arguments with the same command, rather than just one or the other.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 30 +++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +14 -16
@@ -195,7 +195,8 @@ static void __iomem *__map_region(const char *name)return ptr; } -static int __issue_avs_command (struct private_data *priv,int cmd,bool is_send, +static int __issue_avs_command (struct private_data *priv,unsigned int cmd, +unsigned int num_in,unsigned int num_out,u32 args[]) {unsigned long time_left =msecs_to_jiffies (AVS_TIMEOUT );
@@ -225,11 +226,9 @@ static int __issue_avs_command(struct private_data *priv, int cmd, bool is_send,/* Clear status before we begin. */ writel (AVS_STATUS_CLEAR , base +AVS_MBOX_STATUS ); -/* We need to send arguments for this command. */ -if (args && is_send) { -for (i =0 ; i <AVS_MAX_CMD_ARGS ; i++) -writel (args[i], base +AVS_MBOX_PARAM (i)); - } +/* Provide input parameters */ +for (i =0 ; i < num_in; i++) +writel (args[i], base +AVS_MBOX_PARAM (i));/* Protect from spurious interrupts. */ reinit_completion (&priv->done);
@@ -256,11 +255,9 @@ static int __issue_avs_command(struct private_data *priv, int cmd, bool is_send, goto out; } -/* This command returned arguments, so we read them back. */ -if (args && !is_send) { -for (i =0 ; i <AVS_MAX_CMD_ARGS ; i++) - args[i] =readl (base +AVS_MBOX_PARAM (i)); - } +/* Process returned values */ +for (i =0 ; i < num_out; i++) + args[i] =readl (base +AVS_MBOX_PARAM (i));/* Clear status to tell AVS co-processor we are done. */ writel (AVS_STATUS_CLEAR , base +AVS_MBOX_STATUS );
@@ -338,7 +335,7 @@ static int brcm_avs_get_pmap(struct private_data *priv, struct pmap *pmap)u32 args[AVS_MAX_CMD_ARGS ];int ret; - ret =__issue_avs_command (priv,AVS_CMD_GET_PMAP , false, args); + ret =__issue_avs_command (priv,AVS_CMD_GET_PMAP ,0 ,4 , args);if (ret || !pmap)return ret;
@@ -359,7 +356,7 @@ static int brcm_avs_set_pmap(struct private_data *priv, struct pmap *pmap) args[2 ] = pmap->p2; args[3 ] = pmap->state; -return __issue_avs_command (priv,AVS_CMD_SET_PMAP , true, args); +return __issue_avs_command (priv,AVS_CMD_SET_PMAP ,4 ,0 , args); }static int brcm_avs_get_pstate (struct private_data *priv,unsigned int *pstate)
@@ -367,7 +364,7 @@ static int brcm_avs_get_pstate(struct private_data *priv, unsigned int *pstate)u32 args[AVS_MAX_CMD_ARGS ];int ret; - ret =__issue_avs_command (priv,AVS_CMD_GET_PSTATE , false, args); + ret =__issue_avs_command (priv,AVS_CMD_GET_PSTATE ,0 ,1 , args);if (ret)return ret; *pstate = args[0 ];
@@ -381,7 +378,8 @@ static int brcm_avs_set_pstate(struct private_data *priv, unsigned int pstate) args[0 ] = pstate; -return __issue_avs_command (priv,AVS_CMD_SET_PSTATE , true, args); +return __issue_avs_command (priv,AVS_CMD_SET_PSTATE ,1 ,0 , args); + }static u32 brcm_avs_get_voltage (void __iomem *base)
@@ -593,7 +591,7 @@ static int brcm_avs_cpufreq_init(struct cpufreq_policy *policy)/* All cores share the same clock and thus the same policy. */ cpumask_setall (policy->cpus); - ret =__issue_avs_command (priv,AVS_CMD_ENABLE , false,NULL ); + ret =__issue_avs_command (priv,AVS_CMD_ENABLE ,0 ,0 ,NULL );if (!ret) {unsigned int pstate;
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 2/3 cpufreq: brcmstb-avs-cpufreq: Support polling AVS firmware
From: Florian Fainelli <[email protected]>
In case the interrupt towards the host is never raised, yet the AVS firmware responds correctly within the alloted time, allow supporting a polling mode.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 47 +++++++++++++++++++-------- 1 file changed, 34 insertions(+), 13 deletions(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +34 -13
@@ -42,6 +42,7 @@*/ #include <linux/cpufreq.h> +#include <linux/delay.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/module.h>
@@ -178,6 +179,7 @@ struct private_data {struct completion done;struct semaphore sem;struct pmap pmap; +int host_irq; };static void __iomem *__map_region (const char *name)
@@ -195,12 +197,36 @@ static void __iomem *__map_region(const char *name)return ptr; } +static unsigned long wait_for_avs_command (struct private_data *priv, +unsigned long timeout) +{ +unsigned long time_left =0 ; +u32 val; + +/* Event driven, wait for the command interrupt */ +if (priv->host_irq >=0 ) +return wait_for_completion_timeout (&priv->done, +msecs_to_jiffies (timeout)); + +/* Polling for command completion */ +do { + time_left = timeout; + val =readl (priv->base +AVS_MBOX_STATUS ); +if (val) +break ; + +usleep_range (1000 ,2000 ); + }while (--timeout); + +return time_left; +} +static int __issue_avs_command (struct private_data *priv,unsigned int cmd,unsigned int num_in,unsigned int num_out,u32 args[]) { -unsigned long time_left =msecs_to_jiffies (AVS_TIMEOUT );void __iomem *base = priv->base; +unsigned long time_left;unsigned int i;int ret;u32 val;
@@ -238,7 +264,7 @@ static int __issue_avs_command(struct private_data *priv, unsigned int cmd,writel (AVS_CPU_L2_INT_MASK , priv->avs_intr_base +AVS_CPU_L2_SET0 );/* Wait for AVS co-processor to finish processing the command. */ - time_left =wait_for_completion_timeout (&priv->done, time_left); + time_left =wait_for_avs_command (priv,AVS_TIMEOUT );/* * If the AVS status is not in the expected range, it means AVS didn't
@@ -509,7 +535,7 @@ static int brcm_avs_prepare_init(struct platform_device *pdev) {struct private_data *priv;struct device *dev; -int host_irq, ret; +int ret; dev = &pdev->dev; priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL );
@@ -536,19 +562,14 @@ static int brcm_avs_prepare_init(struct platform_device *pdev) goto unmap_base; } - host_irq =platform_get_irq_byname (pdev,BRCM_AVS_HOST_INTR ); -if (host_irq <0 ) { -dev_err (dev,"Couldn't find interrupt %s -- %d\n" , -BRCM_AVS_HOST_INTR , host_irq); - ret = host_irq; - goto unmap_intr_base; - } + priv->host_irq =platform_get_irq_byname (pdev,BRCM_AVS_HOST_INTR ); - ret =devm_request_irq (dev, host_irq, irq_handler,IRQF_TRIGGER_RISING , + ret =devm_request_irq (dev, priv->host_irq, irq_handler, +IRQF_TRIGGER_RISING ,BRCM_AVS_HOST_INTR , priv); -if (ret) { +if (ret && priv->host_irq >=0 ) {dev_err (dev,"IRQ request failed: %s (%d) -- %d\n" , -BRCM_AVS_HOST_INTR , host_irq, ret); +BRCM_AVS_HOST_INTR , priv->host_irq, ret); goto unmap_intr_base; }
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 3/3 cpufreq: brcmstb-avs-cpufreq: send S2_ENTER / S2_EXIT commands to AVS
In reply to Markus MayerOn suspend we send AVS_CMD_S2_ENTER and on resume AVS_CMD_S2_EXIT. These are best effort calls, so we don't check the return code or take any action if either of the calls fails.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +11 -1
@@ -506,7 +506,14 @@ static int brcm_avs_suspend(struct cpufreq_policy *policy)* AVS co-processor, not necessarily the P-state we are running at now. * So, we get the current P-state explicitly. */ -return brcm_avs_get_pstate (priv, &priv->pmap.state); + ret =brcm_avs_get_pstate (priv, &priv->pmap.state); +if (ret) +return ret; + +/* This is best effort. Nothing to do if it fails. */ + (void )__issue_avs_command (priv,AVS_CMD_S2_ENTER ,0 ,0 ,NULL ); + +return 0 ; }static int brcm_avs_resume (struct cpufreq_policy *policy)
@@ -514,6 +521,9 @@ static int brcm_avs_resume(struct cpufreq_policy *policy)struct private_data *priv = policy->driver_data;int ret; +/* This is best effort. Nothing to do if it fails. */ + (void )__issue_avs_command (priv,AVS_CMD_S2_EXIT ,0 ,0 ,NULL ); + ret =brcm_avs_set_pmap (priv, &priv->pmap);if (ret == -EEXIST ) {struct platform_device *pdev =cpufreq_get_driver_data ();
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 3/3] cpufreq: brcmstb-avs-cpufreq: send S2_ENTER / S2_EXIT commands to AVS
Quoted 5 lines · Markus Mayer
On suspend we send
AVS_CMD_S2_ENTERand on resumeAVS_CMD_S2_EXIT. These are best effort calls, so we don't check the return code or take any action if either of the calls fails.Signed-off-by Markus Mayer <[email protected]>
Signature · 1 line
Florian
Quoted 5 lines · Markus Mayer
We are changing how parameters are passed to
__issue_avs_command(), so we can pass input *and* output arguments with the same command, rather than just one or the other.Signed-off-by Markus Mayer <[email protected]>
Signature · 1 line
Florian
Quoted 8 lines · Markus Mayer
We are changing how parameters are passed to
__issue_avs_command(), so we can pass input *and* output arguments with the same command, rather than just one or the other.Signed-off-by Markus Mayer <[email protected]>--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 30 +++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-)
Applied, thanks.
Signature · 1 line
viresh