[PATCH 1/2] ARM: cpuidle: fix !cpuidle_ops[cpu].init case during init

Jisheng Zhang jszhang at marvell.com
Wed Mar 30 00:16:29 PDT 2016


Hi Daniel,

On Fri, 25 Mar 2016 12:46:10 +0100 Daniel Lezcano wrote:

> On 03/24/2016 06:11 AM, Jisheng Zhang wrote:
> > Let's assume cpuidle_ops exists but it doesn't implement the according
> > init member, current arm_cpuidle_init() will return success to its
> > caller, but in fact it should return -EOPNOTSUPP.
> >
> > Signed-off-by: Jisheng Zhang <jszhang at marvell.com>
> > ---
> >   arch/arm/kernel/cpuidle.c | 8 ++++++--
> >   1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
> > index 703926e..f108d8f 100644
> > --- a/arch/arm/kernel/cpuidle.c
> > +++ b/arch/arm/kernel/cpuidle.c
> > @@ -143,8 +143,12 @@ int __init arm_cpuidle_init(int cpu)
> >   		return -ENODEV;
> >
> >   	ret = arm_cpuidle_read_ops(cpu_node, cpu);
> > -	if (!ret && cpuidle_ops[cpu].init)
> > -		ret = cpuidle_ops[cpu].init(cpu_node, cpu);
> > +	if (!ret) {
> > +		if (cpuidle_ops[cpu].init)
> > +			ret = cpuidle_ops[cpu].init(cpu_node, cpu);
> > +		else
> > +			ret = -EOPNOTSUPP;
> > +	}  
> 
> Hi Jisheng,
> 
> this should be handled in the arm_cpuidle_read_ops function.
> 

Thanks for reviewing. After some consideration, I think this patch isn't correct
There may be platforms which doesn't need the init member at all, although
currently I don't see such platforms in mainline, So I'll drop this patch
and send out one v2 only does the optimization.

Thanks a lot,
Jisheng




More information about the linux-arm-kernel mailing list