Changeset b473611 in mainline for kernel/arch/sparc64/src/drivers/tick.c

Timestamp:

2010-02-13T23:56:33Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3a3a619

Parents:

e70edd1 (diff), b86d436 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge the sparc branch.
Both sun4u and sun4v appear to work.
HM cleanup is pending.

File:

• kernel/arch/sparc64/src/drivers/tick.c (modified) (2 diffs)

kernel/arch/sparc64/src/drivers/tick.c

@@ -54 +54 @@
         interrupt_register(14, "tick_int", tick_interrupt);
         compare.int_dis = false;
-        compare.tick_cmpr = CPU->arch.clock_frequency / HZ;
+        compare.tick_cmpr = tick_counter_read() +
+                CPU->arch.clock_frequency / HZ;
         CPU->arch.next_tick_cmpr = compare.tick_cmpr;
         tick_compare_write(compare.value);
-        tick_write(0);
 
-#if defined (US3)
+#if defined (US3) || defined (SUN4V)
         /* disable STICK interrupts and clear any pending ones */
         tick_compare_reg_t stick_compare;
@@ -111 +111 @@
          * overflow only in 146 years.
          */
-        drift = tick_read() - CPU->arch.next_tick_cmpr;
+        drift = tick_counter_read() - CPU->arch.next_tick_cmpr;
         while (drift > CPU->arch.clock_frequency / HZ) {
                 drift -= CPU->arch.clock_frequency / HZ;
                 CPU->missed_clock_ticks++;
         }
-        CPU->arch.next_tick_cmpr = tick_read() +
+        CPU->arch.next_tick_cmpr = tick_counter_read() +
             (CPU->arch.clock_frequency / HZ) - drift;
         tick_compare_write(CPU->arch.next_tick_cmpr);