summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-07-05 17:18:12 -0700
committerIan Romanick <idr@us.ibm.com>2007-07-05 17:18:12 -0700
commit2695e8e209228dfc2e6a9b10bc118d0794602b37 (patch)
tree07ff9e286747e471499a741361cfd89714f33c2a /linux-core
parentfc37781dd30b53815dd71ce576eb2147d23f0914 (diff)
Convert weird rtdsc usage to get_cycles.
I'm not convinced that get_cycles is the right approach here, but it's better than the weird way that rtdsc was being used.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/xgi_misc.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/linux-core/xgi_misc.c b/linux-core/xgi_misc.c
index 9bf8205b..a0ed18c2 100644
--- a/linux-core/xgi_misc.c
+++ b/linux-core/xgi_misc.c
@@ -127,12 +127,10 @@ bool xgi_ge_irq_handler(struct xgi_info * info)
// We got GE stall interrupt.
ge_3d_status[0x04] = int_status | 0x04000000;
- if (TRUE == is_support_auto_reset) {
+ if (is_support_auto_reset) {
bool is_wrong_signal = FALSE;
- static U32 last_int_tick_low,
- last_int_tick_high;
- static U32 new_int_tick_low;
- static U32 continoue_int_count = 0;
+ static cycles_t last_tick;
+ static unsigned continue_int_count = 0;
// OE II is busy.
while (old_ge_status & 0x001c0000) {
u16 check;
@@ -190,19 +188,17 @@ bool xgi_ge_irq_handler(struct xgi_info * info)
if (is_wrong_signal) {
// Nothing but skip.
- } else if (0 == continoue_int_count++) {
- rdtsc(last_int_tick_low,
- last_int_tick_high);
+ } else if (0 == continue_int_count++) {
+ last_tick = get_cycles();
} else {
- rdtscl(new_int_tick_low);
- if ((new_int_tick_low -
- last_int_tick_low) >
+ const cycles_t new_tick = get_cycles();
+ if ((new_tick - last_tick) >
STALL_INTERRUPT_RESET_THRESHOLD) {
- continoue_int_count = 0;
- } else if (continoue_int_count >= 3) {
+ continue_int_count = 0;
+ } else if (continue_int_count >= 3) {
int time_out;
- continoue_int_count = 0;
+ continue_int_count = 0;
// GE Hung up, need reset.
XGI_INFO("Reset GE!\n");