ia64/xen-unstable

changeset 5914:fb5de385a9ee

Slightly better time debugging support in Xen.
author kaf24@firebug.cl.cam.ac.uk
date Wed Jul 27 23:15:15 2005 +0000 (2005-07-27)
parents c02e5214247e
children 7a30b587387f
files xen/arch/x86/time.c
line diff
     1.1 --- a/xen/arch/x86/time.c	Wed Jul 27 18:41:49 2005 +0000
     1.2 +++ b/xen/arch/x86/time.c	Wed Jul 27 23:15:15 2005 +0000
     1.3 @@ -319,12 +319,11 @@ static int init_hpet(void)
     1.4  
     1.5      if ( (hpet_address == 0) && opt_hpet_force )
     1.6      {
     1.7 -        printk(KERN_WARNING "WARNING: Enabling HPET base manually!\n");
     1.8          outl(0x800038a0, 0xcf8);
     1.9          outl(0xff000001, 0xcfc);
    1.10          outl(0x800038a0, 0xcf8);
    1.11          hpet_address = inl(0xcfc) & 0xfffffffe;
    1.12 -        printk(KERN_WARNING "WARNING: Enabled HPET at %#lx.\n", hpet_address);
    1.13 +        printk("WARNING: Forcibly enabled HPET at %#lx.\n", hpet_address);
    1.14      }
    1.15  
    1.16      if ( hpet_address == 0 )
    1.17 @@ -713,8 +712,9 @@ static void local_time_calibration(void 
    1.18  #if 0
    1.19      printk("PRE%d: tsc=%lld stime=%lld master=%lld\n",
    1.20             cpu, prev_tsc, prev_local_stime, prev_master_stime);
    1.21 -    printk("CUR%d: tsc=%lld stime=%lld master=%lld\n",
    1.22 -           cpu, curr_tsc, curr_local_stime, curr_master_stime);
    1.23 +    printk("CUR%d: tsc=%lld stime=%lld master=%lld -> %lld\n",
    1.24 +           cpu, curr_tsc, curr_local_stime, curr_master_stime,
    1.25 +           curr_master_stime - curr_local_stime);
    1.26  #endif
    1.27  
    1.28      /* Local time warps forward if it lags behind master time. */
    1.29 @@ -776,7 +776,8 @@ static void local_time_calibration(void 
    1.30          calibration_mul_frac = mul_frac(calibration_mul_frac, error_factor);
    1.31  
    1.32  #if 0
    1.33 -    printk("---%d: %08x %d\n", cpu, calibration_mul_frac, tsc_shift);
    1.34 +    printk("---%d: %08x %08x %d\n", cpu,
    1.35 +           error_factor, calibration_mul_frac, tsc_shift);
    1.36  #endif
    1.37  
    1.38      /* Record new timestamp information. */