write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/arch/powerpc/perf/ppc970-pmu.c
..
..
@@ -1,17 +1,15 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Performance counter support for PPC970-family processors.
3
4
  *
4
5
  * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- * modify it under the terms of the GNU General Public License
8
- * as published by the Free Software Foundation; either version
9
- * 2 of the License, or (at your option) any later version.
10
6
  */
11
7
 #include <linux/string.h>
12
8
 #include <linux/perf_event.h>
13
9
 #include <asm/reg.h>
14
10
 #include <asm/cputable.h>
11
+
12
+#include "internal.h"
15
13
 
16
14
 /*
17
15
  * Bits in event code for PPC970
..
..
@@ -257,7 +255,8 @@
257
255
 }
258
256
 
259
257
 static int p970_compute_mmcr(u64 event[], int n_ev,
260
-			     unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])
258
+			     unsigned int hwc[], struct mmcr_regs *mmcr,
259
+			     struct perf_event *pevents[])
261
260
 {
262
261
 	unsigned long mmcr0 = 0, mmcr1 = 0, mmcra = 0;
263
262
 	unsigned int pmc, unit, byte, psel;
..
..
@@ -397,27 +396,26 @@
397
396
 	mmcra |= 0x2000;	/* mark only one IOP per PPC instruction */
398
397
 
399
398
 	/* Return MMCRx values */
400
-	mmcr[0] = mmcr0;
401
-	mmcr[1] = mmcr1;
402
-	mmcr[2] = mmcra;
399
+	mmcr->mmcr0 = mmcr0;
400
+	mmcr->mmcr1 = mmcr1;
401
+	mmcr->mmcra = mmcra;
403
402
 	return 0;
404
403
 }
405
404
 
406
-static void p970_disable_pmc(unsigned int pmc, unsigned long mmcr[])
405
+static void p970_disable_pmc(unsigned int pmc, struct mmcr_regs *mmcr)
407
406
 {
408
-	int shift, i;
407
+	int shift;
409
408
 
410
-	if (pmc <= 1) {
411
-		shift = MMCR0_PMC1SEL_SH - 7 * pmc;
412
-		i = 0;
413
-	} else {
414
-		shift = MMCR1_PMC3SEL_SH - 5 * (pmc - 2);
415
-		i = 1;
416
-	}
417
409
 	/*
418
410
 	 * Setting the PMCxSEL field to 0x08 disables PMC x.
419
411
 	 */
420
-	mmcr[i] = (mmcr[i] & ~(0x1fUL << shift)) | (0x08UL << shift);
412
+	if (pmc <= 1) {
413
+		shift = MMCR0_PMC1SEL_SH - 7 * pmc;
414
+		mmcr->mmcr0 = (mmcr->mmcr0 & ~(0x1fUL << shift)) | (0x08UL << shift);
415
+	} else {
416
+		shift = MMCR1_PMC3SEL_SH - 5 * (pmc - 2);
417
+		mmcr->mmcr1 = (mmcr->mmcr1 & ~(0x1fUL << shift)) | (0x08UL << shift);
418
+	}
421
419
 }
422
420
 
423
421
 static int ppc970_generic_events[] = {
..
..
@@ -436,7 +434,7 @@
436
434
  * 0 means not supported, -1 means nonsensical, other values
437
435
  * are event codes.
438
436
  */
439
-static int ppc970_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
437
+static u64 ppc970_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
440
438
 	[C(L1D)] = {		/* 	RESULT_ACCESS	RESULT_MISS */
441
439
 		[C(OP_READ)] = {	0x8810,		0x3810	},
442
440
 		[C(OP_WRITE)] = {	0x7810,		0x813	},
..
..
@@ -490,7 +488,7 @@
490
488
 	.flags			= PPMU_NO_SIPR | PPMU_NO_CONT_SAMPLING,
491
489
 };
492
490
 
493
-static int __init init_ppc970_pmu(void)
491
+int init_ppc970_pmu(void)
494
492
 {
495
493
 	if (!cur_cpu_spec->oprofile_cpu_type ||
496
494
 	    (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")
..
..
@@ -499,5 +497,3 @@
499
497
 
500
498
 	return register_power_pmu(&ppc970_pmu);
501
499
 }
502
-
503
-early_initcall(init_ppc970_pmu);