Commit ec622ab0 authored by Jiri Slaby's avatar Jiri Slaby Committed by David S. Miller

ATM: iphase, remove sleep-inside-atomic

Stanse found that ia_init_one locks a spinlock and inside of that it
calls ia_start which calls:
* request_irq
* tx_init which does kmalloc(GFP_KERNEL)

Both of them can thus sleep and result in a deadlock. I don't see a
reason to have a per-device spinlock there which is used only there
and inited right before the lock location. So remove it completely.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5518b29f
...@@ -3156,7 +3156,6 @@ static int __devinit ia_init_one(struct pci_dev *pdev, ...@@ -3156,7 +3156,6 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
{ {
struct atm_dev *dev; struct atm_dev *dev;
IADEV *iadev; IADEV *iadev;
unsigned long flags;
int ret; int ret;
iadev = kzalloc(sizeof(*iadev), GFP_KERNEL); iadev = kzalloc(sizeof(*iadev), GFP_KERNEL);
...@@ -3188,19 +3187,14 @@ static int __devinit ia_init_one(struct pci_dev *pdev, ...@@ -3188,19 +3187,14 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
ia_dev[iadev_count] = iadev; ia_dev[iadev_count] = iadev;
_ia_dev[iadev_count] = dev; _ia_dev[iadev_count] = dev;
iadev_count++; iadev_count++;
spin_lock_init(&iadev->misc_lock);
/* First fixes first. I don't want to think about this now. */
spin_lock_irqsave(&iadev->misc_lock, flags);
if (ia_init(dev) || ia_start(dev)) { if (ia_init(dev) || ia_start(dev)) {
IF_INIT(printk("IA register failed!\n");) IF_INIT(printk("IA register failed!\n");)
iadev_count--; iadev_count--;
ia_dev[iadev_count] = NULL; ia_dev[iadev_count] = NULL;
_ia_dev[iadev_count] = NULL; _ia_dev[iadev_count] = NULL;
spin_unlock_irqrestore(&iadev->misc_lock, flags);
ret = -EINVAL; ret = -EINVAL;
goto err_out_deregister_dev; goto err_out_deregister_dev;
} }
spin_unlock_irqrestore(&iadev->misc_lock, flags);
IF_EVENT(printk("iadev_count = %d\n", iadev_count);) IF_EVENT(printk("iadev_count = %d\n", iadev_count);)
iadev->next_board = ia_boards; iadev->next_board = ia_boards;
......
...@@ -1022,7 +1022,7 @@ typedef struct iadev_t { ...@@ -1022,7 +1022,7 @@ typedef struct iadev_t {
struct dle_q rx_dle_q; struct dle_q rx_dle_q;
struct free_desc_q *rx_free_desc_qhead; struct free_desc_q *rx_free_desc_qhead;
struct sk_buff_head rx_dma_q; struct sk_buff_head rx_dma_q;
spinlock_t rx_lock, misc_lock; spinlock_t rx_lock;
struct atm_vcc **rx_open; /* list of all open VCs */ struct atm_vcc **rx_open; /* list of all open VCs */
u16 num_rx_desc, rx_buf_sz, rxing; u16 num_rx_desc, rx_buf_sz, rxing;
u32 rx_pkt_ram, rx_tmp_cnt; u32 rx_pkt_ram, rx_tmp_cnt;
......
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