| Message ID | 20190228135919.3747-5-ulf.hansson@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drivers: firmware: psci: Some cleanup and refactoring | expand |
On 28/02/2019 14:59, Ulf Hansson wrote: > To allow arch back-end init ops to operate on the cpuidle driver for the > corresponding CPU, let's pass along a pointer to the struct cpuidle_driver* > and forward it the relevant layers of callbacks for ARM/ARM64. > > Following changes for the PSCI firmware driver starts making use of this. > > Cc: Lina Iyer <ilina@codeaurora.org> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Russell King <linux@armlinux.org.uk> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Andy Gross <andy.gross@linaro.org> > Cc: David Brown <david.brown@linaro.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > --- Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
On Thu, Feb 28, 2019 at 02:59:16PM +0100, Ulf Hansson wrote: > To allow arch back-end init ops to operate on the cpuidle driver for the > corresponding CPU, let's pass along a pointer to the struct cpuidle_driver* > and forward it the relevant layers of callbacks for ARM/ARM64. > > Following changes for the PSCI firmware driver starts making use of this. > > Cc: Lina Iyer <ilina@codeaurora.org> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Russell King <linux@armlinux.org.uk> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Andy Gross <andy.gross@linaro.org> > Cc: David Brown <david.brown@linaro.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> In general, I'd prefer to avoid tightening the coupling between the backend and the cpuidle driver, so if this is only necessary for the next patch (to get at the driver's state count), I'd prefer to avoid it for now. I assume that for OSI there are other reasons we'll want to get at the driver in the backend init ops? Thanks, Mark. > --- > arch/arm/include/asm/cpuidle.h | 4 ++-- > arch/arm/kernel/cpuidle.c | 5 +++-- > arch/arm64/include/asm/cpu_ops.h | 4 +++- > arch/arm64/include/asm/cpuidle.h | 6 ++++-- > arch/arm64/kernel/cpuidle.c | 6 +++--- > drivers/cpuidle/cpuidle-arm.c | 2 +- > drivers/firmware/psci/psci.c | 7 ++++--- > drivers/soc/qcom/spm.c | 3 ++- > include/linux/psci.h | 4 +++- > 9 files changed, 25 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h > index 6b2ff7243b4b..bee0a7847733 100644 > --- a/arch/arm/include/asm/cpuidle.h > +++ b/arch/arm/include/asm/cpuidle.h > @@ -32,7 +32,7 @@ struct device_node; > > struct cpuidle_ops { > int (*suspend)(unsigned long arg); > - int (*init)(struct device_node *, int cpu); > + int (*init)(struct cpuidle_driver *, struct device_node *, int cpu); > }; > > struct of_cpuidle_method { > @@ -47,6 +47,6 @@ struct of_cpuidle_method { > > extern int arm_cpuidle_suspend(int index); > > -extern int arm_cpuidle_init(int cpu); > +extern int arm_cpuidle_init(struct cpuidle_driver *drv, int cpu); > > #endif > diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c > index fda5579123a8..43778c9b373d 100644 > --- a/arch/arm/kernel/cpuidle.c > +++ b/arch/arm/kernel/cpuidle.c > @@ -122,6 +122,7 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) > > /** > * arm_cpuidle_init() - Initialize cpuidle_ops for a specific cpu > + * @drv: the drv to be initialized > * @cpu: the cpu to be initialized > * > * Initialize the cpuidle ops with the device for the cpu and then call > @@ -137,7 +138,7 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) > * -ENXIO if the HW reports a failure or a misconfiguration, > * -ENOMEM if the HW report an memory allocation failure > */ > -int __init arm_cpuidle_init(int cpu) > +int __init arm_cpuidle_init(struct cpuidle_driver *drv, int cpu) > { > struct device_node *cpu_node = of_cpu_device_node_get(cpu); > int ret; > @@ -147,7 +148,7 @@ int __init arm_cpuidle_init(int cpu) > > ret = arm_cpuidle_read_ops(cpu_node, cpu); > if (!ret) > - ret = cpuidle_ops[cpu].init(cpu_node, cpu); > + ret = cpuidle_ops[cpu].init(drv, cpu_node, cpu); > > of_node_put(cpu_node); > > diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h > index 8f03446cf89f..8db870c29f1b 100644 > --- a/arch/arm64/include/asm/cpu_ops.h > +++ b/arch/arm64/include/asm/cpu_ops.h > @@ -19,6 +19,8 @@ > #include <linux/init.h> > #include <linux/threads.h> > > +struct cpuidle_driver; > + > /** > * struct cpu_operations - Callback operations for hotplugging CPUs. > * > @@ -58,7 +60,7 @@ struct cpu_operations { > int (*cpu_kill)(unsigned int cpu); > #endif > #ifdef CONFIG_CPU_IDLE > - int (*cpu_init_idle)(unsigned int); > + int (*cpu_init_idle)(struct cpuidle_driver *, unsigned int); > int (*cpu_suspend)(unsigned long); > #endif > }; > diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h > index 3c5ddb429ea2..3fd3efb61649 100644 > --- a/arch/arm64/include/asm/cpuidle.h > +++ b/arch/arm64/include/asm/cpuidle.h > @@ -4,11 +4,13 @@ > > #include <asm/proc-fns.h> > > +struct cpuidle_driver; > + > #ifdef CONFIG_CPU_IDLE > -extern int arm_cpuidle_init(unsigned int cpu); > +extern int arm_cpuidle_init(struct cpuidle_driver *drv, unsigned int cpu); > extern int arm_cpuidle_suspend(int index); > #else > -static inline int arm_cpuidle_init(unsigned int cpu) > +static inline int arm_cpuidle_init(struct cpuidle_driver *drv, unsigned int cpu) > { > return -EOPNOTSUPP; > } > diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c > index f2d13810daa8..aaf9dc5cb87a 100644 > --- a/arch/arm64/kernel/cpuidle.c > +++ b/arch/arm64/kernel/cpuidle.c > @@ -18,13 +18,13 @@ > #include <asm/cpuidle.h> > #include <asm/cpu_ops.h> > > -int arm_cpuidle_init(unsigned int cpu) > +int arm_cpuidle_init(struct cpuidle_driver *drv, unsigned int cpu) > { > int ret = -EOPNOTSUPP; > > if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_suspend && > cpu_ops[cpu]->cpu_init_idle) > - ret = cpu_ops[cpu]->cpu_init_idle(cpu); > + ret = cpu_ops[cpu]->cpu_init_idle(drv, cpu); > > return ret; > } > @@ -51,7 +51,7 @@ int arm_cpuidle_suspend(int index) > > int acpi_processor_ffh_lpi_probe(unsigned int cpu) > { > - return arm_cpuidle_init(cpu); > + return arm_cpuidle_init(NULL, cpu); > } > > int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi) > diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c > index 3a407a3ef22b..39413973b21d 100644 > --- a/drivers/cpuidle/cpuidle-arm.c > +++ b/drivers/cpuidle/cpuidle-arm.c > @@ -106,7 +106,7 @@ static int __init arm_idle_init_cpu(int cpu) > * Call arch CPU operations in order to initialize > * idle states suspend back-end specific data > */ > - ret = arm_cpuidle_init(cpu); > + ret = arm_cpuidle_init(drv, cpu); > > /* > * Allow the initialization to continue for other CPUs, if the reported > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index 9788bfc1cf8b..d50b46a0528f 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -287,7 +287,8 @@ static int psci_dt_parse_state_node(struct device_node *np, u32 *state) > return 0; > } > > -static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) > +static int psci_dt_cpu_init_idle(struct cpuidle_driver *drv, > + struct device_node *cpu_node, int cpu) > { > int i, ret = 0, count = 0; > u32 *psci_states; > @@ -375,7 +376,7 @@ static int __maybe_unused psci_acpi_cpu_init_idle(unsigned int cpu) > } > #endif > > -int psci_cpu_init_idle(unsigned int cpu) > +int psci_cpu_init_idle(struct cpuidle_driver *drv, unsigned int cpu) > { > struct device_node *cpu_node; > int ret; > @@ -394,7 +395,7 @@ int psci_cpu_init_idle(unsigned int cpu) > if (!cpu_node) > return -ENODEV; > > - ret = psci_dt_cpu_init_idle(cpu_node, cpu); > + ret = psci_dt_cpu_init_idle(drv, cpu_node, cpu); > > of_node_put(cpu_node); > > diff --git a/drivers/soc/qcom/spm.c b/drivers/soc/qcom/spm.c > index 53807e839664..6e967f0a8608 100644 > --- a/drivers/soc/qcom/spm.c > +++ b/drivers/soc/qcom/spm.c > @@ -208,7 +208,8 @@ static const struct of_device_id qcom_idle_state_match[] __initconst = { > { }, > }; > > -static int __init qcom_cpuidle_init(struct device_node *cpu_node, int cpu) > +static int __init qcom_cpuidle_init(struct cpuidle_driver *drv, > + struct device_node *cpu_node, int cpu) > { > const struct of_device_id *match_id; > struct device_node *state_node; > diff --git a/include/linux/psci.h b/include/linux/psci.h > index 8b1b3b5935ab..4f29a3bff379 100644 > --- a/include/linux/psci.h > +++ b/include/linux/psci.h > @@ -20,9 +20,11 @@ > #define PSCI_POWER_STATE_TYPE_STANDBY 0 > #define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 > > +struct cpuidle_driver; > + > bool psci_tos_resident_on(int cpu); > > -int psci_cpu_init_idle(unsigned int cpu); > +int psci_cpu_init_idle(struct cpuidle_driver *drv, unsigned int cpu); > int psci_cpu_suspend_enter(unsigned long index); > > enum psci_conduit { > -- > 2.17.1 >
diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h index 6b2ff7243b4b..bee0a7847733 100644 --- a/arch/arm/include/asm/cpuidle.h +++ b/arch/arm/include/asm/cpuidle.h @@ -32,7 +32,7 @@ struct device_node; struct cpuidle_ops { int (*suspend)(unsigned long arg); - int (*init)(struct device_node *, int cpu); + int (*init)(struct cpuidle_driver *, struct device_node *, int cpu); }; struct of_cpuidle_method { @@ -47,6 +47,6 @@ struct of_cpuidle_method { extern int arm_cpuidle_suspend(int index); -extern int arm_cpuidle_init(int cpu); +extern int arm_cpuidle_init(struct cpuidle_driver *drv, int cpu); #endif diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c index fda5579123a8..43778c9b373d 100644 --- a/arch/arm/kernel/cpuidle.c +++ b/arch/arm/kernel/cpuidle.c @@ -122,6 +122,7 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) /** * arm_cpuidle_init() - Initialize cpuidle_ops for a specific cpu + * @drv: the drv to be initialized * @cpu: the cpu to be initialized * * Initialize the cpuidle ops with the device for the cpu and then call @@ -137,7 +138,7 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) * -ENXIO if the HW reports a failure or a misconfiguration, * -ENOMEM if the HW report an memory allocation failure */ -int __init arm_cpuidle_init(int cpu) +int __init arm_cpuidle_init(struct cpuidle_driver *drv, int cpu) { struct device_node *cpu_node = of_cpu_device_node_get(cpu); int ret; @@ -147,7 +148,7 @@ int __init arm_cpuidle_init(int cpu) ret = arm_cpuidle_read_ops(cpu_node, cpu); if (!ret) - ret = cpuidle_ops[cpu].init(cpu_node, cpu); + ret = cpuidle_ops[cpu].init(drv, cpu_node, cpu); of_node_put(cpu_node); diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h index 8f03446cf89f..8db870c29f1b 100644 --- a/arch/arm64/include/asm/cpu_ops.h +++ b/arch/arm64/include/asm/cpu_ops.h @@ -19,6 +19,8 @@ #include <linux/init.h> #include <linux/threads.h> +struct cpuidle_driver; + /** * struct cpu_operations - Callback operations for hotplugging CPUs. * @@ -58,7 +60,7 @@ struct cpu_operations { int (*cpu_kill)(unsigned int cpu); #endif #ifdef CONFIG_CPU_IDLE - int (*cpu_init_idle)(unsigned int); + int (*cpu_init_idle)(struct cpuidle_driver *, unsigned int); int (*cpu_suspend)(unsigned long); #endif }; diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h index 3c5ddb429ea2..3fd3efb61649 100644 --- a/arch/arm64/include/asm/cpuidle.h +++ b/arch/arm64/include/asm/cpuidle.h @@ -4,11 +4,13 @@ #include <asm/proc-fns.h> +struct cpuidle_driver; + #ifdef CONFIG_CPU_IDLE -extern int arm_cpuidle_init(unsigned int cpu); +extern int arm_cpuidle_init(struct cpuidle_driver *drv, unsigned int cpu); extern int arm_cpuidle_suspend(int index); #else -static inline int arm_cpuidle_init(unsigned int cpu) +static inline int arm_cpuidle_init(struct cpuidle_driver *drv, unsigned int cpu) { return -EOPNOTSUPP; } diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c index f2d13810daa8..aaf9dc5cb87a 100644 --- a/arch/arm64/kernel/cpuidle.c +++ b/arch/arm64/kernel/cpuidle.c @@ -18,13 +18,13 @@ #include <asm/cpuidle.h> #include <asm/cpu_ops.h> -int arm_cpuidle_init(unsigned int cpu) +int arm_cpuidle_init(struct cpuidle_driver *drv, unsigned int cpu) { int ret = -EOPNOTSUPP; if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_suspend && cpu_ops[cpu]->cpu_init_idle) - ret = cpu_ops[cpu]->cpu_init_idle(cpu); + ret = cpu_ops[cpu]->cpu_init_idle(drv, cpu); return ret; } @@ -51,7 +51,7 @@ int arm_cpuidle_suspend(int index) int acpi_processor_ffh_lpi_probe(unsigned int cpu) { - return arm_cpuidle_init(cpu); + return arm_cpuidle_init(NULL, cpu); } int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi) diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c index 3a407a3ef22b..39413973b21d 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c @@ -106,7 +106,7 @@ static int __init arm_idle_init_cpu(int cpu) * Call arch CPU operations in order to initialize * idle states suspend back-end specific data */ - ret = arm_cpuidle_init(cpu); + ret = arm_cpuidle_init(drv, cpu); /* * Allow the initialization to continue for other CPUs, if the reported diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index 9788bfc1cf8b..d50b46a0528f 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -287,7 +287,8 @@ static int psci_dt_parse_state_node(struct device_node *np, u32 *state) return 0; } -static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) +static int psci_dt_cpu_init_idle(struct cpuidle_driver *drv, + struct device_node *cpu_node, int cpu) { int i, ret = 0, count = 0; u32 *psci_states; @@ -375,7 +376,7 @@ static int __maybe_unused psci_acpi_cpu_init_idle(unsigned int cpu) } #endif -int psci_cpu_init_idle(unsigned int cpu) +int psci_cpu_init_idle(struct cpuidle_driver *drv, unsigned int cpu) { struct device_node *cpu_node; int ret; @@ -394,7 +395,7 @@ int psci_cpu_init_idle(unsigned int cpu) if (!cpu_node) return -ENODEV; - ret = psci_dt_cpu_init_idle(cpu_node, cpu); + ret = psci_dt_cpu_init_idle(drv, cpu_node, cpu); of_node_put(cpu_node); diff --git a/drivers/soc/qcom/spm.c b/drivers/soc/qcom/spm.c index 53807e839664..6e967f0a8608 100644 --- a/drivers/soc/qcom/spm.c +++ b/drivers/soc/qcom/spm.c @@ -208,7 +208,8 @@ static const struct of_device_id qcom_idle_state_match[] __initconst = { { }, }; -static int __init qcom_cpuidle_init(struct device_node *cpu_node, int cpu) +static int __init qcom_cpuidle_init(struct cpuidle_driver *drv, + struct device_node *cpu_node, int cpu) { const struct of_device_id *match_id; struct device_node *state_node; diff --git a/include/linux/psci.h b/include/linux/psci.h index 8b1b3b5935ab..4f29a3bff379 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -20,9 +20,11 @@ #define PSCI_POWER_STATE_TYPE_STANDBY 0 #define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 +struct cpuidle_driver; + bool psci_tos_resident_on(int cpu); -int psci_cpu_init_idle(unsigned int cpu); +int psci_cpu_init_idle(struct cpuidle_driver *drv, unsigned int cpu); int psci_cpu_suspend_enter(unsigned long index); enum psci_conduit {
To allow arch back-end init ops to operate on the cpuidle driver for the corresponding CPU, let's pass along a pointer to the struct cpuidle_driver* and forward it the relevant layers of callbacks for ARM/ARM64. Following changes for the PSCI firmware driver starts making use of this. Cc: Lina Iyer <ilina@codeaurora.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Andy Gross <andy.gross@linaro.org> Cc: David Brown <david.brown@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- arch/arm/include/asm/cpuidle.h | 4 ++-- arch/arm/kernel/cpuidle.c | 5 +++-- arch/arm64/include/asm/cpu_ops.h | 4 +++- arch/arm64/include/asm/cpuidle.h | 6 ++++-- arch/arm64/kernel/cpuidle.c | 6 +++--- drivers/cpuidle/cpuidle-arm.c | 2 +- drivers/firmware/psci/psci.c | 7 ++++--- drivers/soc/qcom/spm.c | 3 ++- include/linux/psci.h | 4 +++- 9 files changed, 25 insertions(+), 16 deletions(-)