On Tue, 26 Jun 2018, Pavel Tatashin wrote: > On Tue, Jun 26, 2018 at 11:44 AM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > I have an idea how to distangle it and we'll end up in a staged approach, > > which looks like this: > > > > 1) Earliest one (not sure how early yet) > > > > Attempt to use MSR/CPUID. If not running on a hypervisor this can > > try the quick PIT calibration, but nothing else. > > > > 2) Post init_hypervisor_platform() > > > > An attempt to use the hypervisor data can be made. > > > > 3) Post early_acpi_boot_init() > > > > This can do PIT/HPET based calibration > > > > 4) Post x86_dtb_init() > > > > PIT/PMTIMER based calibration > > > > Once tsc_khz is known, no further attempts of calibration are made. I'll > > look into that later tonight. > > I think, there are no reasons to try staged attempts. It usually gets > harder to maintain overtime. In my opinion it is best if do it in two > tries, as right now, but just cleaner. The first attempt we get a > crude result, using the lowest denominator to which current logic > might fallback if something else is not available that early in boot: > i.e cpu calibration loop in native_calibrate_cpu() but later get > something better. Also, even if early clock does not work because we > could not get tsc early, it is not a problem, we still will probably > determine it later during tsc_init call. I still want to document the unholy mess of what is initialized and available when. We have 5 hypervisors and 3 different points in early boot where the calibrate_* callbacks are overwritten. The XEN PV one is actually post tsc_init_early() for whatever reason. That's all completely obscure and any attempt of moving tsc_early_init() earlier than where it is now is just lottery. The other issue is that double calibration, e.g. doing the PIT thing twice is just consuming boot time for no value. All of that has been duct taped over time and we really don't want yet another thing glued to it just because we can. > I have re-wrote tsc_early_init()/tsc_init(), they are much simpler now: > > void __init tsc_early_init(void) > { > if (!boot_cpu_has(X86_FEATURE_TSC)) > return; > > if (!determine_cpu_tsc_frequncies()) > return; That still wants to do the TSC_ADJUST call here. Thanks, tglx -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html