Hi Linus,
Here is a patch from Gunther Mayer to protect against false positives in
the ISA superio code.
Tim.
*/
Index: linux/drivers/parport/ChangeLog
diff -u linux/drivers/parport/ChangeLog:1.1.1.4 linux/drivers/parport/ChangeLog:1.8
--- linux/drivers/parport/ChangeLog:1.1.1.4 Fri Mar 17 09:29:15 2000
+++ linux/drivers/parport/ChangeLog Thu Mar 16 23:18:55 2000
@@ -1,3 +1,17 @@
+2000-03-16 Tim Waugh <twaugh@redhat.com>
+
+ * parport_pc.c (parport_ECP_supported): This seems to trigger on
+ machines that don't have an IRQ conflict; toned down the warning
+ message accordingly.
+
+2000-03-16 Gunther Mayer <gunther.mayer@braunschweig.netsurf.de>
+
+ * parport_pc.c (show_parconfig_smsc37c669): Fix typo.
+ (decode_winbond): More IDs.
+ (winbond_check): Protect against false positives.
+ (winbond_check2): Likewise.
+ (smsc_check): Likewise.
+
2000-03-15 Tim Waugh <twaugh@redhat.com>
* parport_pc.c (cleanup_module): Don't call pci_unregister_driver
Index: linux/drivers/parport/parport_pc.c
diff -u linux/drivers/parport/parport_pc.c:1.1.1.25 linux/drivers/parport/parport_pc.c:1.44
--- linux/drivers/parport/parport_pc.c:1.1.1.25 Thu Mar 16 12:17:44 2000
+++ linux/drivers/parport/parport_pc.c Thu Mar 16 17:34:50 2000
@@ -1060,7 +1060,7 @@
(cr23*4 >=0x100) ?"yes":"no", (cr1 & 4) ? "yes" : "no");
printk("SMSC LPT Config: Port mode=%s, EPP version =%s\n",
(cr1 & 0x08 ) ? "Standard mode only (SPP)" : modes[cr4 & 0x03],
- (cr4 & 40) ? "1.7" : "1.9");
+ (cr4 & 0x40) ? "1.7" : "1.9");
/* Heuristics ! BIOS setup for this mainboard device limits
the choices to standard settings, i.e. io-address and IRQ
@@ -1172,12 +1172,15 @@
/* Values are from public data sheets pdf files, I can just
confirm 83977TF is correct :-) */
- if (id == 0x9773) type="83977TF";
+ if (id == 0x9771) type="83977F/AF";
+ else if (id == 0x9773) type="83977TF / SMSC 97w33x/97w34x";
else if (id == 0x9774) type="83977ATF";
else if ((id & ~0x0f) == 0x5270) type="83977CTF / SMSC 97w36x";
- else if ((id & ~0x0f) == 0x52f0) type="83977EF / SMSC 97x35x";
+ else if ((id & ~0x0f) == 0x52f0) type="83977EF / SMSC 97w35x";
else if ((id & ~0x0f) == 0x5210) type="83627";
else if ((id & ~0x0f) == 0x6010) type="83697HF";
+ else if ((oldid &0x0f ) == 0x0a) { type="83877F"; progif=1;}
+ else if ((oldid &0x0f ) == 0x0b) { type="83877AF"; progif=1;}
else if ((oldid &0x0f ) == 0x0c) { type="83877TF"; progif=1;}
else if ((oldid &0x0f ) == 0x0d) { type="83877ATF"; progif=1;}
else progif=0;
@@ -1225,8 +1228,16 @@
static void __devinit winbond_check(int io, int key)
{
- int devid,devrev,oldid;
+ int devid,devrev,oldid,x_devid,x_devrev,x_oldid;
+ /* First probe without key */
+ outb(0x20,io);
+ x_devid=inb(io+1);
+ outb(0x21,io);
+ x_devrev=inb(io+1);
+ outb(0x09,io);
+ x_oldid=inb(io+1);
+
outb(key,io);
outb(key,io); /* Write Magic Sequence to EFER, extended
funtion enable register */
@@ -1238,12 +1249,23 @@
oldid=inb(io+1);
outb(0xaa,io); /* Magic Seal */
+ if ((x_devid == devid) && (x_devrev == devrev) && (x_oldid == oldid))
+ return; /* protection against false positives */
+
decode_winbond(io,key,devid,devrev,oldid);
}
static void __devinit winbond_check2(int io,int key)
{
- int devid,devrev,oldid;
+ int devid,devrev,oldid,x_devid,x_devrev,x_oldid;
+
+ /* First probe without the key */
+ outb(0x20,io+2);
+ x_devid=inb(io+2);
+ outb(0x21,io+1);
+ x_devrev=inb(io+2);
+ outb(0x09,io+1);
+ x_oldid=inb(io+2);
outb(key,io); /* Write Magic Byte to EFER, extended
funtion enable register */
@@ -1255,23 +1277,44 @@
oldid=inb(io+2);
outb(0xaa,io); /* Magic Seal */
+ if ((x_devid == devid) && (x_devrev == devrev) && (x_oldid == oldid))
+ return; /* protection against false positives */
+
decode_winbond(io,key,devid,devrev,oldid);
}
static void __devinit smsc_check(int io, int key)
{
- int devid,devrev;
+ int id,rev,oldid,oldrev,x_id,x_rev,x_oldid,x_oldrev;
+ /* First probe without the key */
+ outb(0x0d,io);
+ x_oldid=inb(io+1);
+ outb(0x0e,io);
+ x_oldrev=inb(io+1);
+ outb(0x20,io);
+ x_id=inb(io+1);
+ outb(0x21,io);
+ x_rev=inb(io+1);
+
outb(key,io);
outb(key,io); /* Write Magic Sequence to EFER, extended
funtion enable register */
outb(0x0d,io); /* Write EFIR, extended function index register */
- devid=inb(io+1); /* Read EFDR, extended function data register */
+ oldid=inb(io+1); /* Read EFDR, extended function data register */
outb(0x0e,io);
- devrev=inb(io+1);
+ oldrev=inb(io+1);
+ outb(0x20,io);
+ id=inb(io+1);
+ outb(0x21,io);
+ rev=inb(io+1);
outb(0xaa,io); /* Magic Seal */
- decode_smsc(io,key,devid,devrev);
+ if ((x_id == id) && (x_oldrev == oldrev) &&
+ (x_oldid == oldid) && (x_rev == rev))
+ return; /* protection against false positives */
+
+ decode_smsc(io,key,oldid,oldrev);
}
@@ -1584,7 +1627,8 @@
configb = inb (CONFIGB (pb));
if (!(configb & 0x40)) {
- printk (KERN_WARNING "0x%lx: IRQ conflict!\n", pb->base);
+ printk (KERN_WARNING "0x%lx: possible IRQ conflict!\n",
+ pb->base);
pb->irq = PARPORT_IRQ_NONE;
}
printk (KERN_DEBUG "0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Mar 23 2000 - 21:00:22 EST