Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd87f1f0 authored by Barry Kasindorf's avatar Barry Kasindorf Committed by Ingo Molnar
Browse files

oprofile: op_model_athlon.c support for AMD family 10h barcelona performance counters 



This patch is for controlling the upper 32bits of the event ctrl msrs.
This includes the upper 4 bits of the event select and the Guest Only and
Host Only bits

This patch is necessary to make Event Based Profiling work reliably on a
Family 10h processor

[akpm@linux-foundation.org: checkpatch.pl fixes]

Signed-off-by: default avatarBarry Kasindorf <barry.kasindorf@amd.com>
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c63a1190

arch/x86/oprofile/op_model_athlon.c

+16 −6
Original line number Diff line number Diff line 
/**

 * @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
@@ -31,12 +31,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];
@@ -70,7 +74,8 @@ static void athlon_setup_ctrs(struct op_msrs const * const msrs) 
		if (unlikely(!CTRL_IS_RESERVED(msrs,i)))

			continue;

		CTRL_READ(low, high, msrs, i);

		CTRL_CLEAR(low);

		CTRL_CLEAR_LO(low);

		CTRL_CLEAR_HI(high);

		CTRL_WRITE(low, high, msrs, i);

	}
@@ -89,12 +94,17 @@ static void athlon_setup_ctrs(struct op_msrs const * const msrs) 
			CTR_WRITE(counter_config[i].count, msrs, i);



			CTRL_READ(low, high, msrs, i);

			CTRL_CLEAR(low);

			CTRL_CLEAR_LO(low);

			CTRL_CLEAR_HI(high);

			CTRL_SET_ENABLE(low);

			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;