* [PATCH] From: Paul Walmsley <paul@booyaka.com>
[not found] <20070509164715.430844867@booyaka.com>
@ 2007-05-09 16:47 ` Paul Walmsley
2007-05-09 23:25 ` [PATCH] Fix hang on IBM Token Ring PCMCIA card ejection Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Paul Walmsley @ 2007-05-09 16:47 UTC (permalink / raw)
To: jeff; +Cc: mikep, netdev, linux-tr
[-- Attachment #1: ibmtr_cs_fix_detach.patch --]
[-- Type: text/plain, Size: 1528 bytes --]
Ejecting a PCMCIA IBM Token Ring card that has not had its dev->open()
called will reliably trigger an uninitialized spinlock oops when
spinlock debugging is enabled. The system then hangs, occasionally
softlockup oopsing. Apparently ibmtr.c:tok_interrupt() doesn't expect
to be called before tok_open(), but tok_interrupt() gets called anyway
when the card is ejected. So, set an already-existing flag which
causes tok_interrupt() to bail out early upon card ejection. Tested by
inserting and removing the PCMCIA card several times.
Patch against 2.6.21-rc6.
Signed-off-by: Paul Walmsley <paul@booyaka.com>
---
ibmtr_cs.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 1060154..9359ca7 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -189,16 +189,20 @@ static void ibmtr_detach(struct pcmcia_device *link)
{
struct ibmtr_dev_t *info = link->priv;
struct net_device *dev = info->dev;
+ struct tok_info *ti = netdev_priv(dev);
DEBUG(0, "ibmtr_detach(0x%p)\n", link);
+
+ /*
+ * When the card removal interrupt hits tok_interrupt(),
+ * bail out early, so we don't crash the machine
+ */
+ ti->sram_phys |= 1;
if (link->dev_node)
unregister_netdev(dev);
-
- {
- struct tok_info *ti = netdev_priv(dev);
- del_timer_sync(&(ti->tr_timer));
- }
+
+ del_timer_sync(&(ti->tr_timer));
ibmtr_release(link);
--
^ permalink raw reply related [flat|nested] 2+ messages in thread