lkml.org 
[lkml]   [2007]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH x86 for review II] [12/39] i386: Handle 32 bit PerfMon Counter writes cleanly in oprofile
    Date

    From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>

    Handle these 32 bit perfmon counter MSR writes cleanly in oprofile.

    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Andi Kleen <ak@suse.de>

    ---
    arch/i386/oprofile/op_model_ppro.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    Index: linux/arch/i386/oprofile/op_model_ppro.c
    ===================================================================
    --- linux.orig/arch/i386/oprofile/op_model_ppro.c
    +++ linux/arch/i386/oprofile/op_model_ppro.c
    @@ -24,7 +24,8 @@

    #define CTR_IS_RESERVED(msrs,c) (msrs->counters[(c)].addr ? 1 : 0)
    #define CTR_READ(l,h,msrs,c) do {rdmsr(msrs->counters[(c)].addr, (l), (h));} while (0)
    -#define CTR_WRITE(l,msrs,c) do {wrmsr(msrs->counters[(c)].addr, -(u32)(l), -1);} while (0)
    +#define CTR_32BIT_WRITE(l,msrs,c) \
    + do {wrmsr(msrs->counters[(c)].addr, -(u32)(l), 0);} while (0)
    #define CTR_OVERFLOWED(n) (!((n) & (1U<<31)))

    #define CTRL_IS_RESERVED(msrs,c) (msrs->controls[(c)].addr ? 1 : 0)
    @@ -79,7 +80,7 @@ static void ppro_setup_ctrs(struct op_ms
    for (i = 0; i < NUM_COUNTERS; ++i) {
    if (unlikely(!CTR_IS_RESERVED(msrs,i)))
    continue;
    - CTR_WRITE(1, msrs, i);
    + CTR_32BIT_WRITE(1, msrs, i);
    }

    /* enable active counters */
    @@ -87,7 +88,7 @@ static void ppro_setup_ctrs(struct op_ms
    if ((counter_config[i].enabled) && (CTR_IS_RESERVED(msrs,i))) {
    reset_value[i] = counter_config[i].count;

    - CTR_WRITE(counter_config[i].count, msrs, i);
    + CTR_32BIT_WRITE(counter_config[i].count, msrs, i);

    CTRL_READ(low, high, msrs, i);
    CTRL_CLEAR(low);
    @@ -116,7 +117,7 @@ static int ppro_check_ctrs(struct pt_reg
    CTR_READ(low, high, msrs, i);
    if (CTR_OVERFLOWED(low)) {
    oprofile_add_sample(regs, i);
    - CTR_WRITE(reset_value[i], msrs, i);
    + CTR_32BIT_WRITE(reset_value[i], msrs, i);
    }
    }

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-02-12 08:55    [W:5.731 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site