Skip to content

Commit

Permalink
cpufreq: tegra186/tegra194: Handle errors in BPMP response
Browse files Browse the repository at this point in the history
The return value from tegra_bpmp_transfer indicates the success or
failure of the IPC transaction with BPMP. If the transaction
succeeded, we also need to check the actual command's result code.
Add code to do this.

While at it, explicitly handle missing CPU clusters, which can
occur on floorswept chips. This worked before as well, but
possibly only by accident.

Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
  • Loading branch information
Mikko Perttunen authored and Viresh Kumar committed Oct 4, 2021
1 parent 6065a67 commit c2ace21
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions drivers/cpufreq/tegra186-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ static struct cpufreq_frequency_table *init_vhint_table(
table = ERR_PTR(err);
goto free;
}
if (msg.rx.ret) {
table = ERR_PTR(-EINVAL);
goto free;
}

for (i = data->vfloor; i <= data->vceil; i++) {
u16 ndiv = data->ndiv[i];
Expand Down
8 changes: 7 additions & 1 deletion drivers/cpufreq/tegra194-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static int tegra194_cpufreq_init(struct cpufreq_policy *policy)

smp_call_function_single(policy->cpu, get_cpu_cluster, &cl, true);

if (cl >= data->num_clusters)
if (cl >= data->num_clusters || !data->tables[cl])
return -EINVAL;

/* set same policy for all cpus in a cluster */
Expand Down Expand Up @@ -310,6 +310,12 @@ init_freq_table(struct platform_device *pdev, struct tegra_bpmp *bpmp,
err = tegra_bpmp_transfer(bpmp, &msg);
if (err)
return ERR_PTR(err);
if (msg.rx.ret == -BPMP_EINVAL) {
/* Cluster not available */
return NULL;
}
if (msg.rx.ret)
return ERR_PTR(-EINVAL);

/*
* Make sure frequency table step is a multiple of mdiv to match
Expand Down

0 comments on commit c2ace21

Please sign in to comment.