aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-10-19 15:00:09 -0400
committerRobert Richter <robert.richter@amd.com>2008-12-10 08:20:01 -0500
commitfd13f6c85144bb2026c534a35be1d7cb7628a64a (patch)
treedf7313ef61b04df004d247d360500cd3ad5dbe25 /arch
parent061e41fdb5047b1fb161e89664057835935ca1d2 (diff)
oprofile: comment cleanup
This fixes the coding style of some comments. Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/oprofile/op_model_amd.c31
1 files changed, 16 insertions, 15 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
index 509513760a6e..fb67e1999d85 100644
--- a/arch/x86/oprofile/op_model_amd.c
+++ b/arch/x86/oprofile/op_model_amd.c
@@ -65,8 +65,10 @@ static unsigned long reset_value[NUM_COUNTERS];
65#define IBS_FETCH_BEGIN 3 65#define IBS_FETCH_BEGIN 3
66#define IBS_OP_BEGIN 4 66#define IBS_OP_BEGIN 4
67 67
68/* The function interface needs to be fixed, something like add 68/*
69 data. Should then be added to linux/oprofile.h. */ 69 * The function interface needs to be fixed, something like add
70 * data. Should then be added to linux/oprofile.h.
71 */
70extern void 72extern void
71oprofile_add_ibs_sample(struct pt_regs *const regs, 73oprofile_add_ibs_sample(struct pt_regs *const regs,
72 unsigned int *const ibs_sample, int ibs_code); 74 unsigned int *const ibs_sample, int ibs_code);
@@ -106,7 +108,7 @@ struct ibs_op_sample {
106 108
107/* 109/*
108 * unitialize the APIC for the IBS interrupts if needed on AMD Family10h+ 110 * unitialize the APIC for the IBS interrupts if needed on AMD Family10h+
109*/ 111 */
110static void clear_ibs_nmi(void); 112static void clear_ibs_nmi(void);
111 113
112static int ibs_allowed; /* AMD Family10h and later */ 114static int ibs_allowed; /* AMD Family10h and later */
@@ -223,7 +225,7 @@ op_amd_handle_ibs(struct pt_regs * const regs,
223 (unsigned int *)&ibs_fetch, 225 (unsigned int *)&ibs_fetch,
224 IBS_FETCH_BEGIN); 226 IBS_FETCH_BEGIN);
225 227
226 /*reenable the IRQ */ 228 /* reenable the IRQ */
227 rdmsr(MSR_AMD64_IBSFETCHCTL, low, high); 229 rdmsr(MSR_AMD64_IBSFETCHCTL, low, high);
228 high &= ~IBS_FETCH_HIGH_VALID_BIT; 230 high &= ~IBS_FETCH_HIGH_VALID_BIT;
229 high |= IBS_FETCH_HIGH_ENABLE; 231 high |= IBS_FETCH_HIGH_ENABLE;
@@ -331,8 +333,10 @@ static void op_amd_stop(struct op_msrs const * const msrs)
331 unsigned int low, high; 333 unsigned int low, high;
332 int i; 334 int i;
333 335
334 /* Subtle: stop on all counters to avoid race with 336 /*
335 * setting our pm callback */ 337 * Subtle: stop on all counters to avoid race with setting our
338 * pm callback
339 */
336 for (i = 0 ; i < NUM_COUNTERS ; ++i) { 340 for (i = 0 ; i < NUM_COUNTERS ; ++i) {
337 if (!reset_value[i]) 341 if (!reset_value[i])
338 continue; 342 continue;
@@ -343,13 +347,15 @@ static void op_amd_stop(struct op_msrs const * const msrs)
343 347
344#ifdef CONFIG_OPROFILE_IBS 348#ifdef CONFIG_OPROFILE_IBS
345 if (ibs_allowed && ibs_config.fetch_enabled) { 349 if (ibs_allowed && ibs_config.fetch_enabled) {
346 low = 0; /* clear max count and enable */ 350 /* clear max count and enable */
351 low = 0;
347 high = 0; 352 high = 0;
348 wrmsr(MSR_AMD64_IBSFETCHCTL, low, high); 353 wrmsr(MSR_AMD64_IBSFETCHCTL, low, high);
349 } 354 }
350 355
351 if (ibs_allowed && ibs_config.op_enabled) { 356 if (ibs_allowed && ibs_config.op_enabled) {
352 low = 0; /* clear max count and enable */ 357 /* clear max count and enable */
358 low = 0;
353 high = 0; 359 high = 0;
354 wrmsr(MSR_AMD64_IBSOPCTL, low, high); 360 wrmsr(MSR_AMD64_IBSOPCTL, low, high);
355 } 361 }
@@ -443,10 +449,7 @@ static int pfm_amd64_setup_eilvt(void)
443 return 0; 449 return 0;
444} 450}
445 451
446/* 452/* initialize the APIC for the IBS interrupts if available */
447 * initialize the APIC for the IBS interrupts
448 * if available (AMD Family10h rev B0 and later)
449 */
450static void setup_ibs(void) 453static void setup_ibs(void)
451{ 454{
452 ibs_allowed = boot_cpu_has(X86_FEATURE_IBS); 455 ibs_allowed = boot_cpu_has(X86_FEATURE_IBS);
@@ -463,9 +466,7 @@ static void setup_ibs(void)
463} 466}
464 467
465 468
466/* 469/* uninitialize the APIC for the IBS interrupts if needed */
467 * unitialize the APIC for the IBS interrupts if needed on AMD Family10h
468 * rev B0 and later */
469static void clear_ibs_nmi(void) 470static void clear_ibs_nmi(void)
470{ 471{
471 if (ibs_allowed) 472 if (ibs_allowed)