Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59dd7224 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2 clock: fix recursive spinlock attempt when CONFIG_CPU_FREQ=y 



The OMAP2 MPU virtual clock node code attempted to call clk_get_rate()
while the clockfw_lock spinlock was held.  Fix by reading the sys_ck
rate directly.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 4788da26

arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c

+4 −13
Original line number Original line Diff line number Diff line
@@ -68,16 +68,13 @@ long omap2_round_to_table_rate(struct clk *clk, unsigned long rate) 
{

{

	const struct prcm_config *ptr;

	const struct prcm_config *ptr;

	long highest_rate;

	long highest_rate;

	long sys_ck_rate;



	sys_ck_rate = clk_get_rate(sclk);





	highest_rate = -EINVAL;

	highest_rate = -EINVAL;





	for (ptr = rate_table; ptr->mpu_speed; ptr++) {

	for (ptr = rate_table; ptr->mpu_speed; ptr++) {

		if (!(ptr->flags & cpu_mask))

		if (!(ptr->flags & cpu_mask))

			continue;

			continue;

		if (ptr->xtal_speed != sys_ck_rate)

		if (ptr->xtal_speed != sclk->rate)

			continue;

			continue;





		highest_rate = ptr->mpu_speed;

		highest_rate = ptr->mpu_speed;
@@ -96,15 +93,12 @@ int omap2_select_table_rate(struct clk *clk, unsigned long rate) 
	const struct prcm_config *prcm;

	const struct prcm_config *prcm;

	unsigned long found_speed = 0;

	unsigned long found_speed = 0;

	unsigned long flags;

	unsigned long flags;

	long sys_ck_rate;



	sys_ck_rate = clk_get_rate(sclk);





	for (prcm = rate_table; prcm->mpu_speed; prcm++) {

	for (prcm = rate_table; prcm->mpu_speed; prcm++) {

		if (!(prcm->flags & cpu_mask))

		if (!(prcm->flags & cpu_mask))

			continue;

			continue;





		if (prcm->xtal_speed != sys_ck_rate)

		if (prcm->xtal_speed != sclk->rate)

			continue;

			continue;





		if (prcm->mpu_speed <= rate) {

		if (prcm->mpu_speed <= rate) {
@@ -181,19 +175,16 @@ static struct cpufreq_frequency_table *freq_table; 
void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)

void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)

{

{

	const struct prcm_config *prcm;

	const struct prcm_config *prcm;

	long sys_ck_rate;

	int i = 0;

	int i = 0;

	int tbl_sz = 0;

	int tbl_sz = 0;





	if (!cpu_is_omap24xx())

	if (!cpu_is_omap24xx())

		return;

		return;





	sys_ck_rate = clk_get_rate(sclk);



	for (prcm = rate_table; prcm->mpu_speed; prcm++) {

	for (prcm = rate_table; prcm->mpu_speed; prcm++) {

		if (!(prcm->flags & cpu_mask))

		if (!(prcm->flags & cpu_mask))

			continue;

			continue;

		if (prcm->xtal_speed != sys_ck_rate)

		if (prcm->xtal_speed != sclk->rate)

			continue;

			continue;





		/* don't put bypass rates in table */

		/* don't put bypass rates in table */
@@ -226,7 +217,7 @@ void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) 
	for (prcm = rate_table; prcm->mpu_speed; prcm++) {

	for (prcm = rate_table; prcm->mpu_speed; prcm++) {

		if (!(prcm->flags & cpu_mask))

		if (!(prcm->flags & cpu_mask))

			continue;

			continue;

		if (prcm->xtal_speed != sys_ck_rate)

		if (prcm->xtal_speed != sclk->rate)

			continue;

			continue;





		/* don't put bypass rates in table */

		/* don't put bypass rates in table */