Skip to contentSkip to conversation

target-xtensa: avoid duplicate timer interrupt delivery

PATCH New Max Filippov 1 participant 1 message Sep 26, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target-xtensa: avoid duplicate timer interrupt delivery

Timer interrupt should be raised at the same cycle when CCOUNT equals CCOMPARE. As cycles are counted in batches, timer interrupt is sent every time CCOMPARE lies in the interval [old CCOUNT, new CCOUNT]. This is wrong, because when new CCOUNT equals CCOMPARE interrupt is sent twice, once for the upper interval boundary and once for the lower. Fix that by excluding lower interval boundary from the condition.

This doesn't have user-visible effect, because CCOMPARE reload always causes CCOUNT increment followed by current timer interrupt reset.

---
 hw/xtensa/pic_cpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/xtensa/pic_cpu.c +2 -2
index e2005bd..18825d1 100644
@@ -31,14 +31,14 @@
 
 void xtensa_advance_ccount(CPUXtensaState *env, uint32_t d)
 {
-    uint32_t old_ccount = env->sregs[CCOUNT];
+    uint32_t old_ccount = env->sregs[CCOUNT] + 1;
 
     env->sregs[CCOUNT] += d;
 
     if (xtensa_option_enabled(env->config, XTENSA_OPTION_TIMER_INTERRUPT)) {
         int i;
         for (i = 0; i < env->config->nccompare; ++i) {
-            if (env->sregs[CCOMPARE + i] - old_ccount <= d) {
+            if (env->sregs[CCOMPARE + i] - old_ccount < d) {
                 xtensa_timer_irq(env, i, 1);
             }
         }
Signature · 1 line
1.8.1.4