msm: jtag: only provide even numbered data comparator value/mask regs
ETMv1.0-v3.5 spec indicates that implementations should provide only
even numbered data comparator value and data comparator mask registers.
Change the cp14 defines to just expose even numbered data comparator
value and mask regs accordingly.
Fix typo in VMIDCVR and ETMSQabEVR addresses. Virtualization extensions
are not implemented by Krait based on ETMCCER[26] and so VMIDCVR is
RAZ/WI.
Change-Id: I92d0397a19291fa0c5f66948dc764350fd0cf3f2
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
diff --git a/arch/arm/mach-msm/cp14.h b/arch/arm/mach-msm/cp14.h
index 9f7241e..d640412 100644
--- a/arch/arm/mach-msm/cp14.h
+++ b/arch/arm/mach-msm/cp14.h
@@ -325,21 +325,21 @@
#define RCP14_ETMACTR14() MRC14(1, c0, c14, 2)
#define RCP14_ETMACTR15() MRC14(1, c0, c15, 2)
#define RCP14_ETMDCVR0() MRC14(1, c0, c0, 3)
-#define RCP14_ETMDCVR1() MRC14(1, c0, c1, 3)
#define RCP14_ETMDCVR2() MRC14(1, c0, c2, 3)
-#define RCP14_ETMDCVR3() MRC14(1, c0, c3, 3)
#define RCP14_ETMDCVR4() MRC14(1, c0, c4, 3)
-#define RCP14_ETMDCVR5() MRC14(1, c0, c5, 3)
#define RCP14_ETMDCVR6() MRC14(1, c0, c6, 3)
-#define RCP14_ETMDCVR7() MRC14(1, c0, c7, 3)
+#define RCP14_ETMDCVR8() MRC14(1, c0, c8, 3)
+#define RCP14_ETMDCVR10() MRC14(1, c0, c10, 3)
+#define RCP14_ETMDCVR12() MRC14(1, c0, c12, 3)
+#define RCP14_ETMDCVR14() MRC14(1, c0, c14, 3)
#define RCP14_ETMDCMR0() MRC14(1, c0, c0, 4)
-#define RCP14_ETMDCMR1() MRC14(1, c0, c1, 4)
#define RCP14_ETMDCMR2() MRC14(1, c0, c2, 4)
-#define RCP14_ETMDCMR3() MRC14(1, c0, c3, 4)
#define RCP14_ETMDCMR4() MRC14(1, c0, c4, 4)
-#define RCP14_ETMDCMR5() MRC14(1, c0, c5, 4)
#define RCP14_ETMDCMR6() MRC14(1, c0, c6, 4)
-#define RCP14_ETMDCMR7() MRC14(1, c0, c7, 4)
+#define RCP14_ETMDCMR8() MRC14(1, c0, c8, 4)
+#define RCP14_ETMDCMR10() MRC14(1, c0, c10, 4)
+#define RCP14_ETMDCMR12() MRC14(1, c0, c12, 4)
+#define RCP14_ETMDCMR14() MRC14(1, c0, c14, 4)
#define RCP14_ETMCNTRLDVR0() MRC14(1, c0, c0, 5)
#define RCP14_ETMCNTRLDVR1() MRC14(1, c0, c1, 5)
#define RCP14_ETMCNTRLDVR2() MRC14(1, c0, c2, 5)
@@ -389,7 +389,7 @@
#define RCP14_ETMAUXCR() MRC14(1, c0, c15, 7)
#define RCP14_ETMTRACEIDR() MRC14(1, c1, c0, 0)
#define RCP14_ETMIDR2() MRC14(1, c1, c2, 0)
-#define RCP14_ETMVMIDCVR() MRC14(1, c1, c1, 0)
+#define RCP14_ETMVMIDCVR() MRC14(1, c1, c0, 1)
#define RCP14_ETMOSLSR() MRC14(1, c1, c1, 4)
/* not available in PFTv1.1 */
#define RCP14_ETMOSSRR() MRC14(1, c1, c2, 4)
@@ -462,21 +462,21 @@
#define WCP14_ETMACTR14(val) MCR14(val, 1, c0, c14, 2)
#define WCP14_ETMACTR15(val) MCR14(val, 1, c0, c15, 2)
#define WCP14_ETMDCVR0(val) MCR14(val, 1, c0, c0, 3)
-#define WCP14_ETMDCVR1(val) MCR14(val, 1, c0, c1, 3)
#define WCP14_ETMDCVR2(val) MCR14(val, 1, c0, c2, 3)
-#define WCP14_ETMDCVR3(val) MCR14(val, 1, c0, c3, 3)
#define WCP14_ETMDCVR4(val) MCR14(val, 1, c0, c4, 3)
-#define WCP14_ETMDCVR5(val) MCR14(val, 1, c0, c5, 3)
#define WCP14_ETMDCVR6(val) MCR14(val, 1, c0, c6, 3)
-#define WCP14_ETMDCVR7(val) MCR14(val, 1, c0, c7, 3)
+#define WCP14_ETMDCVR8(val) MCR14(val, 1, c0, c8, 3)
+#define WCP14_ETMDCVR10(val) MCR14(val, 1, c0, c10, 3)
+#define WCP14_ETMDCVR12(val) MCR14(val, 1, c0, c12, 3)
+#define WCP14_ETMDCVR14(val) MCR14(val, 1, c0, c14, 3)
#define WCP14_ETMDCMR0(val) MCR14(val, 1, c0, c0, 4)
-#define WCP14_ETMDCMR1(val) MCR14(val, 1, c0, c1, 4)
#define WCP14_ETMDCMR2(val) MCR14(val, 1, c0, c2, 4)
-#define WCP14_ETMDCMR3(val) MCR14(val, 1, c0, c3, 4)
#define WCP14_ETMDCMR4(val) MCR14(val, 1, c0, c4, 4)
-#define WCP14_ETMDCMR5(val) MCR14(val, 1, c0, c5, 4)
#define WCP14_ETMDCMR6(val) MCR14(val, 1, c0, c6, 4)
-#define WCP14_ETMDCMR7(val) MCR14(val, 1, c0, c7, 4)
+#define WCP14_ETMDCMR8(val) MCR14(val, 1, c0, c8, 4)
+#define WCP14_ETMDCMR10(val) MCR14(val, 1, c0, c10, 4)
+#define WCP14_ETMDCMR12(val) MCR14(val, 1, c0, c12, 4)
+#define WCP14_ETMDCMR14(val) MCR14(val, 1, c0, c14, 4)
#define WCP14_ETMCNTRLDVR0(val) MCR14(val, 1, c0, c0, 5)
#define WCP14_ETMCNTRLDVR1(val) MCR14(val, 1, c0, c1, 5)
#define WCP14_ETMCNTRLDVR2(val) MCR14(val, 1, c0, c2, 5)
@@ -525,7 +525,7 @@
#define WCP14_ETMAUXCR(val) MCR14(val, 1, c0, c15, 7)
#define WCP14_ETMTRACEIDR(val) MCR14(val, 1, c1, c0, 0)
#define WCP14_ETMIDR2(val) MCR14(val, 1, c1, c2, 0)
-#define WCP14_ETMVMIDCVR(val) MCR14(val, 1, c1, c1, 0)
+#define WCP14_ETMVMIDCVR(val) MCR14(val, 1, c1, c0, 1)
#define WCP14_ETMOSLAR(val) MCR14(val, 1, c1, c0, 4)
/* not available in PFTv1.1 */
#define WCP14_ETMOSSRR(val) MCR14(val, 1, c1, c2, 4)