Re: [PATCH 6/8] x86/platform: add a wallclock_init func to x86_platformsops

From: Thomas Gleixner
Date: Tue May 11 2010 - 10:42:41 EST


On Fri, 7 May 2010, Jacob Pan wrote:

> From: Feng Tang <feng.tang@xxxxxxxxx>
>
> Some wall clock devices use MMIO based HW register, this new function will
> give them a chance to do some initialization work before their get/set_time
> service get called.
>
> Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
> Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx>
> ---
> arch/x86/include/asm/x86_init.h | 2 ++
> arch/x86/kernel/setup.c | 2 ++
> arch/x86/kernel/x86_init.c | 2 ++
> 3 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
> index 519b543..be027a8 100644
> --- a/arch/x86/include/asm/x86_init.h
> +++ b/arch/x86/include/asm/x86_init.h
> @@ -138,6 +138,7 @@ struct x86_cpuinit_ops {
> /**
> * struct x86_platform_ops - platform specific runtime functions
> * @calibrate_tsc: calibrate TSC
> + * @wallclock_init: init the wallclock device


wallclock_init is an init function and should be in x86_init.timers

> * @get_wallclock: get time from HW clock like RTC etc.
> * @set_wallclock: set time back to HW clock
> * @is_untracked_pat_range exclude from PAT logic
> @@ -145,6 +146,7 @@ struct x86_cpuinit_ops {
> */
> struct x86_platform_ops {
> unsigned long (*calibrate_tsc)(void);
> + void (*wallclock_init)(void);
> unsigned long (*get_wallclock)(void);
> int (*set_wallclock)(unsigned long nowtime);
> void (*iommu_shutdown)(void);
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index c4851ef..d001d8c 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -1050,6 +1050,8 @@ void __init setup_arch(char **cmdline_p)
> #endif
> x86_init.oem.banner();
>
> + x86_platform.wallclock_init();
> +
> mcheck_init();
> }
>
> diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
> index 61a1e8c..ee00d76 100644
> --- a/arch/x86/kernel/x86_init.c
> +++ b/arch/x86/kernel/x86_init.c
> @@ -24,6 +24,7 @@ void __init x86_init_uint_noop(unsigned int unused) { }
> void __init x86_init_pgd_noop(pgd_t *unused) { }
> int __init iommu_init_noop(void) { return 0; }
> void iommu_shutdown_noop(void) { }
> +void wallclock_init_noop(void) { }

No need for that.

Thanks,

tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/