← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-lts-vivid/trusty-proposed

« back to all changes in this revision

Viewing changes to arch/x86/kernel/tsc.c

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Kamal Mostafa, K. Y. Srinivasan
  • Date: 2015-11-23 13:24:32 UTC
  • Revision ID: package-import@ubuntu.com-20151123132432-903xk653el60bfun
https://launchpad.net/bugs/1518519
https://launchpad.net/bugs/1508706
[ Kamal Mostafa ]

* Release Tracking Bug
  - LP: #1518519

[ K. Y. Srinivasan ]

* SAUCE: Drivers: hv: vmbus: Fix a Host signaling bug
  - LP: #1508706

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/kernel/tsc.c
21
21
#include <asm/hypervisor.h>
22
22
#include <asm/nmi.h>
23
23
#include <asm/x86_init.h>
 
24
#include <asm/geode.h>
24
25
 
25
26
unsigned int __read_mostly cpu_khz;     /* TSC clocks / usec, not used here */
26
27
EXPORT_SYMBOL(cpu_khz);
1004
1005
 
1005
1006
static void __init check_system_tsc_reliable(void)
1006
1007
{
1007
 
#ifdef CONFIG_MGEODE_LX
1008
 
        /* RTSC counts during suspend */
 
1008
#if defined(CONFIG_MGEODEGX1) || defined(CONFIG_MGEODE_LX) || defined(CONFIG_X86_GENERIC)
 
1009
        if (is_geode_lx()) {
 
1010
                /* RTSC counts during suspend */
1009
1011
#define RTSC_SUSP 0x100
1010
 
        unsigned long res_low, res_high;
 
1012
                unsigned long res_low, res_high;
1011
1013
 
1012
 
        rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high);
1013
 
        /* Geode_LX - the OLPC CPU has a very reliable TSC */
1014
 
        if (res_low & RTSC_SUSP)
1015
 
                tsc_clocksource_reliable = 1;
 
1014
                rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high);
 
1015
                /* Geode_LX - the OLPC CPU has a very reliable TSC */
 
1016
                if (res_low & RTSC_SUSP)
 
1017
                        tsc_clocksource_reliable = 1;
 
1018
        }
1016
1019
#endif
1017
1020
        if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE))
1018
1021
                tsc_clocksource_reliable = 1;