1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
--- driver.c.orig 2004-05-14 02:00:00.000000000 +0200
+++ driver.c 2005-01-21 15:40:33.000000000 +0100
@@ -18,6 +18,10 @@
* http://www.opensource.org/licenses/lgpl-license.html
*
* Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ *
+ * Mon Oct 20 22:43:31 2003
+ * Modified by Joerg Lehrke to improve locking
+ * Fixed for rev 0.4.1 by Stefan Schweizer
*/
#include <asm/io.h>
@@ -57,6 +61,8 @@
#include "dbgif.h"
#endif
+#undef SINGLE_LOCK
+
#define KILOBYTE 1024
#define MEGABYTE (1024*KILOBYTE)
#define DMA_BUFFER_SIZE (9*KILOBYTE)
@@ -101,7 +107,11 @@
static struct capi_ctr capi_ctrl[2];
static int capi_ctrl_ix = 0;
static per_ctrl_t ctrl_params[2];
+#if defined (SINGLE_LOCK)
+# define stack_lock qt_lock
+#else
static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
+#endif
static atomic_t rx_flag = ATOMIC_INIT (0);
static atomic_t tx_flag = ATOMIC_INIT (0);
static atomic_t thread_flag = ATOMIC_INIT (0);
@@ -1142,7 +1152,7 @@
} /* remove_ctrl */
/*---------------------------------------------------------------------------*\
-\*-C-------------------------------------------------------------------------*/
+\*---------------------------------------------------------------------------*/
static inline int in_critical (void) {
return (0 < atomic_read (&crit_count));
@@ -1301,7 +1311,7 @@
capi_ctr_handle_message (ctrl, appl, skb);
} /* msg2capi */
-/*-S-------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
static __attr void __stack scheduler_control (unsigned ena) {
int enabled = (int) ena;
@@ -1323,6 +1333,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
static int sched_thread (void * arg) {
+ unsigned long flags;
UNUSED_ARG (arg);
daemonize (TARGET);
@@ -1356,6 +1367,7 @@
}
/* Body of thread, invoke scheduler */
+ local_irq_save(flags);
if (spin_trylock (&stack_lock)) {
os_timer_poll ();
assert (capi_lib->cm_schedule);
@@ -1364,6 +1376,7 @@
}
spin_unlock (&stack_lock);
}
+ local_irq_restore(flags);
}
LOG("Scheduler thread stopped.\n");
up (&hotplug);
@@ -1470,17 +1483,22 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
static void tx_task (unsigned long data) {
-
+ unsigned long flags;
+
UNUSED_ARG (data);
if (in_critical ()) {
atomic_set (&tx_flag, 1);
kick_scheduler ();
- } else if (spin_trylock (&stack_lock)) {
- tx_handler (capi_card);
- spin_unlock (&stack_lock);
} else {
- atomic_set (&tx_flag, 1);
- kick_scheduler ();
+ local_irq_save(flags);
+ if (spin_trylock (&stack_lock)) {
+ tx_handler (capi_card);
+ spin_unlock (&stack_lock);
+ } else {
+ atomic_set (&tx_flag, 1);
+ kick_scheduler ();
+ }
+ local_irq_restore(flags);
}
} /* tx_task */
@@ -1533,17 +1551,22 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
static void rx_task (unsigned long data) {
+ unsigned long flags;
UNUSED_ARG (data);
if (in_critical ()) {
atomic_set (&rx_flag, 1);
kick_scheduler ();
- } else if (spin_trylock (&stack_lock)) {
- rx_handler (capi_card);
- spin_unlock (&stack_lock);
} else {
- atomic_set (&rx_flag, 1);
- kick_scheduler ();
+ local_irq_save(flags);
+ if (spin_trylock (&stack_lock)) {
+ rx_handler (capi_card);
+ spin_unlock (&stack_lock);
+ } else {
+ atomic_set (&rx_flag, 1);
+ kick_scheduler ();
+ }
+ local_irq_restore(flags);
}
} /* rx_task */
@@ -1562,6 +1585,7 @@
return IRQ_NONE;
}
cp = (card_p) args;
+ spin_lock (&stack_lock);
while (0 != ((flags = PEEK (cp->io_base + INT_CTL)) & CARD_PCI_INT_ASSERT)) {
++count;
assert (count < 3);
@@ -1572,6 +1596,7 @@
assert ((PEEK (cp->io_base + INT_CTL)
& ~(CARD_PCI_INT_ASSERT | CARD_PCI_INT_ISASSERTED)) != 0);
if (!atomic_read (&link_open)) {
+ spin_unlock (&stack_lock);
return IRQ_HANDLED;
}
tx_flag = PEEK (cp->io_base + XFER_TOTM_STATUS) == TM_READY;
@@ -1586,6 +1611,7 @@
}
}
info (0 == (PEEK (cp->io_base + INT_CTL) & CARD_PCI_INT_ASSERT));
+ spin_unlock (&stack_lock);
return IRQ_RETVAL(count > 0);
} /* irq_handler */
|
GitWeb