lkml.org 
[lkml]   [2008]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 11 of 12] xen: maintain clock offset over save/restore
    Date
    From
    Hook into the device model to make sure that timekeeping's resume handler
    is called. This deals with our clocksource's non-monotonicity over the
    save/restore. Explicitly call clock_has_changed() to make sure that
    all the timers get retriggered properly.

    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/xen/time.c | 8 --------
    drivers/xen/manage.c | 15 ++++++++++++---
    include/xen/xen-ops.h | 3 ---
    3 files changed, 12 insertions(+), 14 deletions(-)

    diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
    --- a/arch/x86/xen/time.c
    +++ b/arch/x86/xen/time.c
    @@ -565,14 +565,6 @@
    clockevents_register_device(&__get_cpu_var(xen_clock_events));
    }

    -void xen_time_suspend(void)
    -{
    -}
    -
    -void xen_time_resume(void)
    -{
    -}
    -
    __init void xen_time_init(void)
    {
    int cpu = smp_processor_id();
    diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
    --- a/drivers/xen/manage.c
    +++ b/drivers/xen/manage.c
    @@ -34,14 +34,21 @@
    static int xen_suspend(void *data)
    {
    int *cancelled = data;
    + int err;

    BUG_ON(!irqs_disabled());

    load_cr3(swapper_pg_dir);

    + err = device_power_down(PMSG_SUSPEND);
    + if (err) {
    + printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n",
    + err);
    + return err;
    + }
    +
    xen_mm_pin_all();
    gnttab_suspend();
    - xen_time_suspend();
    xen_pre_suspend();

    /*
    @@ -52,9 +59,10 @@
    *cancelled = HYPERVISOR_suspend(virt_to_mfn(xen_start_info));

    xen_post_suspend(*cancelled);
    - xen_time_resume();
    gnttab_resume();
    xen_mm_unpin_all();
    +
    + device_power_up();

    if (!*cancelled) {
    xen_irq_resume();
    @@ -105,7 +113,8 @@

    device_resume();

    -
    + /* Make sure timer events get retriggered on all CPUs */
    + clock_was_set();
    out:
    #ifdef CONFIG_PREEMPT
    thaw_processes();
    diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
    --- a/include/xen/xen-ops.h
    +++ b/include/xen/xen-ops.h
    @@ -11,7 +11,4 @@
    void xen_mm_pin_all(void);
    void xen_mm_unpin_all(void);

    -void xen_time_suspend(void);
    -void xen_time_resume(void);
    -
    #endif /* INCLUDE_XEN_OPS_H */



    \
     
     \ /
      Last update: 2008-05-23 15:49    [W:0.021 / U:60.660 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site