Messages in this thread Patch in this message | | | Date | Mon, 14 Jul 2003 13:22:22 +0100 | From | Alan Cox <> | Subject | PATCH: fix yenta hang on some laptops |
| |
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/pcmcia/ti113x.h linux.22-pre5-ac1/drivers/pcmcia/ti113x.h --- linux.22-pre5/drivers/pcmcia/ti113x.h 2003-07-14 12:27:38.000000000 +0100 +++ linux.22-pre5-ac1/drivers/pcmcia/ti113x.h 2003-07-08 23:31:27.000000000 +0100 @@ -171,21 +171,26 @@ /* * If ISA interrupts don't work, then fall back to routing card * interrupts to the PCI interrupt of the socket. + * + * Tweaking this when we are using serial PCI IRQs causes hangs + * --rmk */ if (!socket->cap.irq_mask) { - int irqmux, devctl; - - printk (KERN_INFO "ti113x: Routing card interrupts to PCI\n"); + u8 irqmux, devctl; devctl = config_readb(socket, TI113X_DEVICE_CONTROL); - devctl &= ~TI113X_DCR_IMODE_MASK; + if (devctl & TI113X_DCR_IMODE_MASK != TI12XX_DCR_IMODE_ALL_SERIAL) { + printk (KERN_INFO "ti113x: Routing card interrupts to PCI\n"); + + devctl &= ~TI113X_DCR_IMODE_MASK; - irqmux = config_readl(socket, TI122X_IRQMUX); - irqmux = (irqmux & ~0x0f) | 0x02; /* route INTA */ - irqmux = (irqmux & ~0xf0) | 0x20; /* route INTB */ + irqmux = config_readl(socket, TI122X_IRQMUX); + irqmux = (irqmux & ~0x0f) | 0x02; /* route INTA */ + irqmux = (irqmux & ~0xf0) | 0x20; /* route INTB */ - config_writel(socket, TI122X_IRQMUX, irqmux); - config_writeb(socket, TI113X_DEVICE_CONTROL, devctl); + config_writel(socket, TI122X_IRQMUX, irqmux); + config_writeb(socket, TI113X_DEVICE_CONTROL, devctl); + } } return 0; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |