lkml.org 
[lkml]   [2009]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 3/10 -tip] x86: Add cpufeatures for Advanced Power Management
    From
    Date

    Add Advanced Power Management (Function 8000_0007h), edx

    /proc/cpuinfo (before)
    flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge
    mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt
    rdtscp lm 3dnowext 3dnow constant_tsc rep_good nonstop_tsc pni cx16
    lahf_lm cmp_legacy svm extapic cr8_legacy 3dnowprefetch osvw skinit pname

    /proc/cpuinfo (after)
    flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge
    mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt
    rdtscp lm 3dnowext 3dnow rep_good tsc_reliable nonstop_tsc pni cx16
    lahf_lm cmp_legacy svm extapic cr8_legacy 3dnowprefetch osvw skinit pname
    ts ttp htc stc 100mhzsteps hwpstate constant_tsc

    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    ---
    arch/x86/include/asm/cpufeature.h | 14 ++++++++++++--
    arch/x86/kernel/cpu/common.c | 10 ++++++----
    2 files changed, 18 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
    index e1a4cc4..d37ab0f 100644
    --- a/arch/x86/include/asm/cpufeature.h
    +++ b/arch/x86/include/asm/cpufeature.h
    @@ -6,7 +6,7 @@

    #include <asm/required-features.h>

    -#define NCAPINTS 9 /* N 32-bit words worth of info */
    +#define NCAPINTS 10 /* N 32-bit words worth of info */

    /*
    * Note: If the comment begins with a quoted string, that string is used
    @@ -76,7 +76,6 @@
    #define X86_FEATURE_K7 (3*32+ 5) /* "" Athlon */
    #define X86_FEATURE_P3 (3*32+ 6) /* "" P3 */
    #define X86_FEATURE_P4 (3*32+ 7) /* "" P4 */
    -#define X86_FEATURE_CONSTANT_TSC (3*32+ 8) /* TSC ticks at a constant rate */
    #define X86_FEATURE_UP (3*32+ 9) /* smp kernel running on up */
    #define X86_FEATURE_FXSAVE_LEAK (3*32+10) /* "" FXSAVE leaks FOP/FIP/FOP */
    #define X86_FEATURE_ARCH_PERFMON (3*32+11) /* Intel Architectural PerfMon */
    @@ -164,6 +163,17 @@
    #define X86_FEATURE_EPT (8*32+ 3) /* Intel Extended Page Table */
    #define X86_FEATURE_VPID (8*32+ 4) /* Intel Virtual Processor ID */

    +/* Advanced Power Management (Function 8000_0007h), edx */
    +#define X86_FEATURE_TS (9*32+ 0) /* Temperatue sensor */
    +#define X86_FEATURE_FID (9*32+ 1) /* Frequency ID control */
    +#define X86_FEATURE_VID (9*32+ 2) /* Voltage ID control */
    +#define X86_FEATURE_TTP (9*32+ 3) /* Thermal trip */
    +#define X86_FEATURE_HTC (9*32+ 4) /* Hardware thermal control */
    +#define X86_FEATURE_STC (9*32+ 5) /* Software thermal control */
    +#define X86_FEATURE_100MHZSTEPS (9*32+ 6) /* 100 MHz multiplier control */
    +#define X86_FEATURE_HWPSTATE (9*32+ 7) /* Hardware P-State control */
    +#define X86_FEATURE_CONSTANT_TSC (9*32+ 8) /* Constant rate TSC ticks */
    +
    #if defined(__KERNEL__) && !defined(__ASSEMBLY__)

    #include <linux/bitops.h>
    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index 3994feb..a428b36 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -573,6 +573,12 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
    if (c->extended_cpuid_level >= 0x80000004)
    set_cpu_cap(c, X86_FEATURE_PNAME);

    + /* Advanced Power Management (Function 8000_0007h), edx */
    + if (c->extended_cpuid_level >= 0x80000007){
    + c->x86_capability[9] = cpuid_edx(0x80000007);
    + c->x86_power = cpuid_edx(0x80000007);
    + }
    +
    if (c->extended_cpuid_level >= 0x80000008) {
    u32 eax = cpuid_eax(0x80000008);

    @@ -583,10 +589,6 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
    else if (cpu_has(c, X86_FEATURE_PAE) || cpu_has(c, X86_FEATURE_PSE36))
    c->x86_phys_bits = 36;
    #endif
    -
    - if (c->extended_cpuid_level >= 0x80000007)
    - c->x86_power = cpuid_edx(0x80000007);
    -
    }

    static void __cpuinit identify_cpu_without_cpuid(struct cpuinfo_x86 *c)
    --
    1.6.0.6




    \
     
     \ /
      Last update: 2009-05-12 17:53    [W:0.025 / U:62.056 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site