Attachment 295336 Details for Bug 433524 – This fixes the Greyhound oprofile PMC patch

[patch] This fixes the Greyhound oprofile PMC patch

RHEL4.7_oprofile_PMC.patch (text/plain), 2.02 KB, created by Bhavna Sarathy on 2008-02-19 21:22:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bhavna Sarathy

Created: 2008-02-19 21:22:07 UTC

Size: 2.02 KB

patch

obsolete

>--- linux-2.6.9/arch/i386/oprofile/op_model_athlon.c.PMCorig	2008-02-19 15:53:22.000000000 -0500
>+++ linux-2.6.9/arch/i386/oprofile/op_model_athlon.c	2008-02-19 16:13:46.000000000 -0500
>@@ -1,6 +1,6 @@
> /**
>  * @file op_model_athlon.h
>- * athlon / K7 model-specific MSR operations
>+ * athlon / K7 / K8 / Family 10h model-specific MSR operations
>  *
>  * @remark Copyright 2002 OProfile authors
>  * @remark Read the file COPYING
>@@ -28,12 +28,16 @@
> #define CTRL_WRITE(l,h,msrs,c) do {wrmsr(msrs->controls[(c)].addr, (l), (h));} while (0)
> #define CTRL_SET_ACTIVE(n) (n |= (1<<22))
> #define CTRL_SET_INACTIVE(n) (n &= ~(1<<22))
>-#define CTRL_CLEAR(x) (x &= (1<<21))
>+#define CTRL_CLEAR_LO(x) (x &= (1<<21))
>+#define CTRL_CLEAR_HI(x) ( x &= 0xfffffcf0 )
> #define CTRL_SET_ENABLE(val) (val |= 1<<20)
> #define CTRL_SET_USR(val,u) (val |= ((u & 1) << 16))
> #define CTRL_SET_KERN(val,k) (val |= ((k & 1) << 17))
> #define CTRL_SET_UM(val, m) (val |= (m << 8))
>-#define CTRL_SET_EVENT(val, e) (val |= e)
>+#define CTRL_SET_EVENT_LOW(val, e) (val |= (e & 0xff))
>+#define CTRL_SET_EVENT_HIGH(val,e) (val |= ((e >> 8) & 0xf))
>+#define CTRL_SET_HOST_ONLY(val, h) (val |= ((h & 1) << 9))
>+#define CTRL_SET_GUEST_ONLY(val, h) (val |= ((h & 1) << 8))
> 
> static unsigned long reset_value[NUM_COUNTERS];
>  
>@@ -59,7 +63,8 @@ static void athlon_setup_ctrs(struct op_
> 	/* clear all counters */
> 	for (i = 0 ; i < NUM_CONTROLS; ++i) {
> 		CTRL_READ(low, high, msrs, i);
>-		CTRL_CLEAR(low);
>+		CTRL_CLEAR_LO(low);
>+		CTRL_CLEAR_HI(high);
> 		CTRL_WRITE(low, high, msrs, i);
> 	}
> 	
>@@ -81,7 +86,10 @@ static void athlon_setup_ctrs(struct op_
> 			CTRL_SET_USR(low, counter_config[i].user);
> 			CTRL_SET_KERN(low, counter_config[i].kernel);
> 			CTRL_SET_UM(low, counter_config[i].unit_mask);
>-			CTRL_SET_EVENT(low, counter_config[i].event);
>+			CTRL_SET_EVENT_LOW(low, counter_config[i].event);
>+			CTRL_SET_EVENT_HIGH(high, counter_config[i].event);
>+			CTRL_SET_HOST_ONLY(high, 0);
>+			CTRL_SET_GUEST_ONLY(high, 0);
> 			CTRL_WRITE(low, high, msrs, i);
> 		} else {
> 			reset_value[i] = 0;

Actions: View | Diff

Attachments on bug 433524: 295336