Skip to contentSkip to conversation

[2.6.9+] PnPBIOS: Missing SMALL_TAG_ENDDEP tag

PATCH Rene Herman 3 participants 8 messages Dec 6, 2004 – Dec 7, 2004 Pnp support

lore
Share & tools
lore
#0 lore raw

Hi Adam.

Between 2.6.8 and 2.6.9, the following patch to rsparser.c was merged:

http://linus.bkbits.net:8080/linux-2.5/cset@414703f7MEe33PTYY-aFQaM3CLKjZw?nav=index.html|src/|src/drivers|src/drivers/pnp|src/drivers/pnp/pnpbios|related/drivers/pnp/pnpbios/rsparser.c

The added warning triggers on my machine:

Linux Plug and Play Support v0.97 (c) Adam Belay
PnPBIOS: Scanning system for PnP BIOS support...
PnPBIOS: Found PnP BIOS installation structure at 0xc00f7740
PnPBIOS: PnP BIOS version 1.0, entry 0xf0000:0x6634, dseg 0xf0000
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: 13 nodes reported by PnP BIOS; 13 recorded by driver

I don't believe those warnings should be printed, what with "broken" the expected state of anything coming from the BIOS. The attached patch removes them again. Works for me...

Rene.

drivers/pnp/pnpbios/rsparser.c +0 -4
@@ -433,14 +433,10 @@
 		case SMALL_TAG_ENDDEP:
 			if (len != 0)
 				goto len_err;
-			if (option_independent == option)
-				printk(KERN_WARNING "PnPBIOS: Missing SMALL_TAG_STARTDEP tag\n");
 			option = option_independent;
 			break;
 
 		case SMALL_TAG_END:
-			if (option_independent != option)
-				printk(KERN_WARNING "PnPBIOS: Missing SMALL_TAG_ENDDEP tag\n");
 			p = p + 2;
         		return (unsigned char *)p;
 			break;
#1 lore raw
Quoted 33 lines · Rene Herman

Hi Adam.

Between 2.6.8 and 2.6.9, the following patch to rsparser.c was merged:

http://linus.bkbits.net:8080/linux-2.5/cset@414703f7MEe33PTYY-aFQaM3CLKjZw?nav=index.html|src/|src/drivers|src/drivers/pnp|src/drivers/pnp/pnpbios|related/drivers/pnp/pnpbios/rsparser.c

The added warning triggers on my machine:

Linux Plug and Play Support v0.97 (c) Adam Belay
PnPBIOS: Scanning system for PnP BIOS support...
PnPBIOS: Found PnP BIOS installation structure at 0xc00f7740
PnPBIOS: PnP BIOS version 1.0, entry 0xf0000:0x6634, dseg 0xf0000
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: 13 nodes reported by PnP BIOS; 13 recorded by driver

I don't believe those warnings should be printed, what with "broken" the expected state of anything coming from the BIOS. The attached patch removes them again. Works for me...

Rene.

------------------------------------------------------------------------

drivers/pnp/pnpbios/rsparser.c line 437

Quoted 5 lines
drivers/pnp/pnpbios/rsparser.c +0 -2
@@ -433,14 +433,10 @@
 		case SMALL_TAG_ENDDEP:
 			if (len != 0)
 				goto len_err;
-			if (option_independent == option)
-				printk(KERN_WARNING "PnPBIOS: Missing SMALL_TAG_STARTDEP tag\n");

this one shouldn't be removed

drivers/pnp/pnpbios/rsparser.c line 443

Quoted 6 lines
drivers/pnp/pnpbios/rsparser.c +0 -2
 			option = option_independent;
 			break;
 
 		case SMALL_TAG_END:
-			if (option_independent != option)
-				printk(KERN_WARNING "PnPBIOS: Missing SMALL_TAG_ENDDEP tag\n");

ok for this one, may be change it to pnp_dbg(...)

drivers/pnp/pnpbios/rsparser.c line 442

Quoted 3 lines
drivers/pnp/pnpbios/rsparser.c +0 -0
 			p = p + 2;
         		return (unsigned char *)p;
 			break;

Matthieu

#2 lore raw
Quoted 9 lines · matthieu castet
Quoted 3 lines
(quoted diff) +0 -2
-            if (option_independent == option)
-                printk(KERN_WARNING "PnPBIOS: Missing 

SMALL_TAG_STARTDEP tag\n");

this one shouldn't be removed

Quoted 3 lines
             option = option_independent;
             break;
Quoted 6 lines
Quoted 4 lines

case SMALL_TAG_END:

(quoted diff) +0 -2
-            if (option_independent != option)
-                printk(KERN_WARNING "PnPBIOS: Missing 

SMALL_TAG_ENDDEP tag\n");

ok for this one, may be change it to pnp_dbg(...)

Works for me to. Updated patch attached that only removes the missing ENDDEP warning.

Rene.

drivers/pnp/pnpbios/rsparser.c +1 -5
@@ -439,11 +439,7 @@
 			break;
 
 		case SMALL_TAG_END:
-			if (option_independent != option)
-				printk(KERN_WARNING "PnPBIOS: Missing SMALL_TAG_ENDDEP tag\n");
-			p = p + 2;
-        		return (unsigned char *)p;
-			break;
+        		return p + 2;
 
 		default: /* an unkown tag */
 			len_err:
#3 lore raw
In reply to Rene Herman
Quoted 18 lines · Rene Herman

Hi Adam.

Between 2.6.8 and 2.6.9, the following patch to rsparser.c was merged:

http://linus.bkbits.net:8080/linux-2.5/cset@414703f7MEe33PTYY-aFQaM3CLKjZw?nav=index.html|src/|src/drivers|src/drivers/pnp|src/drivers/pnp/pnpbios|related/drivers/pnp/pnpbios/rsparser.c

The added warning triggers on my machine:

Linux Plug and Play Support v0.97 (c) Adam Belay
PnPBIOS: Scanning system for PnP BIOS support...
PnPBIOS: Found PnP BIOS installation structure at 0xc00f7740
PnPBIOS: PnP BIOS version 1.0, entry 0xf0000:0x6634, dseg 0xf0000
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: 13 nodes reported by PnP BIOS; 13 recorded by driver

Quoted 5 lines

I don't believe those warnings should be printed, what with "broken" the expected state of anything coming from the BIOS. The attached patch removes them again. Works for me...

Rene.

Hi Rene,

Could you please send me "pnp.tar" from something like this:

mkdir /tmp/pnp; cp /proc/bus/pnp/[0-f][0-f] /tmp/pnp; tar -cf pnp.tar /tmp/pnp; rm -fR /tmp/pnp

make sure the pnpbios /proc interface is compiled into the kernel.

I'd like to look at the node data to see what's going on.

Thanks,
Adam

#4 lore raw
Quoted 7 lines · Adam Belay

Could you please send me "pnp.tar" from something like this:

mkdir /tmp/pnp; cp /proc/bus/pnp/[0-f][0-f] /tmp/pnp; tar -cf pnp.tar /tmp/pnp; rm -fR /tmp/pnp

make sure the pnpbios /proc interface is compiled into the kernel.

I'd like to look at the node data to see what's going on.

Sure, attached. In case it's useful/easier, earlier I also booted with debugging printks added to pnpbios_parse_resource_option_data, noting the tag types encountered. This produced:

Linux Plug and Play Support v0.97 (c) Adam Belay
PnPBIOS: Scanning system for PnP BIOS support...
PnPBIOS: Found PnP BIOS installation structure at 0xc00f7740
PnPBIOS: PnP BIOS version 1.0, entry 0xf0000:0x6634, dseg 0xf0000
PnPBIOS: SMALL_TAG_END
PnPBIOS: SMALL_TAG_END
PnPBIOS: SMALL_TAG_END
PnPBIOS: SMALL_TAG_END
PnPBIOS: SMALL_TAG_END
PnPBIOS: SMALL_TAG_END
PnPBIOS: SMALL_TAG_END
PnPBIOS: SMALL_TAG_END
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_END
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_END
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_DMA
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_DMA
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_DMA
PnPBIOS: SMALL_TAG_END
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: SMALL_TAG_STARTDEP
PnPBIOS: SMALL_TAG_PORT
PnPBIOS: SMALL_TAG_IRQ
PnPBIOS: SMALL_TAG_DMA
PnPBIOS: SMALL_TAG_END
PnPBIOS: Missing SMALL_TAG_ENDDEP tag
PnPBIOS: SMALL_TAG_END
PnPBIOS: 13 nodes reported by PnP BIOS; 13 recorded by driver

Cheers,
Rene.

#5 lore raw
Quoted 7 lines · Rene Herman
Quoted 5 lines · Adam Belay

Could you please send me "pnp.tar" from something like this:

mkdir /tmp/pnp; cp /proc/bus/pnp/[0-f][0-f] /tmp/pnp; tar -cf pnp.tar /tmp/pnp; rm -fR /tmp/pnp

Quoted 8 lines
Quoted 3 lines

make sure the pnpbios /proc interface is compiled into the kernel.

I'd like to look at the node data to see what's going on.

Sure, attached. In case it's useful/easier, earlier I also booted with debugging printks added to pnpbios_parse_resource_option_data, noting the tag types encountered. This produced:

I appreciate the additional information. I looked through the binary files manually and confirmed that they are missing an end-dep tag. It should be harmless however. I think the error message needs to be debug or it could be removed.

Thanks,
Adam

#6 lore raw
Quoted 3 lines · Adam Belay

I appreciate the additional information. I looked through the binary files manually and confirmed that they are missing an end-dep tag. It should be harmless however. I think the error message needs to be debug or it could be removed.

As far as I'm concerned, making it debug is not too useful. I normally have pnp debug enabled but not to debug my BIOS.

Hence attachment. Could you push it on yourself if you agree? Thanks...

Rene.

drivers/pnp/pnpbios/rsparser.c +1 -5
@@ -439,11 +439,7 @@
 			break;
 
 		case SMALL_TAG_END:
-			if (option_independent != option)
-				printk(KERN_WARNING "PnPBIOS: Missing SMALL_TAG_ENDDEP tag\n");
-			p = p + 2;
-        		return (unsigned char *)p;
-			break;
+        		return p + 2;
 
 		default: /* an unkown tag */
 			len_err:
#7 lore raw
Quoted 7 lines · Rene Herman
Quoted 4 lines · Adam Belay

I appreciate the additional information. I looked through the binary files manually and confirmed that they are missing an end-dep tag. It should be harmless however. I think the error message needs to be debug or it could be removed.

Quoted 8 lines

As far as I'm concerned, making it debug is not too useful. I normally have pnp debug enabled but not to debug my BIOS.

Hence attachment. Could you push it on yourself if you agree? Thanks...

Rene.

Even if there is a problematic usage of dep tags, the possible resource list will reflect it, so I'm fine with removing the message. Thanks for the patch.

Adam