mirror of
https://github.com/torvalds/linux.git
synced 2024-12-04 01:51:34 +00:00
cbda56d5fe
Commit99e98d3fb1("cpuidle: Consolidate disabled state checks") overlooked the fact that the imx6q and tegra20 cpuidle drivers use the "disabled" field in struct cpuidle_state for quirks which trigger after the initialization of cpuidle, so reading the initial value of that field is not sufficient for those drivers. In order to allow them to implement the quirks without using the "disabled" field in struct cpuidle_state, introduce a new helper function and modify them to use it. Fixes:99e98d3fb1("cpuidle: Consolidate disabled state checks") Reported-by: Len Brown <lenb@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
82 lines
1.9 KiB
C
82 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2012 Freescale Semiconductor, Inc.
|
|
*/
|
|
|
|
#include <linux/cpuidle.h>
|
|
#include <linux/module.h>
|
|
#include <asm/cpuidle.h>
|
|
|
|
#include <soc/imx/cpuidle.h>
|
|
|
|
#include "common.h"
|
|
#include "cpuidle.h"
|
|
#include "hardware.h"
|
|
|
|
static int num_idle_cpus = 0;
|
|
static DEFINE_RAW_SPINLOCK(cpuidle_lock);
|
|
|
|
static int imx6q_enter_wait(struct cpuidle_device *dev,
|
|
struct cpuidle_driver *drv, int index)
|
|
{
|
|
raw_spin_lock(&cpuidle_lock);
|
|
if (++num_idle_cpus == num_online_cpus())
|
|
imx6_set_lpm(WAIT_UNCLOCKED);
|
|
raw_spin_unlock(&cpuidle_lock);
|
|
|
|
cpu_do_idle();
|
|
|
|
raw_spin_lock(&cpuidle_lock);
|
|
if (num_idle_cpus-- == num_online_cpus())
|
|
imx6_set_lpm(WAIT_CLOCKED);
|
|
raw_spin_unlock(&cpuidle_lock);
|
|
|
|
return index;
|
|
}
|
|
|
|
static struct cpuidle_driver imx6q_cpuidle_driver = {
|
|
.name = "imx6q_cpuidle",
|
|
.owner = THIS_MODULE,
|
|
.states = {
|
|
/* WFI */
|
|
ARM_CPUIDLE_WFI_STATE,
|
|
/* WAIT */
|
|
{
|
|
.exit_latency = 50,
|
|
.target_residency = 75,
|
|
.flags = CPUIDLE_FLAG_TIMER_STOP,
|
|
.enter = imx6q_enter_wait,
|
|
.name = "WAIT",
|
|
.desc = "Clock off",
|
|
},
|
|
},
|
|
.state_count = 2,
|
|
.safe_state_index = 0,
|
|
};
|
|
|
|
/*
|
|
* i.MX6 Q/DL has an erratum (ERR006687) that prevents the FEC from waking the
|
|
* CPUs when they are in wait(unclocked) state. As the hardware workaround isn't
|
|
* applicable to all boards, disable the deeper idle state when the workaround
|
|
* isn't present and the FEC is in use.
|
|
*/
|
|
void imx6q_cpuidle_fec_irqs_used(void)
|
|
{
|
|
cpuidle_driver_state_disabled(&imx6q_cpuidle_driver, 1, true);
|
|
}
|
|
EXPORT_SYMBOL_GPL(imx6q_cpuidle_fec_irqs_used);
|
|
|
|
void imx6q_cpuidle_fec_irqs_unused(void)
|
|
{
|
|
cpuidle_driver_state_disabled(&imx6q_cpuidle_driver, 1, false);
|
|
}
|
|
EXPORT_SYMBOL_GPL(imx6q_cpuidle_fec_irqs_unused);
|
|
|
|
int __init imx6q_cpuidle_init(void)
|
|
{
|
|
/* Set INT_MEM_CLK_LPM bit to get a reliable WAIT mode support */
|
|
imx6_set_int_mem_clk_lpm(true);
|
|
|
|
return cpuidle_register(&imx6q_cpuidle_driver, NULL);
|
|
}
|