retronetworking
/
mISDN
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

James Harper identified that locks were being taken twice along the same code path, causing a hang (on SMP). These have been removed.

This commit is contained in:
Daniel Potts 2006-10-02 12:51:33 +00:00
parent 7de26421e1
commit 36ade5e5f5
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/isdn/hardware/mISDN/netjet.c
View File

@ -1350,13 +1350,16 @@ read_raw(channel_t *bch, u_int *buf, int cnt)
tiger->r_bitcnt = bitcnt;
}
/* read_tiger()
* Read tiger state and process it
* - assumes lock held
*/
static void
read_tiger (netjet_t *card, uint8_t irq_stat)
{
u_int *p;
int cnt = NETJET_DMA_RXSIZE/2;
channel_t *bch;
u_long flags;
if ((irq_stat & card->last_is0) & NETJET_IRQM0_READ_MASK) {
printk ("netjet: tiger warn read double dma %x/%x",
@ -1375,27 +1378,27 @@ read_tiger (netjet_t *card, uint8_t irq_stat)
/* Note: Unhandled 56K */
bch = &card->bch[0];
spin_lock_irqsave(bch->inst.hwlock, flags);
if (test_bit(FLG_HDLC, &bch->Flags)) {
read_raw(bch, p, cnt);
}
if (test_bit(FLG_TRANSPARENT, &bch->Flags)) {
read_raw_transparent(bch, p, cnt);
}
spin_unlock_irqrestore(bch->inst.hwlock, flags);
bch = &card->bch[1];
spin_lock_irqsave(bch->inst.hwlock, flags);
if (test_bit(FLG_HDLC, &bch->Flags)) {
read_raw(bch, p, cnt);
}
if (test_bit(FLG_TRANSPARENT, &bch->Flags)) {
read_raw_transparent(bch, p, cnt);
}
spin_unlock_irqrestore(bch->inst.hwlock, flags);
}
/* write_tiger()
* Update tiger state
* - assumes lock held
*/
void
write_tiger (netjet_t *card, uint8_t irq_stat)
{
@ -1422,14 +1425,10 @@ write_tiger (netjet_t *card, uint8_t irq_stat)
static void
write_tiger_bch(channel_t *bch, u_int *buf, int cnt) {
u_long flags;
mISDN_head_t *hh;
spin_lock_irqsave(bch->inst.hwlock, flags);
if (!test_bit(FLG_TRANSPARENT, &bch->Flags)
&& !test_bit(FLG_HDLC, &bch->Flags)) {
spin_unlock_irqrestore(bch->inst.hwlock, flags);
if (test_bit(FLG_TX_BUSY, &bch->Flags))
printk(KERN_WARNING "%s: (busy)\n", __FUNCTION__);
if (test_bit(FLG_TX_NEXT, &bch->Flags))
@ -1454,7 +1453,6 @@ write_tiger_bch(channel_t *bch, u_int *buf, int cnt) {
test_and_set_bit(FLG_TX_BUSY, &bch->Flags);
}
}
spin_unlock_irqrestore(bch->inst.hwlock, flags);
}
static irqreturn_t