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/etm.c b/arch/arm/mach-msm/etm.c
index bee0975..9d04a58 100644
--- a/arch/arm/mach-msm/etm.c
+++ b/arch/arm/mach-msm/etm.c
@@ -377,9 +377,9 @@
etm_write(etm_config.etm_addr_access_type[6], ETMACTR6);
etm_write(etm_config.etm_addr_access_type[7], ETMACTR7);
etm_write(etm_config.etm_data_comp_value[0], ETMDCVR0);
- etm_write(etm_config.etm_data_comp_value[1], ETMDCVR1);
+ etm_write(etm_config.etm_data_comp_value[1], ETMDCVR2);
etm_write(etm_config.etm_data_comp_mask[0], ETMDCMR0);
- etm_write(etm_config.etm_data_comp_mask[1], ETMDCMR1);
+ etm_write(etm_config.etm_data_comp_mask[1], ETMDCMR2);
etm_write(etm_config.etm_counter_reload_value[0], ETMCNTRLDVR0);
etm_write(etm_config.etm_counter_reload_value[1], ETMCNTRLDVR1);
etm_write(etm_config.etm_counter_enable[0], ETMCNTENR0);
@@ -564,9 +564,9 @@
emit_log_word(etm_read(ETMACTR6));
emit_log_word(etm_read(ETMACTR7));
emit_log_word(etm_read(ETMDCVR0));
- emit_log_word(etm_read(ETMDCVR1));
+ emit_log_word(etm_read(ETMDCVR2));
emit_log_word(etm_read(ETMDCMR0));
- emit_log_word(etm_read(ETMDCMR1));
+ emit_log_word(etm_read(ETMDCMR2));
emit_log_word(etm_read(ETMCNTRLDVR0));
emit_log_word(etm_read(ETMCNTRLDVR1));
emit_log_word(etm_read(ETMCNTENR0));