Commit 639a2b25 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Linus Torvalds

[PATCH] monotonic seqlock for cyclone timer

Replace read/write lock used for cyclone timer monotonic_lock with seqlock.
Similar to locking used on xtime and monotonic_lock in timers/timer_tsc.c
parent 70f6d49e
...@@ -35,7 +35,7 @@ static u32* volatile cyclone_timer; /* Cyclone MPMC0 register */ ...@@ -35,7 +35,7 @@ static u32* volatile cyclone_timer; /* Cyclone MPMC0 register */
static u32 last_cyclone_low; static u32 last_cyclone_low;
static u32 last_cyclone_high; static u32 last_cyclone_high;
static unsigned long long monotonic_base; static unsigned long long monotonic_base;
static rwlock_t monotonic_lock = RW_LOCK_UNLOCKED; static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED;
/* helper macro to atomically read both cyclone counter registers */ /* helper macro to atomically read both cyclone counter registers */
#define read_cyclone_counter(low,high) \ #define read_cyclone_counter(low,high) \
...@@ -51,7 +51,7 @@ static void mark_offset_cyclone(void) ...@@ -51,7 +51,7 @@ static void mark_offset_cyclone(void)
int count; int count;
unsigned long long this_offset, last_offset; unsigned long long this_offset, last_offset;
write_lock(&monotonic_lock); write_seqlock(&monotonic_lock);
last_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low; last_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low;
spin_lock(&i8253_lock); spin_lock(&i8253_lock);
...@@ -76,7 +76,7 @@ static void mark_offset_cyclone(void) ...@@ -76,7 +76,7 @@ static void mark_offset_cyclone(void)
/* update the monotonic base value */ /* update the monotonic base value */
this_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low; this_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low;
monotonic_base += (this_offset - last_offset) & CYCLONE_TIMER_MASK; monotonic_base += (this_offset - last_offset) & CYCLONE_TIMER_MASK;
write_unlock(&monotonic_lock); write_sequnlock(&monotonic_lock);
/* calculate delay_at_last_interrupt */ /* calculate delay_at_last_interrupt */
count = ((LATCH-1) - count) * TICK_SIZE; count = ((LATCH-1) - count) * TICK_SIZE;
...@@ -117,12 +117,15 @@ static unsigned long long monotonic_clock_cyclone(void) ...@@ -117,12 +117,15 @@ static unsigned long long monotonic_clock_cyclone(void)
u32 now_low, now_high; u32 now_low, now_high;
unsigned long long last_offset, this_offset, base; unsigned long long last_offset, this_offset, base;
unsigned long long ret; unsigned long long ret;
unsigned seq;
/* atomically read monotonic base & last_offset */ /* atomically read monotonic base & last_offset */
read_lock_irq(&monotonic_lock); do {
last_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low; seq = read_seqbegin(&monotonic_lock);
base = monotonic_base; last_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low;
read_unlock_irq(&monotonic_lock); base = monotonic_base;
} while (read_seqretry(&monotonic_lock, seq));
/* Read the cyclone counter */ /* Read the cyclone counter */
read_cyclone_counter(now_low,now_high); read_cyclone_counter(now_low,now_high);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment