Commit b75acfb4 authored by Markus Mayer's avatar Markus Mayer Committed by Viresh Kumar
Browse files

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.

Signed-off-by: default avatarMarkus Mayer <mmayer@broadcom.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent afdb219b

drivers/cpufreq/brcmstb-avs-cpufreq.c

+14 −16
Original line number Diff line number Diff line
@@ -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++)

	/* 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++)

	/* 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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE