| Message ID | 20200226002356.86986-3-gshan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: Dereference CPU operations indirectly | expand |
On Wed, Feb 26, 2020 at 11:23:53AM +1100, Gavin Shan wrote: > This renames cpu_read_ops() to init_cpu_ops() as the function it's only > called in initialization phase. Also, we will introduce get_cpu_ops() in > the subsequent patches, to retireve the CPU operation by the given CPU > index. The usage of cpu_read_ops() and get_cpu_ops() are difficult to be > distinguish from their names. > > Signed-off-by: Gavin Shan <gshan@redhat.com> That rationale makes sense to me, and the patch itself looks sound, so: Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/include/asm/cpu_ops.h | 6 +++--- > arch/arm64/kernel/cpu_ops.c | 2 +- > arch/arm64/kernel/setup.c | 2 +- > arch/arm64/kernel/smp.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h > index 86aabf1e0199..baa13b5db2ca 100644 > --- a/arch/arm64/include/asm/cpu_ops.h > +++ b/arch/arm64/include/asm/cpu_ops.h > @@ -56,11 +56,11 @@ struct cpu_operations { > }; > > extern const struct cpu_operations *cpu_ops[NR_CPUS]; > -int __init cpu_read_ops(int cpu); > +int __init init_cpu_ops(int cpu); > > -static inline void __init cpu_read_bootcpu_ops(void) > +static inline void __init init_bootcpu_ops(void) > { > - cpu_read_ops(0); > + init_cpu_ops(0); > } > > #endif /* ifndef __ASM_CPU_OPS_H */ > diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c > index 2082cfb1be86..a6c3c816b618 100644 > --- a/arch/arm64/kernel/cpu_ops.c > +++ b/arch/arm64/kernel/cpu_ops.c > @@ -96,7 +96,7 @@ static const char *__init cpu_read_enable_method(int cpu) > /* > * Read a cpu's enable method and record it in cpu_ops. > */ > -int __init cpu_read_ops(int cpu) > +int __init init_cpu_ops(int cpu) > { > const char *enable_method = cpu_read_enable_method(cpu); > > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c > index a34890bf309f..f66bd260cce8 100644 > --- a/arch/arm64/kernel/setup.c > +++ b/arch/arm64/kernel/setup.c > @@ -344,7 +344,7 @@ void __init setup_arch(char **cmdline_p) > else > psci_acpi_init(); > > - cpu_read_bootcpu_ops(); > + init_bootcpu_ops(); > smp_init_cpus(); > smp_build_mpidr_hash(); > > diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c > index d4ed9a19d8fe..6f8477d7f3be 100644 > --- a/arch/arm64/kernel/smp.c > +++ b/arch/arm64/kernel/smp.c > @@ -488,7 +488,7 @@ static bool __init is_mpidr_duplicate(unsigned int cpu, u64 hwid) > */ > static int __init smp_cpu_setup(int cpu) > { > - if (cpu_read_ops(cpu)) > + if (init_cpu_ops(cpu)) > return -ENODEV; > > if (cpu_ops[cpu]->cpu_init(cpu)) > -- > 2.23.0 >
diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h index 86aabf1e0199..baa13b5db2ca 100644 --- a/arch/arm64/include/asm/cpu_ops.h +++ b/arch/arm64/include/asm/cpu_ops.h @@ -56,11 +56,11 @@ struct cpu_operations { }; extern const struct cpu_operations *cpu_ops[NR_CPUS]; -int __init cpu_read_ops(int cpu); +int __init init_cpu_ops(int cpu); -static inline void __init cpu_read_bootcpu_ops(void) +static inline void __init init_bootcpu_ops(void) { - cpu_read_ops(0); + init_cpu_ops(0); } #endif /* ifndef __ASM_CPU_OPS_H */ diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c index 2082cfb1be86..a6c3c816b618 100644 --- a/arch/arm64/kernel/cpu_ops.c +++ b/arch/arm64/kernel/cpu_ops.c @@ -96,7 +96,7 @@ static const char *__init cpu_read_enable_method(int cpu) /* * Read a cpu's enable method and record it in cpu_ops. */ -int __init cpu_read_ops(int cpu) +int __init init_cpu_ops(int cpu) { const char *enable_method = cpu_read_enable_method(cpu); diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index a34890bf309f..f66bd260cce8 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -344,7 +344,7 @@ void __init setup_arch(char **cmdline_p) else psci_acpi_init(); - cpu_read_bootcpu_ops(); + init_bootcpu_ops(); smp_init_cpus(); smp_build_mpidr_hash(); diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index d4ed9a19d8fe..6f8477d7f3be 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -488,7 +488,7 @@ static bool __init is_mpidr_duplicate(unsigned int cpu, u64 hwid) */ static int __init smp_cpu_setup(int cpu) { - if (cpu_read_ops(cpu)) + if (init_cpu_ops(cpu)) return -ENODEV; if (cpu_ops[cpu]->cpu_init(cpu))
This renames cpu_read_ops() to init_cpu_ops() as the function it's only called in initialization phase. Also, we will introduce get_cpu_ops() in the subsequent patches, to retireve the CPU operation by the given CPU index. The usage of cpu_read_ops() and get_cpu_ops() are difficult to be distinguish from their names. Signed-off-by: Gavin Shan <gshan@redhat.com> --- arch/arm64/include/asm/cpu_ops.h | 6 +++--- arch/arm64/kernel/cpu_ops.c | 2 +- arch/arm64/kernel/setup.c | 2 +- arch/arm64/kernel/smp.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)