Skip to contentSkip to conversation

powerpc/perf_counter: Enable SDAR in continous sample mode

PATCH New Anton Blanchard 1 participant 2 messages Sep 22, 2009 – Oct 28, 2009 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/perf_counter: Enable SDAR in continous sample mode

In continuous sampling mode we want the SDAR to update. While we can select between dcache misses and erat misses, a decent default is to enable both.

---

arch/powerpc/kernel/power7-pmu.c +6 -1
Index: linux.trees.git/arch/powerpc/kernel/power7-pmu.c
===================================================================
@@ -54,6 +54,10 @@
  * Bits in MMCRA
  */
 
+/* These bits control when the SDAR updates when in continous sampling mode */
+#define MMCRA_SDAR_DCACHE_MISS	30
+#define MMCRA_SDAR_ERAT_MISS	29
+
 /*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
@@ -230,7 +234,8 @@ static int power7_compute_mmcr(u64 event
 			       unsigned int hwc[], unsigned long mmcr[])
 {
 	unsigned long mmcr1 = 0;
-	unsigned long mmcra = 0;
+	unsigned long mmcra = (1 << MMCRA_SDAR_DCACHE_MISS) |
+				(1 << MMCRA_SDAR_ERAT_MISS);
 	unsigned int pmc, unit, combine, l2sel, psel;
 	unsigned int pmc_inuse = 0;
 	int i;
arch/powerpc/kernel/power5-pmu.c +6 -1
Index: linux.trees.git/arch/powerpc/kernel/power5-pmu.c
===================================================================
@@ -76,6 +76,10 @@
  * Bits in MMCRA
  */
 
+/* These bits control when the SDAR updates when in continous sampling mode */
+#define MMCRA_SDAR_DCACHE_MISS	30
+#define MMCRA_SDAR_ERAT_MISS	29
+
 /*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
@@ -390,7 +394,8 @@ static int power5_compute_mmcr(u64 event
 			       unsigned int hwc[], unsigned long mmcr[])
 {
 	unsigned long mmcr1 = 0;
-	unsigned long mmcra = 0;
+	unsigned long mmcra = (1 << MMCRA_SDAR_DCACHE_MISS) |
+				(1 << MMCRA_SDAR_ERAT_MISS);
 	unsigned int pmc, unit, byte, psel;
 	unsigned int ttm, grp;
 	int i, isbus, bit, grsel;
arch/powerpc/kernel/power6-pmu.c +10 -1
Index: linux.trees.git/arch/powerpc/kernel/power6-pmu.c
===================================================================
@@ -51,6 +51,14 @@
 #define MMCR1_PMCSEL_MSK	0xff
 
 /*
+ * Bits in MMCRA
+ */
+
+/* These bits control when the SDAR updates when in continous sampling mode */
+#define MMCRA_SDAR_DCACHE_MISS	30
+#define MMCRA_SDAR_ERAT_MISS	29
+
+/*
  * Map of which direct events on which PMCs are marked instruction events.
  * Indexed by PMCSEL value >> 1.
  * Bottom 4 bits are a map of which PMCs are interesting,
@@ -178,7 +186,8 @@ static int p6_compute_mmcr(u64 event[], 
 			   unsigned int hwc[], unsigned long mmcr[])
 {
 	unsigned long mmcr1 = 0;
-	unsigned long mmcra = 0;
+	unsigned long mmcra = (1 << MMCRA_SDAR_DCACHE_MISS) |
+				(1 << MMCRA_SDAR_ERAT_MISS);
 	int i;
 	unsigned int pmc, ev, b, u, s, psel;
 	unsigned int ttmset = 0;
#1 lore raw

PATCH 1/1 powerpc/perf_counter: Enable SDAR in continous sample mode

In continuous sampling mode we want the SDAR to update. While we can select between dcache misses and erat misses, a decent default is to enable both.

---

Moved MMCRA definitions into asm/reg.h.

arch/powerpc/kernel/power7-pmu.c +1 -5
Index: linux.trees.git/arch/powerpc/kernel/power7-pmu.c
===================================================================
@@ -51,10 +51,6 @@
 #define MMCR1_PMCSEL_MSK	0xff
 
 /*
- * Bits in MMCRA
- */
-
-/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210
@@ -230,7 +226,7 @@ static int power7_compute_mmcr(u64 event
 			       unsigned int hwc[], unsigned long mmcr[])
 {
 	unsigned long mmcr1 = 0;
-	unsigned long mmcra = 0;
+	unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
 	unsigned int pmc, unit, combine, l2sel, psel;
 	unsigned int pmc_inuse = 0;
 	int i;
arch/powerpc/kernel/power5-pmu.c +1 -5
Index: linux.trees.git/arch/powerpc/kernel/power5-pmu.c
===================================================================
@@ -73,10 +73,6 @@
 #define MMCR1_PMCSEL_MSK	0x7f
 
 /*
- * Bits in MMCRA
- */
-
-/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210
@@ -390,7 +386,7 @@ static int power5_compute_mmcr(u64 event
 			       unsigned int hwc[], unsigned long mmcr[])
 {
 	unsigned long mmcr1 = 0;
-	unsigned long mmcra = 0;
+	unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
 	unsigned int pmc, unit, byte, psel;
 	unsigned int ttm, grp;
 	int i, isbus, bit, grsel;
arch/powerpc/kernel/power6-pmu.c +1 -1
Index: linux.trees.git/arch/powerpc/kernel/power6-pmu.c
===================================================================
@@ -178,7 +178,7 @@ static int p6_compute_mmcr(u64 event[], 
 			   unsigned int hwc[], unsigned long mmcr[])
 {
 	unsigned long mmcr1 = 0;
-	unsigned long mmcra = 0;
+	unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
 	int i;
 	unsigned int pmc, ev, b, u, s, psel;
 	unsigned int ttmset = 0;
arch/powerpc/include/asm/reg.h +2 -0
Index: linux.trees.git/arch/powerpc/include/asm/reg.h
===================================================================
@@ -489,6 +489,8 @@
 #define SPRN_MMCR1	798
 #define SPRN_MMCRA	0x312
 #define   MMCRA_SDSYNC	0x80000000UL /* SDAR synced with SIAR */
+#define   MMCRA_SDAR_DCACHE_MISS 0x40000000UL
+#define   MMCRA_SDAR_ERAT_MISS   0x20000000UL
 #define   MMCRA_SIHV	0x10000000UL /* state of MSR HV when SIAR set */
 #define   MMCRA_SIPR	0x08000000UL /* state of MSR PR when SIAR set */
 #define   MMCRA_SLOT	0x07000000UL /* SLOT bits (37-39) */
arch/powerpc/kernel/power5+-pmu.c +0 -4
Index: linux.trees.git/arch/powerpc/kernel/power5+-pmu.c
===================================================================
@@ -73,10 +73,6 @@
 #define MMCR1_PMCSEL_MSK	0x7f
 
 /*
- * Bits in MMCRA
- */
-
-/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210
arch/powerpc/kernel/ppc970-pmu.c +0 -4
Index: linux.trees.git/arch/powerpc/kernel/ppc970-pmu.c
===================================================================
@@ -84,10 +84,6 @@ static short mmcr1_adder_bits[8] = {
 };
 
 /*
- * Bits in MMCRA
- */
-
-/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210